From 3d5b121c7799b443718434c5fccb4d0041d1927d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 9 May 2024 20:29:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  8 ++---
 pages/messageCenter/messageCenter.vue         |  2 +-
 .../addConstructionStation.vue                |  8 ++---
 pages/projectEnd/qualityManage/addIssue.vue   | 26 +++++++++++----
 pages/projectEnd/safeSame/addIssue.vue        | 32 +++++++++++++------
 5 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/main.js b/main.js
index 907ed53d..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/' // 湖里
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 bae1700c..89b73cbd 100644
--- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue
+++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue
@@ -8,12 +8,12 @@
 		<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 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>
-					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" />
+					<view class="form-lable">旁站记录</view>
+					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入旁站记录" />
 					<view class="txt-length">{{textareaLengh}}/50</view>
 				</view>
 				<view class="form-item f-column">
diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue
index 7a332103..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) {
@@ -781,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 = {
@@ -800,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);
 					//设置问题描述
@@ -1003,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;
diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue
index d95808b0..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,9 +759,9 @@
 					}
 				})
 			},
-			dealFalseCheck(arr){
+			dealFalseCheck(arr) {
 				arr.map(item => {
-					if(item.children){
+					if (item.children) {
 						item.checked = false;
 						item.orChecked = false;
 						this.dealFalseCheck(item.children)
@@ -780,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));
@@ -794,7 +796,7 @@
 					}).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;
@@ -803,13 +805,14 @@
 					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);
 					//设置问题描述
@@ -1006,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;