From 5e0f50acc1b0d6ba40887b8b2b197238761fb4ec Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 22 Apr 2024 17:46:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E7=9B=91=E7=AE=A1?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AE=89=E5=85=A8=E4=BA=A4?= =?UTF-8?q?=E5=BA=95=E4=BA=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork/hotwork_list/components/detail_cfd.vue | 6 +++++- src/views/map/dialog/hotworkFirst.vue | 6 +++++- 2 files changed, 10 insertions(+), 2 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 e40c67d..1516918 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 @@ -307,7 +307,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 - this.confessList = data.pd.confessList // 安全交底人 + 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('') diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue index 25d58b3..7678907 100644 --- a/src/views/map/dialog/hotworkFirst.vue +++ b/src/views/map/dialog/hotworkFirst.vue @@ -315,7 +315,11 @@ export default { this.pd = data.pd // 参数map this.imgList = data.imgList this.imgList1 = data.imgList1 - this.confessList = data.pd.confessList // 安全交底人 + 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('')