From 6c88b964e7c4326192b945e3f98e24d11c47518b Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sat, 18 May 2024 17:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projectEnd/dangerBigProject/index.vue   |  6 ++--
 .../bindPlatePlug/detail.vue                  | 16 ++++++-----
 .../bindPlatePlug/safeMesure.vue              |  2 +-
 .../specialOperations/fireWork/detail.vue     |  4 ++-
 .../specialOperations/fireWork/safeMesure.vue |  2 +-
 .../fireWork/workFinally.vue                  |  4 ++-
 .../specialOperations/groundSafe/detail.vue   | 12 ++++----
 .../groundSafe/safeMesure.vue                 |  2 +-
 .../specialOperations/highJob/detail.vue      | 12 ++++----
 .../specialOperations/highJob/safeMesure.vue  |  2 +-
 .../specialOperations/hoistSafe/detail.vue    | 12 ++++----
 .../hoistSafe/safeMesure.vue                  |  2 +-
 .../limitSpaceWork/detail.vue                 | 28 ++++++++++---------
 .../limitSpaceWork/safeMesure.vue             |  2 +-
 .../specialOperations/openCircuit/detail.vue  | 10 ++++---
 .../openCircuit/safeMesure.vue                |  2 +-
 .../tempElectricity/detail.vue                | 12 ++++----
 .../tempElectricity/safeMesure.vue            |  2 +-
 18 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue
index 955a310b..5599f3cc 100644
--- a/pages/projectEnd/dangerBigProject/index.vue
+++ b/pages/projectEnd/dangerBigProject/index.vue
@@ -15,9 +15,11 @@
 							{{item.engineeringName}}
 						</view>
 						<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
-						<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
+						<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
+						<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
 							<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
-							{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
+							<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
+							{{item.engineeringState === 4 ? "已完工" : "在施"}}
 						</view>
 						<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
 							{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue
index a5438fa7..3cbac94b 100644
--- a/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue
+++ b/pages/projectEnd/specialOperations/bindPlatePlug/detail.vue
@@ -11,9 +11,9 @@
 						<view class="list-info">
 							作业票编号：<text class="detail-data">{{detailData.workTicketCode}}</text>
 						</view>
-						<view class="list-info">
+						<!-- <view class="list-info">
 							作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
-						</view>
+						</view> -->
 						<view class="list-info">
 							申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
 						</view>
@@ -58,9 +58,9 @@
 									</text>
 								</text>
 							</view> -->
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								盲板编号：<text class="detail-data">{{detailData.blindPlateNo}}</text>
 							</view>
@@ -131,10 +131,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -163,7 +163,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -210,6 +210,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -219,6 +220,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue
index 3033b8ce..fb6211de 100644
--- a/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue
index fcb4fc4f..afb327cd 100644
--- a/pages/projectEnd/specialOperations/fireWork/detail.vue
+++ b/pages/projectEnd/specialOperations/fireWork/detail.vue
@@ -116,7 +116,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -163,6 +163,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -172,6 +173,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
index 835e1e93..901c5874 100644
--- a/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/fireWork/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/fireWork/workFinally.vue b/pages/projectEnd/specialOperations/fireWork/workFinally.vue
index 20fd8a59..d371f788 100644
--- a/pages/projectEnd/specialOperations/fireWork/workFinally.vue
+++ b/pages/projectEnd/specialOperations/fireWork/workFinally.vue
@@ -68,7 +68,9 @@
 </script>
 
 <style lang="scss">
-.danger-project{	
+.danger-project{
+	padding-top: 20rpx;
+	padding-bottom: 40rpx;
 	.finally{
 		background-color: #fff;
 		height: auto;
diff --git a/pages/projectEnd/specialOperations/groundSafe/detail.vue b/pages/projectEnd/specialOperations/groundSafe/detail.vue
index 5c86a80d..eefd6763 100644
--- a/pages/projectEnd/specialOperations/groundSafe/detail.vue
+++ b/pages/projectEnd/specialOperations/groundSafe/detail.vue
@@ -30,9 +30,9 @@
 							<view class="list-info">
 								作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
 							</view>
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
 							</view>
@@ -97,10 +97,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -129,7 +129,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -176,6 +176,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -185,6 +186,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue
index 73aad8b6..7cc85a4b 100644
--- a/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/groundSafe/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/highJob/detail.vue b/pages/projectEnd/specialOperations/highJob/detail.vue
index 8cf37d22..f52eecf1 100644
--- a/pages/projectEnd/specialOperations/highJob/detail.vue
+++ b/pages/projectEnd/specialOperations/highJob/detail.vue
@@ -39,9 +39,9 @@
 							<view class="list-info">
 								作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
 							</view>
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
 							</view>
@@ -96,10 +96,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -128,7 +128,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -175,6 +175,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -184,6 +185,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/highJob/safeMesure.vue b/pages/projectEnd/specialOperations/highJob/safeMesure.vue
index 551115b0..957475c8 100644
--- a/pages/projectEnd/specialOperations/highJob/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/highJob/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/hoistSafe/detail.vue b/pages/projectEnd/specialOperations/hoistSafe/detail.vue
index 5c542eab..ad3602b0 100644
--- a/pages/projectEnd/specialOperations/hoistSafe/detail.vue
+++ b/pages/projectEnd/specialOperations/hoistSafe/detail.vue
@@ -39,9 +39,9 @@
 							<view class="list-info">
 								司索人：<text class="detail-data">{{detailData.siSuoPersonName}}</text>
 							</view>
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								指挥人员：<text class="detail-data">{{detailData.commanderName}}</text>
 							</view>
@@ -96,10 +96,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -128,7 +128,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -175,6 +175,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -184,6 +185,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue
index c7da3d0e..7449bf3e 100644
--- a/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
index 1379bd6f..e98f3912 100644
--- a/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
+++ b/pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
@@ -49,9 +49,9 @@
 									</text>
 								</text>
 							</view>
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
 							</view>
@@ -78,10 +78,10 @@
 										</view>
 										<view class="table-item-inner">
 											<view class="item-col" style="">分析项目</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].name||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].name||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0].name||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1].name||'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0]?JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].name||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1]?JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].name||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0]?JSON.parse(detailData.combustibleGasInformation)[0].name||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1]?JSON.parse(detailData.combustibleGasInformation)[1].name||'--':'--'}}</view>
 											<view class="item-col" style="">--</view>
 											<view class="item-col" style="">--</view>
 											<view class="item-col" style="">--</view>
@@ -89,10 +89,10 @@
 										</view>
 										<view class="table-item-inner">
 											<view class="item-col" style="">合格标准</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].standard||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].standard||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0].standard||'--'}}</view>
