flx:修复危大

pages/projectEnd/dangerBigProject/control.vue

@@ -13,7 +13,7 @@
 					:class="{'b-bottom': index != (listData.length-1)}">
 					<view class="item-lable">{{item.controlContent}}</view>
 					<view class="item-switch flex j-between a-center">
-						<switch :disabled="dangerEngineering.finalAcceptanceStatus === 2 || isDisabled"
+						<switch :disabled="info.recordStatus === 3"
 							:checked="item.chooseType == 1" style="transform: scale(0.7);" @change="changStatus(item)"
 							@click="disabledTip" />
 						{{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.userInfo.accountType != 6 || (this.info.personLiableIds && this.info.personLiableIds.includes(this.userInfo.userId))) {
-					if (this.dangerEngineering.finalAcceptanceStatus === 2) {
+					if (this.info.recordStatus === 3) {
 						uni.showToast({
 							title: '该项危大工程已闭合，请勿重复操作',
 							icon: "none",

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) }}
 							</view>
-							<view class="state-box" v-if="detailData.securityStatus"
+							<view class="state-box" v-if="detailData.securityStatus && detailData.recordStatus == 2"
 								:class="{'wg-box':detailData.securityStatus == 2,'xgz-box':detailData.securityStatus == 1}">
 								{{ detailData.securityStatus == 1 ? '需关注' : '安全可控' }}
 							</view>
@@ -103,8 +103,8 @@
 					<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
 					<span>+</span>
 				</view> -->
-				<view class="save-box" v-if="activeIndex != 7 && activeIndex != 2 && detailData.finalAcceptanceStatus !== 2 && btnAuth 
+				<view class="save-box" v-if="activeIndex != 7 && activeIndex != 2 && btnAuth 
-					&& userInfo.accountType != 6 || userInfo.userId == detailData.personLiableId">
+					&& (userInfo.accountType != 6 || detailData.personLiableIds.includes(userInfo.userId))">
 					<view class="save-btn" @click="addForm">
 						{{activeIndex == 1 ? '新增进度记录' : activeIndex == 5 ? '新增隐患记录' : activeIndex == 6 ? '新增旁站记录' : '新增验收记录'}}
 					</view>
@@ -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

pages/projectEnd/dangerBigProject/index.vue

@@ -22,7 +22,7 @@
 					<view class="main3_box-bottom">
 						<view class="box-item1">
 							<view class="cw-box">
-								<view>{{item.regionNames ? item.regionNames : '--'}}</view>
+								<view>{{item.engineeringName ? item.engineeringName : '--'}}</view>
 								<view v-if="item.dangerType == 2" class="cw-box1">超危</view>
 							</view>
 							<view class="state-main">
@@ -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) }}
 								</view>
-								<view class="state-box" v-if="item.securityStatus"
+								<view class="state-box" v-if="item.securityStatus && item.recordStatus == 2"
 									:class="{'wg-box':item.securityStatus == 2,'xgz-box':item.securityStatus == 1}">
 									{{ item.securityStatus == 1 ? '需关注' : '安全可控' }}
 								</view>

pages/projectEnd/rotaryDrillingPileMonitor/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>