fix conflicts

src/views/core/analysis/balanceAnalysis/index.vue

@@ -162,50 +162,54 @@ export default {
 
 		buildProps(nameData) {
 			return new Promise((resolve, reject) => {
-				const dateArr = Array.from(
+				try {
-					new Set(
+					const dateArr = Array.from(
-						nameData
+						new Set(
-							.map((item) => (item.tree == 1 ? item.name : undefined))
+							nameData
-							.filter((v) => v)
+								.map((item) => (item.tree == 1 ? item.name : undefined))
-					)
+								.filter((v) => v)
-				);
+						)
-				// 排个序
+					);
-				dateArr.sort().forEach((date) => {
+					// 排个序
-					this.tableProps.push({
+					dateArr.sort().forEach((date) => {
-						label: date,
+						this.tableProps.push({
-						align: 'center',
+							label: date,
-						children: [
+							align: 'center',
-							{
+							children: [
-								prop: date + '_eq_ct',
+								{
-								label: '设备CT',
+									prop: date + '_eq_ct',
-								align: 'center',
+									label: '设备CT',
-							},
+									align: 'center',
-							{
+								},
-								prop: date + '_eq_tt',
+								{
-								label: '设备TT',
+									prop: date + '_eq_tt',
-								align: 'center',
+									label: '设备TT',
-							},
+									align: 'center',
-							{
+								},
-								prop: date + '_pl_ct',
+								{
-								label: '产线CT',
+									prop: date + '_pl_ct',
-								align: 'center',
+									label: '产线CT',
-							},
+									align: 'center',
-							{
+								},
-								prop: date + '_pl_tt',
+								{
-								label: '产线TT',
+									prop: date + '_pl_tt',
-								align: 'center',
+									label: '产线TT',
-							},
+									align: 'center',
-						],
+								},
+							],
+						});
 					});
-				});
 
-				resolve();
+					resolve();
+				} catch (err) {
+					reject(err);
+				}
 			});
 		},
 
 		async buildTableData(data) {
 			/** 处理 工段 分组  */
-      const sectionList = data.map(item => {})
+			const sectionList = data.map((item) => {});
 		},
 
 		setRowSpan(arr) {

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: 是否换成按钮， 群里问
@@ -166,7 +151,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-          param: 'createTime',
+					param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()
@@ -221,7 +206,7 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
-				recordTime: []
+				recordTime: [],
 			},
 			basePath: '/base/equipment-alarm-log',
 			list: [],