diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 61d46432..51b89d80 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -33,6 +33,7 @@ export default { addUrl: '', pageUrl: '', infoUrl: '', + deleteUrl: '', basePath: '', form: {} }; @@ -60,7 +61,7 @@ export default { return this.$axios({ url, method, - params: method === 'get' ? payload : null, + params: (method === 'get' || method === 'delete') ? payload : null, data: method !== 'get' ? payload : null, }) }, @@ -77,6 +78,7 @@ 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/core/analysis/balanceChart.vue b/src/views/core/analysis/balanceChart.vue index 4bb10ff1..fe156832 100644 --- a/src/views/core/analysis/balanceChart.vue +++ b/src/views/core/analysis/balanceChart.vue @@ -6,131 +6,150 @@ * @Description: --> diff --git a/src/views/equipment/analysis/Statistics/index.vue b/src/views/equipment/analysis/Statistics/index.vue index ae8e2374..4f5b9e91 100644 --- a/src/views/equipment/analysis/Statistics/index.vue +++ b/src/views/equipment/analysis/Statistics/index.vue @@ -28,59 +28,96 @@ diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index 9e3e9611..cc49a574 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -237,6 +237,7 @@ export default { label: '工厂', placeholder: '请选择工厂', param: 'factoryId', + filterable: true, selectOptions: [], }, { @@ -244,6 +245,7 @@ export default { label: '产线', placeholder: '请选择产线', param: 'lineId', + filterable: true, selectOptions: [], }, // 选项切换 diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue index 82e066d7..9cb27907 100644 --- a/src/views/equipment/base/alarm/Record/index.vue +++ b/src/views/equipment/base/alarm/Record/index.vue @@ -310,7 +310,7 @@ export default { this.$modal .confirm('是否确认删除记录"' + row.name + '"?') .then(function () { - return this.delete({ id }); + return this.del({ id }); }) .then(() => { this.getList(); diff --git a/src/views/equipment/base/config/AlarmGroup/index.vue b/src/views/equipment/base/config/AlarmGroup/index.vue index f94945c1..f32f10f5 100644 --- a/src/views/equipment/base/config/AlarmGroup/index.vue +++ b/src/views/equipment/base/config/AlarmGroup/index.vue @@ -198,26 +198,23 @@ export default { prop: 'createTime', label: '添加时间', fixed: true, - width: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { width: 240, prop: 'code', label: '报警编码' }, + { prop: 'code', label: '报警编码' }, { - width: 100, prop: 'type', label: '报警类型', filter: (val) => val != null ? ['-', '字符型', '布尔型', '-'][val] : '-', }, { - width: 90, prop: 'grade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL), }, - { width: 180, prop: 'alarmCode', label: '设备报警编码' }, - { width: 128, prop: 'plcParamName', label: '参数列名' }, - { width: 128, prop: 'alarmContent', label: '报警内容' }, + { prop: 'alarmCode', label: '设备报警编码' }, + { prop: 'plcParamName', label: '参数列名' }, + { prop: 'alarmContent', label: '报警内容' }, ], alarmForm: { id: undefined, diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue index a8f23062..e79cf7b7 100644 --- a/src/views/equipment/base/inspection/Content/index.vue +++ b/src/views/equipment/base/inspection/Content/index.vue @@ -52,7 +52,7 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import { publicFormatter } from '@/utils/dict'; -import { deleteCheck } from "@/api/equipment/base/inspection/settings"; +import { deleteCheck } from '@/api/equipment/base/inspection/settings'; const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'); @@ -128,15 +128,21 @@ export default { label: '巡检内容编号', prop: 'code', url: '/base/equipment-check/getCode', - rules: [{ required: true, message: '巡检内容编号不能为空', trigger: 'blur' }], + rules: [ + { + required: true, + message: '巡检内容编号不能为空', + trigger: 'blur', + }, + ], }, - ], - [ { input: true, label: '巡检项目', prop: 'program', - rules: [{ required: true, message: '巡检项目不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '巡检项目不能为空', trigger: 'blur' }, + ], }, ], [ @@ -144,10 +150,10 @@ export default { input: true, label: '巡检内容', prop: 'content', - rules: [{ required: true, message: '巡检内容不能为空', trigger: 'blur' }], + rules: [ + { required: true, message: '巡检内容不能为空', trigger: 'blur' }, + ], }, - ], - [ { input: true, label: '备注', @@ -168,7 +174,7 @@ export default { code: '', program: '', id: undefined, - content: '' + content: '', }, basePath: '/base/equipment-check', mode: null, @@ -271,10 +277,10 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除巡检项目名称为"' + row.program + '"的数据项?') + .confirm('是否确认删除该巡检项目?') .then(function () { - // return this.delete({ id }); - return deleteCheck(id) + // return this.del({ id }); + return deleteCheck(id); }) .then(() => { this.getList(); diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue index 98a9604d..35a09628 100644 --- a/src/views/equipment/base/inspection/Record/index.vue +++ b/src/views/equipment/base/inspection/Record/index.vue @@ -105,6 +105,7 @@ export default { label: '设备', placeholder: '请选择设备', param: 'equipmentId', + filterable: true }, // 开始结束时间 { diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue index 422c146b..d7207dc0 100644 --- a/src/views/equipment/base/inspection/Settings/index.vue +++ b/src/views/equipment/base/inspection/Settings/index.vue @@ -54,7 +54,6 @@ + + diff --git a/src/views/equipment/monitor/StatusAndParams/index.vue b/src/views/equipment/monitor/StatusAndParams/index.vue index d34c5fa6..5bb0dedc 100644 --- a/src/views/equipment/monitor/StatusAndParams/index.vue +++ b/src/views/equipment/monitor/StatusAndParams/index.vue @@ -1,10 +1,7 @@