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('')