From 475d44498eff015f787b45ad8df88a5e2eb60239 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Fri, 17 Apr 2026 11:07:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E9=85=B8=E9=9B=BE?= =?UTF-8?q?=E5=A1=94=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86-=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E8=AE=B0=E5=BD=95-=E5=8E=BB=E6=8E=89=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E7=9A=84=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyManagement/wasteGasSet/components/alarmRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue index b62da20..1a407c1 100644 --- a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue +++ b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue @@ -53,7 +53,7 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, addBtn: false, From 14f0493112fc559d0d1e4c9f34127e2dc2ae7777 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Fri, 17 Apr 2026 11:13:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86-=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyManagement/safetyInspectionTask/index.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue index 85cea00..b398cd4 100644 --- a/src/views/safetyManagement/safetyInspectionTask/index.vue +++ b/src/views/safetyManagement/safetyInspectionTask/index.vue @@ -51,20 +51,22 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, - editBtn: true, + addBtn: false, editBtnText: "修改", addBtnIcon: " ", viewBtnIcon: " ", delBtnIcon: " ", editBtnIcon: " ", + viewBtnText: "详情", labelWidth: 120, - menuWidth: 150, - dialogWidth: 600, + menuWidth: 120, + dialogWidth: 1040, dialogClickModal: false, searchEnter: true, + excelBtn: false, filterBtn: true, searchShowBtn: false, columnSort: true, @@ -73,7 +75,6 @@ export default { index: false, showOverflowTooltip: true, menu: false, - header: false, searchLabelPosition: "left", searchGutter: 24, searchSpan: 6, From 00071fadd8d18f54c4cd1a9e9dbd68a60d7205f7 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Fri, 17 Apr 2026 11:13:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1-=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentInspectionTask/index.vue | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/safetyManagement/equipmentInspectionTask/index.vue b/src/views/safetyManagement/equipmentInspectionTask/index.vue index 3042c6c..575bd41 100644 --- a/src/views/safetyManagement/equipmentInspectionTask/index.vue +++ b/src/views/safetyManagement/equipmentInspectionTask/index.vue @@ -37,8 +37,7 @@ export default { query: { taskStatus: '2' }, - option: { - height: "auto", + option: { height: "auto", calcHeight: 32, tip: false, simplePage: true, @@ -49,18 +48,19 @@ export default { tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, - editBtn: true, + addBtn: false, editBtnText: "修改", addBtnIcon: " ", viewBtnIcon: " ", delBtnIcon: " ", editBtnIcon: " ", + viewBtnText: "详情", labelWidth: 120, - menuWidth: 150, - dialogWidth: 600, + menuWidth: 120, + dialogWidth: 1040, dialogClickModal: false, searchEnter: true, excelBtn: false, @@ -72,7 +72,6 @@ export default { index: false, showOverflowTooltip: true, menu: false, - header: false, searchLabelPosition: "left", searchLabelPosition: "left", searchGutter: 24, @@ -83,20 +82,7 @@ export default { align: "center", column: [ - { - label: "任务状态", - prop: "taskStatus", - sortable: true, - filter: true, - search: true, - type: 'select', - value:'2', - dicData: [ - { label: '已检', value: '1' }, - { label: '待检', value: '2' }, //任务状态: 1、已检，2、待检，3、未准时完成 - { label: '未准时完成', value: '3' }, //任务状态: 1、已检，2、待检，3、未准时完成 - ] - }, + { label: "巡检点编号", prop: "insNum", @@ -217,6 +203,20 @@ export default { sortable: true, filter: true, search: false, + }, + { + label: "任务状态", + prop: "taskStatus", + sortable: true, + filter: true, + search: true, + type: 'select', + value:'2', + dicData: [ + { label: '已检', value: '1' }, + { label: '待检', value: '2' }, //任务状态: 1、已检，2、待检，3、未准时完成 + { label: '未准时完成', value: '3' }, //任务状态: 1、已检，2、待检，3、未准时完成 + ] }, ], }, From cecdd9f74f44a51dffbcfc7c1fea045527197825 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Fri, 17 Apr 2026 11:19:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F=E6=B0=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86-=E6=A7=BD=E6=B6=B2=E6=8E=92=E6=94=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E6=8E=92=E6=94=BE=E9=87=8F(=E5=8D=95?= =?UTF-8?q?=E4=BD=8D:L):=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetyManagement/wastewater/components/dischargeRec.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue index 9d47410..0e8c27b 100644 --- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue +++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue @@ -175,6 +175,7 @@ export default { filter: true, span: 12, searchLabelWidth: 110, + type: 'number', rules: [ { required: true,