From 21c25f27f83cea3cf3f2e3f553863ede7416dc1e Mon Sep 17 00:00:00 2001 From: fufeifei Date: Mon, 18 Nov 2024 16:22:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8F=A3?= =?UTF-8?q?=E9=97=A8=E9=97=A8=E7=A6=81=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 8f4e844..b63ee06 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -39,6 +39,10 @@ 监测预警 +
+ + 口门门禁管理 +
综合管理 From c31e89f4f73561bf70731abfd713b4718378c27c Mon Sep 17 00:00:00 2001 From: fufeifei Date: Mon, 18 Nov 2024 16:25:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E5=8F=A3?= =?UTF-8?q?=E9=97=A8=E9=97=A8=E7=A6=81=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b63ee06..8f4e844 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -39,10 +39,6 @@ 监测预警
-
- - 口门门禁管理 -
综合管理 From a6a6b9470d5f8e54c43f7e84135599c94f9f6dbe Mon Sep 17 00:00:00 2001 From: shanao Date: Mon, 18 Nov 2024 17:46:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90bug=E4=BF=AE=E6=94=B9=E3=80=91=201?= =?UTF-8?q?.=20=E9=9A=90=E6=82=A3=E8=AF=A6=E6=83=85=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=202.=20=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hiddenUtil/information.vue | 2 +- src/views/safetyenvironmental/inspection/components/edit.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/hiddenUtil/information.vue b/src/views/hiddenUtil/information.vue index 7b8fe20..32e6d86 100644 --- a/src/views/hiddenUtil/information.vue +++ b/src/views/hiddenUtil/information.vue @@ -103,7 +103,7 @@ 整改类型 diff --git a/src/views/safetyenvironmental/inspection/components/edit.vue b/src/views/safetyenvironmental/inspection/components/edit.vue index ccdd63a..813be79 100644 --- a/src/views/safetyenvironmental/inspection/components/edit.vue +++ b/src/views/safetyenvironmental/inspection/components/edit.vue @@ -907,6 +907,7 @@ export default { this.$set(this.form, 'delHiddens', this.delHiddens.join(',')) this.$set(this.form, 'delHiddenFiles', this.delHiddenFiles.join(',')) this.listLoading = true + this.form.INSPECTION_STATUS = '0' requestFN( '/safetyenvironmental/' + this.dialogType, { ...this.form } From edcfbd9553ec140ea65bd60a9f12d5a2e3d102e0 Mon Sep 17 00:00:00 2001 From: shanao Date: Tue, 19 Nov 2024 14:09:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90bug=E4=BF=AE=E6=94=B9=E3=80=91=201?= =?UTF-8?q?.=20=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=97=A0=E6=95=88=202.=20=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=92=8C=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hidden/list/components/list.vue | 39 ++++++++++--------- src/views/hotwork/hotwork/components/info.vue | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/views/hidden/list/components/list.vue b/src/views/hidden/list/components/list.vue index f726969..9e8d3d5 100644 --- a/src/views/hidden/list/components/list.vue +++ b/src/views/hidden/list/components/list.vue @@ -360,25 +360,26 @@ export default { }, // 重置 goKeyReset() { - this.KEYWORDS = '' - this.STATE = '' - this.SOURCE = '' - this.RECTIFICATIONORNAME = '' - this.HIDDENFIND_NAME = '' - this.CHECKNAME = '' - this.confirmUserName = '' - this.keyFindUserDept = '' - this.keyHiddenPart = '' - this.DEPARTMENT_ID = '' - this.dates = [] - this.DISPOSESTATE = '' - this.ISQUALIFIED = '' - this.$refs.deptTree_Select3.clearHandle() - this.$refs.deptTree_Select.clearHandle() - this.$refs.hlTree_Select.clearHandle() - this.HIDDENLEVEL = '' - this.$refs.hiddenPart_Select.clearHandle() - this.getQuery() + // this.KEYWORDS = '' + // this.STATE = '' + // this.SOURCE = '' + // this.RECTIFICATIONORNAME = '' + // this.HIDDENFIND_NAME = '' + // this.CHECKNAME = '' + // this.confirmUserName = '' + // this.keyFindUserDept = '' + // this.keyHiddenPart = '' + // this.DEPARTMENT_ID = '' + // this.dates = [] + // this.DISPOSESTATE = '' + // this.ISQUALIFIED = '' + // this.$refs.deptTree_Select3.clearHandle() + // this.$refs.deptTree_Select.clearHandle() + // this.$refs.hlTree_Select.clearHandle() + // this.HIDDENLEVEL = '' + // this.$refs.hiddenPart_Select.clearHandle() + this.$refs.multipleTable.clearSelection() + this.getList() }, // 获得部门树 getTreeData1() { diff --git a/src/views/hotwork/hotwork/components/info.vue b/src/views/hotwork/hotwork/components/info.vue index 352eca9..48225a7 100644 --- a/src/views/hotwork/hotwork/components/info.vue +++ b/src/views/hotwork/hotwork/components/info.vue @@ -44,7 +44,7 @@ {{ pd.JOB_CONTENT }} - 现场负责人 + 现场管辖人 姓名：{{ pd.SITE_LEADER_NAME }} 动火操作人 {{ pd.HOT_WORK_OPERATOR_NAME }} From 71fded8e8a8659739b52fb8f6838c7ceb342b876 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 19 Nov 2024 14:24:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E9=9A=90=E6=82=A3=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=93=8D=E4=BD=9C=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hiddenApi/publicMethod/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 69550db..7aa062f 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -186,7 +186,7 @@ - +