From c007e133b4a3689eebbe2ef7cbe4991a582ba85b Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 14 Jun 2024 17:57:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork_list/components/detail_cfd.vue | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 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 1263ea0..00c46b2 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,23 +75,20 @@ 动火作业实施时间 {{ pd.WORK_START_DATE }}至{{ pd.WORK_END_DATE }}止 - + 动火是否完成 - 已完成 - 未完成 + 已完成 - 作业现场是否清理 + 动火是否完成 - 已清理 - 未清理 + 已清理 - + 是否存在遗留火种 - 无遗留 - 未确定无遗留火种 + 无遗留火种 @@ -204,7 +201,7 @@ -
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
+
作业负责人意见：{{ pd.CONFIRM_CONTENT === '无' ? '同意' : pd.CONFIRM_CONTENT }}
签字： @@ -214,7 +211,7 @@ -
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '无' ? '同意' : pd.BELONGING_OPINIONS }}
签字： @@ -224,7 +221,7 @@ -
所在单位意见：{{ pd.LEADER_CONTENT }}
+
所在单位意见：{{ pd.LEADER_CONTENT === '无' ? '同意' : pd.LEADER_CONTENT }}
签字： @@ -234,7 +231,7 @@ -
安全管理部门意见：{{ pd.AUDIT_CONTENT }}
+
安全管理部门意见：{{ pd.AUDIT_CONTENT === '无' ? '同意' : pd.AUDIT_CONTENT }}
签字： @@ -244,7 +241,7 @@ -
动火审批人意见：{{ pd.APPROVE_CONTENT }}
+
动火审批人意见：{{ pd.APPROVE_CONTENT === '无' ? '同意' : pd.APPROVE_CONTENT }}
签字： @@ -254,7 +251,7 @@ -
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT === '无' ? '同意' : pd.MONITOR_CONTENT }}
签字： @@ -264,7 +261,7 @@ -
完工验收：{{ pd.ACCEPT_CONTENT }}
+
完工验收：{{ pd.ACCEPT_CONTENT === '无' ? '同意' : pd.ACCEPT_CONTENT }}
签字： From 5cb52c147bdc39a194692ed315e28577aa2ada15 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Mon, 17 Jun 2024 17:51:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=BC=E5=BC=8F=E5=8C=96=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=BE=85=E5=AE=A1=E6=A0=B8=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AE=A1=E6=A0=B8=E6=89=93?= =?UTF-8?q?=E5=9B=9E=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E4=B8=BB?= =?UTF-8?q?=E7=AE=A1=E9=83=A8=E9=97=A8=E5=AE=A1=E6=A0=B8=E6=89=93=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork_list/components/detail_cfd.vue | 36 +++++++++---------- .../hotwork_list/components/list_cfd.vue | 4 +-- src/views/map/dialog/hotworkFirst.vue | 36 ++++++++++--------- 3 files changed, 40 insertions(+), 36 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 00c46b2..4aedc93 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 @@ -211,7 +211,7 @@ -
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '无' ? '同意' : pd.BELONGING_OPINIONS }}
+
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS === '' ? '同意' : pd.BELONGING_OPINIONS }}
签字： @@ -344,23 +344,23 @@ export default { this.acceptConfessList.push(item) } }) - for (let i = 0; i < data.measuresList.length; i++) { - // 将字符串转成数组 - const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') - for (let j = 1; j <= 3; j++) { - // 判断字符串是否存在 - if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { - // 给字符串后面添加上需要的数据 - PROTECTIVE_MEASURES.splice( - this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, - 0, - data.measuresList[i]['ANSWER' + j] - ) - } - } - // 将数组转回字符串 - data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') - } + // for (let i = 0; i < data.measuresList.length; i++) { + // // 将字符串转成数组 + // const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') + // for (let j = 1; j <= 3; j++) { + // // 判断字符串是否存在 + // if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) { + // // 给字符串后面添加上需要的数据 + // PROTECTIVE_MEASURES.splice( + // this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1, + // 0, + // data.measuresList[i]['ANSWER' + j] + // ) + // } + // } + // // 将数组转回字符串 + // data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') + // } this.measuresList = data.measuresList // 参数map this.gasList = data.gasList // 参数map if (this.pd.WORK_LEVEL === '二级') { diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue index a138821..638c251 100644 --- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue +++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue @@ -52,14 +52,14 @@