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/2] =?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 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-<<<<<<< HEAD
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-
-=======
 import AddOrUpdate from './AddOrUpdate.vue';
 import moment from 'moment';
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
->>>>>>> projects/mes-test
 
 const btn = {
 	name: 'tableBtn',
@@ -97,13 +92,9 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-<<<<<<< HEAD
-      searchBarKeys: ['equipmentName', 'createTime'],
-=======
 			readOnly: false,
 			chosedLogId: false,
 			searchBarKeys: ['equipmentName', 'recordTime'],
->>>>>>> projects/mes-test
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -128,11 +119,6 @@ export default {
 				{ prop: 'productionLine', label: '产线' },
 				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
-<<<<<<< HEAD
-				{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
-        { prop: 'createTime', label: '报警时间',filter: timeFilter }, // 接口缺
-				{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
-=======
 				{
 					prop: 'alarmGrade',
 					label: '报警级别',
@@ -140,7 +126,6 @@ export default {
 				},
 				{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
 				{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
->>>>>>> projects/mes-test
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
 				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问

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 2/2] =?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) {