diff --git a/main.js b/main.js
index 43b3cbdf..b609bfbf 100644
--- a/main.js
+++ b/main.js
@@ -37,15 +37,15 @@ 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://192.168.34.221:9111/' //郭圣雄本地
+  Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
   // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
   // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
   // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
-  Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
-  // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
+  // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+  Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
   // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
   // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
@@ -86,13 +86,13 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
 	// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
 	// 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: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://192.168.34.221:9111/' // 百色三标段
 	// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
-	Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
-	// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
+	// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
+	Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
 	// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
 	// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
 	// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南
diff --git a/manifest.json b/manifest.json
index a461d31a..f9d015e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.5.0",
-    "versionCode" : 150,
+    "versionName" : "1.5.1",
+    "versionCode" : 151,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/messageCenter/messageCenter.vue b/pages/messageCenter/messageCenter.vue
index 0e46163c..1af2bf8c 100644
--- a/pages/messageCenter/messageCenter.vue
+++ b/pages/messageCenter/messageCenter.vue
@@ -14,7 +14,7 @@
 		<view class="centerContent">
 			<view class="uni-form-item">
 				<input class="uni-input" name="searchName" v-model="searchName" @input="searchFile"
-					placeholder="请输入搜索内容" />
+					placeholder="请输入标题" />
 				<!-- <uni-icons class="search-icon" type="search" @click="loadData"></uni-icons> -->
 				<button class="mini-btn" type="primary" size="mini" @click="loadData">搜索</button>
 			</view>
diff --git a/pages/projectEnd/dangerBigProject/addConstructionStation.vue b/pages/projectEnd/dangerBigProject/addConstructionStation.vue
index f38b2271..40cd9e63 100644
--- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue
+++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue
@@ -7,14 +7,12 @@
 		</headers>
 		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
 			<view class="plan-form">
-				<!-- <view class="form-item b-bottom">
-					<view class="form-lable"><text class="tag">*</text>旁站记录</view>
-					<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入旁站记录" />
-				</view> -->
+				<view class="form-item b-bottom">
+					<view class="form-lable"><text class="tag">*</text>检查部位</view>
+					<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入检查部位" />
+				</view>
 				<view class="form-item f-column b-bottom">
-					<!-- <view class="form-lable">施工情况</view> -->
 					<view class="form-lable">旁站记录</view>
-					 <!-- <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" /> -->
 					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入旁站记录" />
 					<view class="txt-length">{{textareaLengh}}/50</view>
 				</view>
diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
index fa026a87..f986a21c 100644
--- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue
+++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
@@ -441,6 +441,15 @@
 							this.contractList = res.result.contractList; //合同
 							this.physicalsList = res.result.physicalsList; //体检列表
 							this.safeEducationList = res.result.safeEducationList; //安全教育
+							// 修改工号和身份证展示格式
+							if(this.workerInfo.idCard){
+								let str = "***************"
+								this.workerInfo.idCard = this.workerInfo.idCard.substring(0,3)+str+this.workerInfo.idCard.substring(16)
+							}
+							if(this.workerInfo.attendanceNumber){
+								let str = "***************"
+								this.workerInfo.attendanceNumber = this.workerInfo.attendanceNumber.substring(0,3)+str+this.workerInfo.attendanceNumber.substring(16)
+							}
 							if (this.workerInfo) {
 								this.setCodeColor(this.workerInfo.safeScore)
 							} else {
diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue
index 8005fada..756bbf40 100644
--- a/pages/projectEnd/qualityManage/addIssue.vue
+++ b/pages/projectEnd/qualityManage/addIssue.vue
@@ -559,7 +559,8 @@
 				taskId: '', //任务ID
 				itemId: '', // 任务子ID
 				defaultAuditPerson: "",
-				reviewList: []
+				reviewList: [],
+				areaData: {}
 			}
 		},
 		onLoad(option) {
@@ -758,6 +759,18 @@
 					}
 				})
 			},
