From 28089d7837ea5ec194981b60bc23ce854c039b7e Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 5 Jun 2024 13:57:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                           | 4 ++--
 manifest.json                                     | 4 ++--
 pages/personLocation/exam/beginexam/beginexam.vue | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.js b/main.js
index a0a76539..72c22785 100644
--- a/main.js
+++ b/main.js
@@ -37,9 +37,9 @@ if (process.env.NODE_ENV === 'development') {
 	console.log('开发环境')
 	// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
 	// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
-	Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
+	// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
 	// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
-	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
+	Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
 	// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
 	// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
 	// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
diff --git a/manifest.json b/manifest.json
index cfeae4a5..ea0b2554 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.5.8",
-    "versionCode" : 158,
+    "versionName" : "1.5.9",
+    "versionCode" : 159,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/personLocation/exam/beginexam/beginexam.vue b/pages/personLocation/exam/beginexam/beginexam.vue
index a9c82a1a..a5e0f2b2 100644
--- a/pages/personLocation/exam/beginexam/beginexam.vue
+++ b/pages/personLocation/exam/beginexam/beginexam.vue
@@ -10,7 +10,9 @@
 			<view class="beginexam" v-for="(item,index) in stList" :key="index" v-show="index == stIndex">
 				<view class="questionTitle">
 					<text class="text">{{index + 1}}、</text>
-					<text class="text">{{item.questionName}}({{item.score||0}}分)</text>
+					<!-- <text class="text">{{item.questionName}}({{item.score||0}}分)</text> -->
+					<text class="text" v-html="item.questionName"></text>
+					<text>({{item.score||0}}分)</text>
 				</view>
 				<view class="radio-content">
 					<radio-group @change="radioChange" class="radio-boxs" v-if="item.type == 1">

From 7da032e55ecf3a12a63fec4fd075bfb8263ce448 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 5 Jun 2024 19:39:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8D=B1=E5=A4=A7?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=95=B0=E6=8D=AE=E5=8F=AA=E8=83=BD=E7=94=B1?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B4=A6=E5=8F=B7=E5=92=8C=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D=E7=9A=84=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  4 +-
 pages/projectEnd/dangerBigProject/control.vue | 56 +++++++++++++------
 pages/projectEnd/dangerBigProject/details.vue |  7 ++-
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/main.js b/main.js
index 0d95ce72..d439baba 100644
--- a/main.js
+++ b/main.js
@@ -38,8 +38,8 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
 	// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
 	// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
-	// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
-	Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
+	Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
+	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
 	// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
 	// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
 	// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
diff --git a/pages/projectEnd/dangerBigProject/control.vue b/pages/projectEnd/dangerBigProject/control.vue
index 772696d0..259b9725 100644
--- a/pages/projectEnd/dangerBigProject/control.vue
+++ b/pages/projectEnd/dangerBigProject/control.vue
@@ -28,20 +28,27 @@
 
 <script>
 	export default {
-		props:['detailId','detailData'],
+		props:['detailId','info'],
 		data(){
 			return{
 				listData:[],
 				checkNum: 0,
 				dangerEngineering: {},
-				isDisabled: false
+				isDisabled: false,
+				userInfo:{}
 			}
 		},
+		mounted() {
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+		},
 		created(){
 			this.initData()
 			this.getDEById()
 			this.getApply()
 		},
+		onShow() {
+			this.getApply()
+		},
 		methods:{
 			initData(){
 				this.sendRequest({
@@ -76,13 +83,19 @@
 						uni.hideLoading()
 						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
 						let result = res.result
-						if(res.result.length>0){
-							if(res.result[0].acceptanceResult === null) this.isDisabled = true
-							if(res.result[0].acceptanceResult === 1) this.isDisabled = true
-							if(res.result[0].acceptanceResult === 2) this.isDisabled = false
+						console.log(this.info,"8888888888888888888888888888888");
+						if(this.userInfo.accountType != 6 || this.userInfo.userId == this.info.personLiableId){
+							if(res.result.length>0){
+								if(res.result[0].acceptanceResult === null) this.isDisabled = true
+								if(res.result[0].acceptanceResult === 1) this.isDisabled = true
+								if(res.result[0].acceptanceResult === 2) this.isDisabled = false
+							}else{
+								this.isDisabled = false
+							}
 						}else{
-							this.isDisabled = false
+							this.isDisabled = true
 						}
+						console.log(this.isDisabled,"999999999999999999999999999");
 					}
 				})
 			},
@@ -123,17 +136,26 @@
 				})
 			},
 			disabledTip(){
-				if(this.dangerEngineering.finalAcceptanceStatus === 2){
+				if(this.userInfo.accountType != 6 || this.userInfo.userId == this.info.personLiableId){
+					if(this.dangerEngineering.finalAcceptanceStatus === 2){
+						uni.showToast({
+							title: '该项危大工程已闭合，请勿重复操作',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if(this.isDisabled){
+						uni.showToast({
+							title: '等待验收中，请勿重复操作',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}else{
 					uni.showToast({
-					    title: '该项危大工程已闭合，请勿重复操作',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if(this.isDisabled){
-					uni.showToast({
-					    title: '等待验收中，请勿重复操作',
+						title: '您没有权限操作！',
 						icon: "none",
 						duration: 2000
 					});
diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue
index 8ac6e288..e5b2403f 100644
--- a/pages/projectEnd/dangerBigProject/details.vue
+++ b/pages/projectEnd/dangerBigProject/details.vue
@@ -68,7 +68,8 @@
 					</view>
 					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
 					<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 
-					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth"
+					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn && btnAuth 
+					&& userInfo.accountType != 6 || userInfo.userId == detailData.personLiableId"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
 						<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
@@ -135,7 +136,8 @@
 				detailId: "",
 				detailData:{},
 				isShowBtn: null,
-				btnAuth: true
+				btnAuth: true,
+				userInfo:{},
 			}
 		},
 		onReachBottom() {
@@ -163,6 +165,7 @@
 			// this.initData()
 		},
 		mounted() {
+			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
 		},
 		methods:{
 			initData(){