-											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1].standard||'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[0]?JSON.parse(detailData.toxicAndHarmfulGasInformation)[0].standard||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.toxicAndHarmfulGasInformation)[1]?JSON.parse(detailData.toxicAndHarmfulGasInformation)[1].standard||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[0]?JSON.parse(detailData.combustibleGasInformation)[0].standard||'--':'--'}}</view>
+											<view class="item-col" style="">{{JSON.parse(detailData.combustibleGasInformation)[1]?JSON.parse(detailData.combustibleGasInformation)[1].standard||'--':'--'}}</view>
 											<view class="item-col" style="">19.5%~21%(体积分数)</view>
 											<view class="item-col" style="">--</view>
 											<view class="item-col" style="">--</view>
@@ -175,10 +175,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						<view v-if="COMPANY != 'longguang'" class="more-btn" @click="isShow=!isShow">
@@ -205,7 +205,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -252,6 +252,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -261,6 +262,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue
index a8195e1f..747d2848 100644
--- a/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/openCircuit/detail.vue b/pages/projectEnd/specialOperations/openCircuit/detail.vue
index 5c38e587..7f088785 100644
--- a/pages/projectEnd/specialOperations/openCircuit/detail.vue
+++ b/pages/projectEnd/specialOperations/openCircuit/detail.vue
@@ -25,7 +25,7 @@
 						</view>
 						<view class="" v-if="isShow">
 							<view class="list-info">
-								涉及相关单位（部门）：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
+								涉及相关单位（部门）：<text class="detail-data">{{detailData.involveRelatedUnit}}</text>
 							</view>
 							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
@@ -105,10 +105,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -137,7 +137,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -184,6 +184,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -193,6 +194,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue
index 520b383b..1a0d1f8c 100644
--- a/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/openCircuit/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{
diff --git a/pages/projectEnd/specialOperations/tempElectricity/detail.vue b/pages/projectEnd/specialOperations/tempElectricity/detail.vue
index 382df816..c1270439 100644
--- a/pages/projectEnd/specialOperations/tempElectricity/detail.vue
+++ b/pages/projectEnd/specialOperations/tempElectricity/detail.vue
@@ -51,9 +51,9 @@
 							<view class="list-info">
 								额定功率	：<text class="detail-data">{{detailData.ratedPower}}</text>
 							</view>
-							<!-- <view class="list-info">
+							<view class="list-info">
 								监护人：<text class="detail-data">{{detailData.guardianName}}</text>
-							</view> -->
+							</view>
 							<view class="list-info">
 								用电人：<text class="detail-data">{{detailData.electricityCustomerName}}</text>
 							</view>
@@ -114,10 +114,10 @@
 									<view class="content-3"><text style="float: right;">接受交底人：</text></view>
 									<view class="content-4">{{detailData.acceptTheInformantName}}</view>
 								</view>
-								<view class="other-content">
+								<!-- <view class="other-content">
 									<view class="content-1"><text style="float: right;">监护人：</text></view>
 									<view class="content-2">{{detailData.guardianName}}</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						
@@ -146,7 +146,7 @@
 						</view>
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
-					<view class="add-btn" v-if="activeIndex != 7
+					<view class="add-btn" v-if="activeIndex != 7 && userInfo.userId === detailData.assignmentPersonInCharge
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
@@ -193,6 +193,7 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
+				userInfo: {}
 			}
 		},
 		onReachBottom() {
@@ -202,6 +203,7 @@
 			console.log(2)
 		},
 		onShow(){
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.initData()
 			this.getWork()
diff --git a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue
index ba5e1e1d..a4cb9ada 100644
--- a/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue
+++ b/pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue
@@ -112,7 +112,7 @@
 	}
 	.safe-mesure-container{
 		padding: 0 30rpx;
-		padding-top: 88rpx;
+		padding-top: 138rpx;
 		padding-bottom: 100rpx;
 		// background-color: darkred;
 		.safe-mesure-header{