+			dealFalseCheck(arr){
+				arr.map(item => {
+					if(item.children){
+						item.checked = false;
+						item.orChecked = false;
+						this.dealFalseCheck(item.children)
+					} else {
+						item.checked = false;
+						item.orChecked = false;
+					}
+				})
+			},
 			//确定选中--回显  
 			checkPointBtn(val, type) {
 				this.form.level = ''
@@ -769,6 +782,7 @@
 					console.log(val, type)
 					this.changePeopleIndex = null
 					// console.log(this.checkPointList, val, this.personList)
+					this.areaData = val[0];
 					this.form.regionId = val[0].id;
 					let arr = JSON.parse(JSON.stringify(val[0].parents));
 					let obj = {
@@ -788,13 +802,14 @@
 					this.form.notifyPerson = val[0].intendanceIds;
 					// 分包单位数据拿取
 					this.subpackageLsit = val[0].enterpriseInfos
+					this.personUpdateList = []
 					// 整改人数据拿取
-					this.personUpdateList = val[0].systemUsers
-					this.personUpdateList.forEach((item, index) => {
-						if (item.userId == val[0].dutyId) {
-							this.changePeopleIndex = index
-						}
-					});
+					// this.personUpdateList = val[0].systemUsers
+					// this.personUpdateList.forEach((item, index) => {
+					// 	if (item.userId == val[0].dutyId) {
+					// 		this.changePeopleIndex = index
+					// 	}
+					// });
 				} else if (type == 2) {
 					console.log('选择问题描述的数据', val);
 					//设置问题描述
@@ -991,6 +1006,15 @@
 				this.$nextTick(() => {
 					this.isShowPicker = true;
 				});
+				let newArr = [];
+				if (this.areaData.systemUsers) {
+					this.areaData.systemUsers.filter((item) => {
+						if (item.userId && item.enterpriseId == this.unitEnterpriseId) {
+							newArr.push(item);
+						}
+					});
+					this.personUpdateList = newArr;
+				}
 				// this.getPersonUpdateList();
 				// } else {
 				// 	this.form.enterpriseSn = val.enterpriseSn;
@@ -1422,6 +1446,23 @@
 				this.subsectionIndex = -1
 				this.subentryIndex = -1
 				this.changePeopleIndex = null
+				// 重置检查部位
+				this.dealFalseCheck(this.checkPointList);
+				this.$refs.locationTree._reTreeList();
+				// 分包单位数据拿取
+				this.subpackageLsit = []
+				// 整改人数据拿取
+				this.personUpdateList = []
+				let index = this.personList.findIndex(item => {
+					return item.userId == this.userInfo.userId;
+				})
+				if (index != -1) {
+					this.verifyManIndex = index;
+					this.form.verifyManId = this.personList[index].userId;
+				} else {
+					this.defaultAuditPerson = this.userInfo.realName;
+					this.form.verifyManId = this.userInfo.userId;
+				}
 			}
 		}
 	}
diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue
index 7a9fe2c2..1e00a388 100644
--- a/pages/projectEnd/safeSame/addIssue.vue
+++ b/pages/projectEnd/safeSame/addIssue.vue
@@ -559,7 +559,8 @@
 				taskId: '', //任务ID
 				itemId: '', // 任务子ID
 				defaultAuditPerson: "",
-				reviewList: []
+				reviewList: [],
+				areaData: {}
 			}
 		},
 		onLoad(option) {
@@ -758,6 +759,18 @@
 					}
 				})
 			},
+			dealFalseCheck(arr) {
+				arr.map(item => {
+					if (item.children) {
+						item.checked = false;
+						item.orChecked = false;
+						this.dealFalseCheck(item.children)
+					} else {
+						item.checked = false;
+						item.orChecked = false;
+					}
+				})
+			},
 			//确定选中--回显  
 			checkPointBtn(val, type) {
 				this.form.level = ''
@@ -768,6 +781,7 @@
 					this.form.changeId = "";
 					// console.log(val, type)
 					this.changePeopleIndex = null
+					this.areaData = val[0];
 					console.log(this.checkPointList, val, this.personList)
 					this.form.regionId = val[0].id;
 					let arr = JSON.parse(JSON.stringify(val[0].parents));
@@ -782,19 +796,23 @@
 					}).join("/");
 					this.checkPointName = regionName;
 					this.form.regionName = regionName;
-					
+
 					this.form.changeId = val[0].dutyId;
 					this.notifier = val[0].intendanceNames;
 					this.form.notifyPerson = val[0].intendanceIds;
+					// 重置检查部位
+					this.dealFalseCheck(this.checkPointList);
+					this.$refs.locationTree._reTreeList();
 					// 分包单位数据拿取
 					this.subpackageLsit = val[0].enterpriseInfos
+					this.personUpdateList = []
 					// 整改人数据拿取
-					this.personUpdateList = val[0].systemUsers
-					this.personUpdateList.forEach((item, index) => {
-						if (item.userId == val[0].dutyId) {
-							this.changePeopleIndex = index
-						}
-					});
+					// this.personUpdateList = val[0].systemUsers
+					// this.personUpdateList.forEach((item, index) => {
+					// 	if (item.userId == val[0].dutyId) {
+					// 		this.changePeopleIndex = index
+					// 	}
+					// });
 				} else if (type == 2) {
 					console.log('选择问题描述的数据', val);
 					//设置问题描述
@@ -991,6 +1009,15 @@
 				this.$nextTick(() => {
 					this.isShowPicker = true;
 				});
+				let newArr = [];
+				if (this.areaData.systemUsers) {
+					this.areaData.systemUsers.filter((item) => {
+						if (item.userId && item.enterpriseId == this.unitEnterpriseId) {
+							newArr.push(item);
+						}
+					});
+					this.personUpdateList = newArr;
+				}
 				// this.getPersonUpdateList();
 				// } else {
 				// 	this.form.enterpriseSn = val.enterpriseSn;
@@ -1422,6 +1449,20 @@
 				this.subsectionIndex = -1
 				this.subentryIndex = -1
 				this.changePeopleIndex = null
+				// 分包单位数据拿取
+				this.subpackageLsit = []
+				// 整改人数据拿取
+				this.personUpdateList = []
+				let index = this.personList.findIndex(item => {
+					return item.userId == this.userInfo.userId;
+				})
+				if (index != -1) {
+					this.verifyManIndex = index;
+					this.form.verifyManId = this.personList[index].userId;
+				} else {
+					this.defaultAuditPerson = this.userInfo.realName;
+					this.form.verifyManId = this.userInfo.userId;
+				}
 			}
 		}
 	}
diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue
index b42d6e29..50e9c949 100644
--- a/pages/projectEnd/scan/saoSao.vue
+++ b/pages/projectEnd/scan/saoSao.vue
@@ -49,7 +49,7 @@
 								<uni-icons @click="deleteImg(item)" class="deleteImg" type="clear" size="24">
 								</uni-icons>
 							</view>
-							<view class="addImgBox" @click="selectImg" v-if="fileList.length<5">
+							<view class="addImgBox" @click="selectImg" v-if="fileList.length<1">
 								<image src="/static/icon-add.png" class="icon-add"></image>
 							</view>
 						</view>
@@ -79,25 +79,29 @@
 				form: {
 					alarmDetails: "", //异常详情
 					alarmImage: "", //异常图片
-					inPointName: "巡检点", //巡检点名称
+					inPointName: "", //巡检点名称
 					inPointId: 0, //巡检点名称
-					posiTion: "777563", // 巡检点位置
-					createUserName: "创建人", //创建人
-					createData: "创建时间", //创建时间
+					posiTion: "", // 巡检点位置
+					createUserName: "", //创建人
+					createData: "", //创建时间
 					templateList: [],
 					status: 1,
-
 				},
 				fileList: [],
 				status: false,
 				saoData: "",
 				longitude: 0,
 				latitude: 0,
+				sendData: ""
 			}
 		},
 		onLoad(e) {
 			this.checkOpenGPSServiceByAndroid()
 			console.log(e.data,'我的测试数据')
+			this.sendData = JSON.parse(e.data);
+			uni.showLoading({
+				title: "获取数据中"
+			})
 			this.getnow(e.data)
 		},
 		methods: {
@@ -126,6 +130,7 @@
 				}
 			},
 			getnow(Val) {
+				let that = this;
 				uni.getLocation({
 					// type: 'wgs84',
 					type: 'gcj02',
@@ -194,13 +199,23 @@
 
 							// }
 						})
-						this.form.inPointName = data.checkingPointName
-						this.form.createUserName = data.createUserName
-						this.form.posiTion = data.position
-						this.form.inPointId = data.checkingPointId
-						this.form.templateList = JSON.parse(data.template)
-						console.log('this.form.templateList  数据 ' + JSON.parse(data.template)[0].title);
-
+						this.sendRequest({
+							url: "xmgl/checkingPoint/queryById",
+							data: {
+								id: data.checkingPointId
+							},
+							method: "GET",
+							success(res) {
+								console.log('responseData-----------', res);
+								let responseData = res.result || {};
+								that.form.inPointName = responseData.checkingPointName
+								that.form.createUserName = responseData.createUserName
+								that.form.posiTion = responseData.position
+								that.form.inPointId = responseData.checkingPointId
+								that.form.templateList = JSON.parse(responseData.template)
+								uni.hideLoading()
+							}
+						})
 					},
 					fail: function(msg) {
 						console.log("获取位置失败", msg)
@@ -270,12 +285,12 @@
 					data: {
 						alarmDetails: this.form.alarmDetails,
 						alarmImage: JSON.stringify(this.fileList),
-						checkingPointId: this.form.inPointId,
+						// checkingPointId: this.form.inPointId,
 						checkingPointName: this.form.inPointName,
 						checkingPointUserId: userInfo.userId,
 						checkingPointUserName: userInfo.account,
 						createDate: "",
-						id: 0,
+						checkingPointId: this.sendData?this.sendData.checkingPointId:"",
 						position: this.form.posiTion,
 						status: this.form.status,
 						template: JSON.stringify(this.form.templateList),
@@ -306,6 +321,19 @@
 			},
 			//确定提交
 			addBtn() {
+				if(!this.form.alarmDetails && this.form.status == 2){
+					uni.showModal({
+						title: '提示',
+						content: "异常详情不能为空",
+						confirmColor: '#ee6666', //确定字体颜色
+						showCancel: false, //没有取消按钮的弹框
+						buttonText: '确定',
+						success: function(res) {
+					
+						},
+					});
+					return;
+				}
 				if (this.form.templateList.length >= 1) {
 					let check = true
 					this.form.templateList.forEach(res => {