From 1cdca25e3ccc908c191e14167d6ed6d50931cfbb Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 7 Jun 2024 17:23:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=A4=E5=BA=95?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=B1=95=E7=A4=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/dialog/hotworkFirst.vue | 22 +++++++++++++++++++--- static/config.js | 4 ++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue index 7678907..8084bfc 100644 --- a/src/views/map/dialog/hotworkFirst.vue +++ b/src/views/map/dialog/hotworkFirst.vue @@ -141,13 +141,23 @@ 接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
+ + + + + + + + + + 监护人 @@ -273,6 +283,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -320,6 +331,11 @@ export default { this.confessList.push(item) } }) + data.pd.acceptConfessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.acceptConfessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') diff --git a/static/config.js b/static/config.js index d26df72..fc72a21 100644 --- a/static/config.js +++ b/static/config.js @@ -1,7 +1,7 @@ // eslint-disable-next-line no-unused-vars const config = { - weburl: 'http://192.168.0.45:8082/', // 前台地址 - httpurl: 'http://192.168.151.43:8092/', // 后台地址 + weburl: 'http://192.168.0.49:8092/', // 前台地址 + httpurl: 'http://192.168.0.49:8092/', // 后台地址 qyurl: 'http://192.168.0.45:8080/', // 企业前台 fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址 publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB', From fcf94011d3670b0c905b24c06a5f62f2d71b1e95 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 11 Jun 2024 08:53:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E7=AB=AF=E5=8D=B1?= =?UTF-8?q?=E9=99=A9=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->=E6=8E=A5?= =?UTF-8?q?=E5=8F=97=E4=BA=A4=E5=BA=95=E4=BA=BA=E4=BB=8E=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=EF=BC=9B=20=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A->=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2->?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E5=8A=A8=E7=81=AB=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=8E=B0?= =?UTF-8?q?=E6=88=90=E6=98=AF=E5=90=A6=E6=B8=85=E7=90=86=EF=BC=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E9=81=97=E7=95=99=E7=81=AB=E7=A7=8D?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork_list/components/detail_cfd.vue | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue index 0422aaa..1263ea0 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail_cfd.vue @@ -75,6 +75,25 @@ 动火作业实施时间 {{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止 + + 动火是否完成 + + 已完成 + 未完成 + + 作业现场是否清理 + + 已清理 + 未清理 + + + + 是否存在遗留火种 + + 无遗留 + 未确定无遗留火种 + + @@ -146,13 +165,23 @@ + + + + + + + + + +
接受交底人 -
+
签字： - - {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
监护人 @@ -267,6 +296,7 @@ export default { imgList: [], imgList1: [], otherProtectiveMeasures: [], + acceptConfessList: [], confessList: [] } }, @@ -312,6 +342,11 @@ export default { this.confessList.push(item) } }) + data.pd.acceptConfessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.acceptConfessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')