diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 51b89d80..638b069c 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -78,7 +78,6 @@ export default { return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); }, del(payload) { - debugger; return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); }, diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index 91a9f310..a9b41c91 100644 --- a/src/views/equipment/base/alarm/Record/index.vue +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -94,7 +94,7 @@ export default { return { readOnly: false, chosedLogId: false, - searchBarKeys: ['equipmentName', 'recordTime'], + searchBarKeys: ['equipmentName', 'createTime'], tableBtn: [ // this.$auth.hasPermi('equipment:spare-parts-config:update') // ? { @@ -124,11 +124,11 @@ export default { label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL), }, - { prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺 - { prop: 'alarmCode', label: '设备报警码' }, // 接口缺 + { prop: 'createTime', label: '报警时间', filter: timeFilter }, + { prop: 'alarmCode', label: '设备报警码' }, { prop: 'alarmContent', label: '报警内容' }, { prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn }, - { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮, 群里问 + { prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ @@ -145,8 +145,8 @@ export default { dateType: 'daterange', // datetimerange // format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', - // valueFormat: 'yyyy-MM-dd HH:mm:ss', + // valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd HH:mm:ss', rangeSeparator: '-', startPlaceholder: '开始日期', endPlaceholder: '结束日期',