From 5033bbb206c5a9ada6dd01b8410b7d8050f7f645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 28 Nov 2023 10:59:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/equipment/base/alarm/Record/index.vue | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue
index c4f93007..fc03d30b 100644
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@@ -59,14 +59,9 @@
-
-
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 77b995ad..5dcee26b 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -93,7 +93,7 @@ export default {
tableProps: [
{ prop: 'configName', label: '配置名称' },
{ prop: 'equipmentName', label: '设备名称' },
- // { prop: 'lineName', label: '数据来源' },
+ { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] },
// { prop: 'sectionName', label: '计划巡检时间' },
{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
// { prop: 'maintenanceDetail', label: '完成状态' },
From 27faa04c7a225de6a65b0dff5b6494d70b39fb70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 29 Nov 2023 08:48:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/quality/monitoring/statisticalData/index.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index 756e2a64..f489f16c 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -259,10 +259,11 @@ export default {
},
mounted() {
if (this.$route.query.woIdString) {
- console.log(this.$route.query.woIdString);
- this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+ console.log(this.$route.query.woIdString)
+ this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+ // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
// let arr =[]
- this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString]
+ this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
console.log(this.searchBarFormConfig[0].defaultSelect);
}
// if (this.$route.params.startTime && this.$route.params.endTime) {