From 69b6942f350d6107c13069612ddc0529133b46ba Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 30 Nov 2023 14:19:13 +0800 Subject: [PATCH 1/2] fix bugs --- src/mixins/lb/basicPageMixin.js | 1 - src/views/equipment/base/alarm/Record/index.vue | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) 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: '结束日期', -- 2.45.2 From 1d3372ed693a53b099149b899aba542a84ab1fdf Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Thu, 30 Nov 2023 15:04:17 +0800 Subject: [PATCH 2/2] ui --- package.json | 2 +- src/components/Editor/index.vue | 5 +- .../base/inspection/Content/index.vue | 8 +- .../base/repair/CustomDialogForm.vue | 202 +- src/views/equipment/base/repair/index.vue | 2 +- .../base/spareParts/Config/addSparts.vue | 135 +- .../base/spareParts/Config/index.vue | 44 +- .../base/spareParts/Monitor/addSparts.vue | 142 +- .../base/spareParts/Monitor/index.vue | 22 +- yarn.lock | 17814 ++++++++-------- 10 files changed, 9441 insertions(+), 8935 deletions(-) diff --git a/package.json b/package.json index abeb01a6..556024f1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "0.10.0", "clipboard": "2.0.8", - "code-brick-zj": "^1.0.2", + "code-brick-zj": "^1.0.5", "core-js": "^3.26.0", "crypto-js": "^4.0.0", "diagram-js": "^12.3.0", diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 046e334a..50ae3e74 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -125,11 +125,8 @@ export default { // 取消自动聚焦 start this.Quill?.enable(false); this.$nextTick(() => { - this.Quill?.enable(true); this.Quill?.blur(); - // if (!this.readOnly) { - // this.Quill?.enable(); - // } + this.Quill?.enable(true); }); // 如果设置了上传地址则自定义图片上传事件 if (this.type === 'url') { diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue index e79cf7b7..ccd56a5f 100644 --- a/src/views/equipment/base/inspection/Content/index.vue +++ b/src/views/equipment/base/inspection/Content/index.vue @@ -84,10 +84,10 @@ export default { : undefined, ].filter((v) => v), tableProps: [ - { prop: 'program', label: '巡检项目' }, - { prop: 'content', label: '巡检内容' }, - { prop: 'code', label: '巡检内容编码' }, - { prop: 'remark', label: '备注' }, + { prop: 'program', label: '巡检项目', showOverflowtooltip: true }, + { prop: 'content', label: '巡检内容', minWidth: 150, showOverflowtooltip: true }, + { prop: 'code', label: '巡检内容编码', showOverflowtooltip: true }, + { prop: 'remark', label: '备注', showOverflowtooltip: true }, ], searchBarFormConfig: [ { diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue index 7649f3ee..664c4ebe 100644 --- a/src/views/equipment/base/repair/CustomDialogForm.vue +++ b/src/views/equipment/base/repair/CustomDialogForm.vue @@ -60,110 +60,112 @@ - + - - {{ '设备维修信息' }} - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + {{ '设备维修信息' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + +