From 7379b8942c0a2b86e340ae01784232ae624fa59c Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Wed, 14 Jan 2026 18:13:44 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E5=A4=8D=E5=8D=B1=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/dangerBigProject/control.vue | 6 ++--- pages/projectEnd/dangerBigProject/details.vue | 11 ++++++---- pages/projectEnd/dangerBigProject/index.vue | 4 ++-- .../rotaryDrillingPileMonitor/index.vue | 22 +++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 pages/projectEnd/rotaryDrillingPileMonitor/index.vue diff --git a/pages/projectEnd/dangerBigProject/control.vue b/pages/projectEnd/dangerBigProject/control.vue index f6d63048..d2d0b5b6 100644 --- a/pages/projectEnd/dangerBigProject/control.vue +++ b/pages/projectEnd/dangerBigProject/control.vue @@ -13,7 +13,7 @@ :class="{'b-bottom': index != (listData.length-1)}"> {{item.controlContent}} - {{item.chooseType == 1 ? item.yesShowName:item.noShowName}} @@ -143,8 +143,8 @@ }) }, disabledTip() { - if (this.userInfo.accountType != 6 || this.userInfo.userId == this.info.personLiableId) { - if (this.dangerEngineering.finalAcceptanceStatus === 2) { + if (this.userInfo.accountType != 6 || (this.info.personLiableIds && this.info.personLiableIds.includes(this.userInfo.userId))) { + if (this.info.recordStatus === 3) { uni.showToast({ title: '该项危大工程已闭合,请勿重复操作', icon: "none", diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue index ba875856..1fbb3c4c 100644 --- a/pages/projectEnd/dangerBigProject/details.vue +++ b/pages/projectEnd/dangerBigProject/details.vue @@ -18,7 +18,7 @@ :class="{'wkg-box':detailData.recordStatus == 1 || detailData.recordStatus == 4,'zs-box':detailData.recordStatus == 2,'wg-box':detailData.recordStatus == 3}"> {{ recordStatusUp(detailData.recordStatus) }} - {{ detailData.securityStatus == 1 ? '需关注' : '安全可控' }} @@ -103,8 +103,8 @@ + --> - + {{activeIndex == 1 ? '新增进度记录' : activeIndex == 5 ? '新增隐患记录' : activeIndex == 6 ? '新增旁站记录' : '新增验收记录'}} @@ -236,7 +236,10 @@ // if(res.code==200){ // this.listData = res.result.records // } - this.detailData = res.result + this.detailData = { + ...res.result, + personLiableIds: res.result.personLiableIds ? res.result.personLiableIds : '' + }; // this.getApply(); this.checkNav({ id: 2 diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue index ad0c3638..4c80bdaf 100644 --- a/pages/projectEnd/dangerBigProject/index.vue +++ b/pages/projectEnd/dangerBigProject/index.vue @@ -22,7 +22,7 @@ - {{item.regionNames ? item.regionNames : '--'}} + {{item.engineeringName ? item.engineeringName : '--'}} 超危 @@ -30,7 +30,7 @@ :class="{'wkg-box':item.recordStatus == 1 || item.recordStatus == 4,'zs-box':item.recordStatus == 2,'wg-box':item.recordStatus == 3}"> {{ recordStatusUp(item.recordStatus) }} - {{ item.securityStatus == 1 ? '需关注' : '安全可控' }} diff --git a/pages/projectEnd/rotaryDrillingPileMonitor/index.vue b/pages/projectEnd/rotaryDrillingPileMonitor/index.vue new file mode 100644 index 00000000..87b68990 --- /dev/null +++ b/pages/projectEnd/rotaryDrillingPileMonitor/index.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file