From 94b6fe747eabd57d86dfb95eced3367f611bf07b Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 22 Apr 2024 17:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8E=E4=B8=80=E5=85=AC=E5=8F=B8app?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork_cfd/hotwork/components/detail.vue | 78 ++++++++++++++---- .../hotwork_cfd/hotwork/components/list.vue | 32 ++++++-- src/views/map/dialog/hotworkFirst.vue | 79 ++++++++++++++----- 3 files changed, 147 insertions(+), 42 deletions(-) diff --git a/src/views/hotwork_cfd/hotwork/components/detail.vue b/src/views/hotwork_cfd/hotwork/components/detail.vue index 28381d7..6c90e95 100644 --- a/src/views/hotwork_cfd/hotwork/components/detail.vue +++ b/src/views/hotwork_cfd/hotwork/components/detail.vue @@ -35,6 +35,12 @@ 动火人及证书编号 {{ pd.WORK_USER }} + + 动火操作人图片 + + + + 作业单位 {{ pd.CONFIRM_DEPARTMENT_NAME }} @@ -97,28 +103,33 @@ {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} - 编制人：{{ pd.CONFIRM_USER_NAME }} +
+ 安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}
+
+ 作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }} +
+
+ 项目责任负责人：{{ pd.BELONGING_USER_MEASURES }} +
+ + +
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} + 属地监管单位：{{ pd.LEADER_USER_MEASURES }}
- 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} - 编制人：{{ pd.AUDIT_USER_NAME }} + 安全管理部门：{{ pd.AUDIT_USER_MEASURES }}
- 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} - 编制人：{{ pd.APPROVE_USER_NAME }} + 动火审批人：{{ pd.APPROVE_USER_MEASURES }}
- 其他安全措施：{{ pd.MONITOR_USER_MEASURES }} - 编制人：{{ pd.MONITOR_USER_NAME }} + 动火前验票：{{ pd.MONITOR_USER_MEASURES }}
@@ -128,10 +139,10 @@ 安全交底人 -
+
签字： - - {{ pd.CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
@@ -155,6 +166,16 @@
+ + 安全措施确认人 + +
+ 签字： + + {{ pd.SAFETY_SIGNATURE_TIME }} +
+ +
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
@@ -165,6 +186,16 @@
+ + +
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
+ 签字： + + {{ pd.BELONGING_SIGNATURE_TIME }} +
+ +
属地监管单位意见：{{ pd.LEADER_CONTENT }}
@@ -197,7 +228,7 @@ -
动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
签字： @@ -238,7 +269,8 @@ export default { gasList: [], imgList: [], imgList1: [], - otherProtectiveMeasures: [] + otherProtectiveMeasures: [], + confessList: [] } }, created() { @@ -278,6 +310,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 + data.pd.confessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.confessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') @@ -313,6 +350,13 @@ export default { this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] } + const dongHuoCaoZuoRenPic = data.imgList2 + if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { + this.pd.dongHuoCaoZuoRenPic = [] + for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { + this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH) + } + } }).catch((e) => { this.listLoading = false }) diff --git a/src/views/hotwork_cfd/hotwork/components/list.vue b/src/views/hotwork_cfd/hotwork/components/list.vue index 26917ef..2f092e8 100644 --- a/src/views/hotwork_cfd/hotwork/components/list.vue +++ b/src/views/hotwork_cfd/hotwork/components/list.vue @@ -51,12 +51,14 @@ + + + @@ -89,28 +95,30 @@ {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} - 编制人：{{ pd.CONFIRM_USER_NAME }} +
+ 安全措施确认人：{{ pd.SAFETY_USER_MEASURES }} +
+
+ 作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }} +
+
+ 项目责任负责人：{{ pd.BELONGING_USER_MEASURES }}
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} + 属地监管单位：{{ pd.LEADER_USER_MEASURES }}
- 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} - 编制人：{{ pd.AUDIT_USER_NAME }} + 安全管理部门：{{ pd.AUDIT_USER_MEASURES }}
- 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} - 编制人：{{ pd.APPROVE_USER_NAME }} + 动火审批人：{{ pd.APPROVE_USER_MEASURES }}
- 其他安全措施：{{ pd.MONITOR_USER_MEASURES }} - 编制人：{{ pd.MONITOR_USER_NAME }} + 动火前验票：{{ pd.MONITOR_USER_MEASURES }}
@@ -120,10 +128,10 @@ 安全交底人 -
+
签字： - - {{ pd.CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
@@ -147,6 +155,16 @@
+ + 安全措施确认人 + +
+ 签字： + + {{ pd.SAFETY_SIGNATURE_TIME }} +
+ +
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
@@ -157,9 +175,19 @@
+ + +
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
+ 签字： + + {{ pd.BELONGING_SIGNATURE_TIME }} +
+ + -
所在单位意见：{{ pd.LEADER_CONTENT }}
+
属地监管单位意见：{{ pd.LEADER_CONTENT }}
签字： @@ -189,7 +217,7 @@ -
动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
签字： @@ -242,7 +270,8 @@ export default { gasList: [], imgList: [], imgList1: [], - otherProtectiveMeasures: [] + otherProtectiveMeasures: [], + confessList: [] } }, created() { @@ -284,6 +313,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 + data.pd.confessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.confessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') @@ -319,6 +353,13 @@ export default { this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] } + const dongHuoCaoZuoRenPic = data.imgList2 + if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { + this.pd.dongHuoCaoZuoRenPic = [] + for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { + this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH) + } + } }).catch((e) => { this.listLoading = false })