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 1/7] 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 @@ - + - - {{ '设备维修信息' }} - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + {{ '设备维修信息' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + +