Merge branch 'projects/mes-test' into projects/mes-lb

src/views/equipment/base/alarm/Record/index.vue

@@ -59,9 +59,14 @@
 <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',
@@ -92,9 +97,13 @@ 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')
 				// 	? {
@@ -119,6 +128,11 @@ 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: '报警级别',
@@ -126,6 +140,7 @@ 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: 是否换成按钮， 群里问
@@ -151,7 +166,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
+          param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()