From 426c5611041716b73304c94ff335c791a3e7147f Mon Sep 17 00:00:00 2001 From: zhangqihang Date: Wed, 28 Feb 2024 13:45:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hidden-danger-record-detail.vue | 64 +++++++++++++++++++ .../key-project-management/index/index.vue | 4 +- .../archive/detail-check.vue | 2 +- .../archive/list-hidden.vue | 2 +- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue index d23e358..c99e89e 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue @@ -422,6 +422,68 @@ + + + + 安全环保验收信息 + + + + 验收描述 + + + {{pd.FINAL_CHECKDESCR}} + + + + + 是否合格 + + + 是 + 否 + + + + + 验收部门 + + + {{pd.FINAL_CHECKOR_NDEPTNAME}} + + + + + 验收人 + + + {{pd.FINAL_CHECKOR_NAME}} + + + + + 验收时间 + + + {{pd.FINAL_CHECKTIME}} + + + + + 整改后图片 + + + + + + + + + + + + @@ -466,6 +528,7 @@ files3: [], files4: [], files5: [], + files6: [], videoList: [], checkList: [], CHECKDESCR: '', @@ -527,6 +590,7 @@ //_this.files3 = res.data.cImgs; _this.files4 = res.data.sImgs; _this.files5 = res.data.pImgs; + _this.files6 = res.data.yImgs; _this.checkList = res.data.checkList; } else if ("exception" == data.result) { uni.showToast({ diff --git a/pages/application/key-project-management/index/index.vue b/pages/application/key-project-management/index/index.vue index aaf330e..7c48938 100644 --- a/pages/application/key-project-management/index/index.vue +++ b/pages/application/key-project-management/index/index.vue @@ -47,7 +47,7 @@ 处罚管理 - + diff --git a/pages/application/safety-environmental-inspection/archive/detail-check.vue b/pages/application/safety-environmental-inspection/archive/detail-check.vue index 1ffe15d..295c06c 100644 --- a/pages/application/safety-environmental-inspection/archive/detail-check.vue +++ b/pages/application/safety-environmental-inspection/archive/detail-check.vue @@ -435,7 +435,7 @@ 是 - + 否 diff --git a/pages/application/safety-environmental-inspection/archive/list-hidden.vue b/pages/application/safety-environmental-inspection/archive/list-hidden.vue index c2eb3c6..abbab8c 100644 --- a/pages/application/safety-environmental-inspection/archive/list-hidden.vue +++ b/pages/application/safety-environmental-inspection/archive/list-hidden.vue @@ -79,7 +79,7 @@ { ID: '', NAME: '请选择' }, { ID: '1', NAME: '待整改' }, { ID: '2', NAME: '待验收' }, - { ID: '3', NAME: '已复查' }, + { ID: '3', NAME: '已整改' }, { ID: '4', NAME: '已验收' }, { ID: '5', NAME: '忽略隐患' }, { ID: '6', NAME: '重大隐患' }, From dd71531980489cafb558c9d769f1c5d3cf694973 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 28 Feb 2024 14:25:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?14132=20=E8=BF=99=E5=87=A0=E7=A7=8D?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=9D=A5=E6=BA=90=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hidden-danger-check/hidden-danger-check-detail.vue | 3 ++- .../hidden-danger-check-risk-detail.vue | 6 +++--- .../hidden-danger-check-standard-detail.vue | 8 +++++--- .../hidden-danger-check/hidden-danger-check.vue | 8 +++----- .../hidden-danger-finish-detail.vue | 8 +++++--- .../hidden-danger-finish/hidden-danger-finish.vue | 8 +++----- .../hidden-danger-no-change-detail.vue | 9 +++++---- .../hidden-danger-no-change-risk-detail.vue | 10 +++++----- .../hidden-danger-no-change-standard-detail.vue | 8 +++++--- .../hidden-danger-no-change.vue | 8 +++----- .../hidden-danger-overdue-detail.vue | 8 +++++--- .../hidden-danger-overdue-risk-detail.vue | 8 +++++--- .../hidden-danger-overdue-standard-detail.vue | 8 +++++--- .../hidden-danger-overdue/hidden-danger-overdue.vue | 8 +++----- .../hidden-danger-record-detail.vue | 8 ++++---- .../hidden-danger-record-risk-detail.vue | 6 +++--- .../hidden-danger-record-standard-detail.vue | 8 +++++--- .../hidden-danger-record/hidden-danger-record.vue | 8 +++----- 18 files changed, 72 insertions(+), 66 deletions(-) diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue index 69fdb0d..74baaa2 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue @@ -20,7 +20,8 @@ 隐患快报 - 隐患排查 + 风险管控清单检查 + 隐患排查清单检查 安全环保检查 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue index d895398..62855f8 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue @@ -19,9 +19,9 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 安全环保检查 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue index 03c936f..a9ec123 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue @@ -14,9 +14,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue index 8b882bd..e8824ec 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue @@ -30,11 +30,9 @@ 安全环保检查 - 风险排查清单检查 - 隐患排查清单检查 - 隐患来源：隐患快报 - 隐患来源：隐患排查 - 隐患来源：隐患排查 + 隐患快报 + 风险排查清单检查 + 隐患排查清单检查 整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} diff --git a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue index 621fc3c..76ade6a 100644 --- a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue @@ -19,9 +19,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue index 934993a..74ad4cb 100644 --- a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue +++ b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue @@ -28,11 +28,9 @@ 安全环保检查 - 风险排查清单检查 - 隐患排查清单检查 - 隐患来源：隐患快报 - 隐患来源：隐患排查 - 隐患来源：隐患排查 + 隐患快报 + 风险排查清单检查 + 隐患排查清单检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue index e47ac43..4fbea0f 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue @@ -19,10 +19,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 安全环保检查 - 安全环保检查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue index 6d8b31f..4edf365 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue @@ -19,11 +19,11 @@ 隐患来源 - 隐患快报 - 风险排查 - 风险排查 - 安全环保检查 - 安全环保检查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue index a762ccb..2b0788d 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue @@ -14,9 +14,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue index 78cc362..f0b68eb 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue @@ -33,11 +33,9 @@ 安全环保检查 - 风险排查清单检查 - 隐患排查清单检查 - 隐患来源：隐患快报 - 隐患来源：隐患排查 - 隐患来源：隐患排查 + 隐患快报 + 风险排查清单检查 + 隐患排查清单检查 整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue index 14a16ca..ae92f34 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue @@ -15,9 +15,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue index 9871c5d..ae92f34 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue @@ -15,9 +15,11 @@ 隐患来源 - 隐患快报 - 风险排查 - 风险排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue index 96b269c..a2faad2 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue @@ -15,9 +15,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue index 40a3a41..531596b 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue @@ -33,11 +33,9 @@ 安全环保检查 - 风险排查清单检查 - 隐患排查清单检查 - 隐患来源：隐患快报 - 隐患来源：隐患排查 - 隐患来源：隐患排查 + 隐患快报 + 风险排查清单检查 + 隐患排查清单检查 整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue index c99e89e..04929dd 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue @@ -17,9 +17,9 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 安全环保检查 安全环保检查 @@ -422,7 +422,7 @@ - + 安全环保验收信息 diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue index e296b8b..49ce3bc 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue @@ -15,9 +15,9 @@ 隐患来源 - 隐患快报 - 风险排查 - 风险排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 安全环保检查 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue index 67faa4f..c49a3b1 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue @@ -12,9 +12,11 @@ 隐患来源 - 隐患快报 - 隐患排查 - 隐患排查 + 隐患快报 + 风险管控清单检查 + 隐患排查清单检查 + 安全环保检查 + 安全环保检查 diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue index 644be4d..f239c3f 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue @@ -119,11 +119,9 @@ 安全环保检查 - 风险排查清单检查 - 隐患排查清单检查 - 隐患来源：隐患快报 - 隐患来源：隐患排查 - 隐患来源：隐患排查 + 隐患快报 + 风险排查清单检查 + 隐患排查清单检查 整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}