From 1ad80cf8f06c4af679112055082f3be1e4141fd9 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 7 Jun 2024 17:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ai=E9=A2=84=E8=AD=A6=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=AE=89=E5=85=A8=E5=92=8C=E8=B4=A8=E9=87=8F=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/alarmPage/disposition/disposition.vue | 67 ++++++++++++---------
 pages/alarmPage/shutting/shutting.vue       | 36 ++++++-----
 pages/projectEnd/qualityManage/addIssue.vue | 11 +++-
 pages/projectEnd/safeSame/addIssue.vue      | 12 +++-
 4 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/pages/alarmPage/disposition/disposition.vue b/pages/alarmPage/disposition/disposition.vue
index 5cdd9f45..8e1928ac 100644
--- a/pages/alarmPage/disposition/disposition.vue
+++ b/pages/alarmPage/disposition/disposition.vue
@@ -13,7 +13,7 @@
 			</headers>
 		</view>
 		<view class="content">
-			<!-- <view class="row-line">
+			<view class="row-line">
 				<view class="row-label">
 					<text style="color: firebrick;">*</text>
 					<text>处置结果</text>
@@ -25,7 +25,7 @@
 					</radio-group>
 				</view>
 			</view>
-			<view class="row-line" v-show="isDis === 'dis'">
+			<!-- <view class="row-line" v-show="isDis === 'dis'">
 				<view class="row-label">
 					<text>描述</text>
 				</view>
@@ -74,10 +74,6 @@
 					<text style="display: flex;align-items: center;margin-left: 10px;">分</text>
 				</view>
 			</view>
-			
-			
-			
-			
 		</view>
 		<view class="confirm-btn" @click="confirm">
 			<view class="inner-btn">确认</view>
@@ -131,19 +127,35 @@
 				console.log(">>>>>>>>>>>>>>>>>>>>>>>");
 				console.log(this.selectedItem);
 				console.log(this.alarmItem);
-				if(this.workerId === '' || this.workerId === null || this.workerId === undefined){
-					uni.showToast({
-					  title: '请选择违章人员',
-					  icon: "none"
-					})
-					return
-				}
-				if(!this.deductScore){
-					uni.showToast({
-					  title: '请输入分数',
-					  icon: "none"
-					})
-					return
+				let requestData = {}
+				if(this.isDis == 'dis'){
+					requestData = {
+						...this.alarmItem,
+						handleResult: 1,
+						handleDone: true,
+						projectSn: this.projectSn,
+						workerInfoList: [{id: this.workerId}]
+					}
+					if(this.workerId === '' || this.workerId === null || this.workerId === undefined){
+						uni.showToast({
+						  title: '请选择违章人员',
+						  icon: "none"
+						})
+						return
+					}
+					if(!this.deductScore){
+						uni.showToast({
+						  title: '请输入分数',
+						  icon: "none"
+						})
+						return
+					}
+				}else{
+					requestData = {
+						...this.alarmItem,
+						handleResult: 2,
+						projectSn: this.projectSn,
+					}
 				}
 				// if(this.isDis === 'dis') {
 				// 	if(this.workerId === '' || this.workerId === null || this.workerId === undefined){
@@ -179,21 +191,16 @@
 				// 	this.alarmItem.handleResult = this.handleResult
 				// }
 				// this.handleResult = 1
-				let requestData = {
-					...this.alarmItem,
-					handleResult: 1,
-					handleDone: true,
-					projectSn: this.projectSn,
-					workerInfoList: [{id: this.workerId}]
-				}
+				
 				this.sendRequest({
-					url: 'xmgl/aiAnalyseHardWareAlarmRecord/edit',
+					// url: 'xmgl/aiAnalyseHardWareAlarmRecord/edit',
+					url: 'xmgl/aiAnalyseHardWareAlarmRecord/setFalsePositive',
 					method: "post",
 					data: requestData,
 					success: res => {
 						if (res.code == 200) {
 							console.log('res', res)
-							uni.navigateBack({delta: 1})
+							uni.navigateBack({delta: 2})
 						}
 					}
 				})
@@ -221,8 +228,8 @@
 			},
 			cleanForm(){
 				this.workerId = ''
-				this.desc = ''
-				this.deductScore = ''
+				// this.desc = ''
+				// this.deductScore = ''
 			},
 			bindTextAreaBlur(e) {
 				this.desc = e.detail.value
diff --git a/pages/alarmPage/shutting/shutting.vue b/pages/alarmPage/shutting/shutting.vue
index bd745426..41ce2b93 100644
--- a/pages/alarmPage/shutting/shutting.vue
+++ b/pages/alarmPage/shutting/shutting.vue
@@ -13,20 +13,23 @@
 			</headers>
 		</view>
 		<view class="content">
-			<!-- <view class="row-line">
+			<view class="row-line">
 				<view class="row-label">
 					<text style="color: firebrick;">*</text>
 					<text>处置结果</text>
 				</view>
 				<view class="row-content">
-					<text style="color: #d8d8d8;">已处置</text>
-					<radio-group @change="isShowContent" v-model="isDis">
-						<radio value="dis" checked="true">已处置</radio>
-						<radio value="ign" disabled="true" style="">误报忽略</radio>
+					<!-- <text style="color: #d8d8d8;">已处置</text> -->
+					<!-- <radio-group @change="isShowContent" v-model="alarmItem.handleResult"> -->
+					<radio-group v-model="alarmItem.handleResult">
+						<!-- <radio :value="1" checked="true">已处置</radio>
+						<radio :value="2" disabled="true" style="">误报忽略</radio> -->
+						<radio :disabled="true" :checked="alarmItem.handleResult == 1">已处置</radio>
+						<radio :disabled="true" :checked="alarmItem.handleResult == 2">误报忽略</radio>
 					</radio-group>
 				</view>
 			</view>
-			<view class="row-line" v-show="isDis === 'dis'">
+			<!-- <view class="row-line" v-show="alarmItem.handleResult === 1">
 				<view class="row-label">
 					<text>描述</text>
 				</view>
@@ -34,7 +37,7 @@
 					<textarea style="background-color: #e1e1e1;" disabled :value="alarmItem.desc" @blur="bindTextAreaBlur" />
 				</view>
 			</view> -->
-			<view class="row-line" v-show="isDis === 'dis'">
+			<view class="row-line" v-show="alarmItem.handleResult === 1">
 				<view class="row-label">
 					<text style="color: firebrick;">*</text>
 					<text>违章人员</text>
@@ -48,7 +51,7 @@
 					</select> -->
 				</view>
 			</view>
-			<view class="row-line" v-show="isDis === 'dis'">
+			<view class="row-line" v-show="alarmItem.handleResult === 1">
 				<view class="row-label">
 					<text style="color: firebrick;">*</text>
 					<text>扣</text>
@@ -72,7 +75,7 @@
 	export default {
 		data() {
 			return {
-				isDis: 'dis',
+				handleResult: '',
 				dispositionForm: {
 					workerId: '',
 					desc: '',
@@ -87,6 +90,7 @@
 		onLoad(option) {
 			this.alarmItem = JSON.parse(decodeURIComponent(option.item));
 			this.alarmItem.deductScore = this.alarmItem.aiDeductRule.deductScore;
+			// this.handleResult = this.alarmItem.handleResult
 			console.log('alarmItem',this.alarmItem)
 		},
 		mounted() {
@@ -109,13 +113,13 @@
 					}
 				})
 			},
-			isShowContent(e){
-				this.isDis = e.detail.value
-				if(this.isDis === 'ign'){
-					this.cleanForm()
-				}
-				console.log(this.dispositionForm);
-			},
+			// isShowContent(e){
+			// 	this.handleResult = e.detail.value
+			// 	if(this.handleResult === 2){
+			// 		this.cleanForm()
+			// 	}
+			// 	console.log(this.dispositionForm);
+			// },
 			cleanForm(){
 				this.dispositionForm.workerId = ''
 				this.dispositionForm.desc = ''
diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue
index 756bbf40..b4e37c32 100644
--- a/pages/projectEnd/qualityManage/addIssue.vue
+++ b/pages/projectEnd/qualityManage/addIssue.vue
@@ -570,7 +570,7 @@
 			this.getCheckPointList();
 			this.getIssueList();
 			this.getPersonList();
-			this.getReviewPeopleList();
+			// this.getReviewPeopleList();
 			// this.getPersonUpdateList();
 			this.getProgressListData()
 			console.log('lll', option.taskId, option.itemId)
@@ -590,7 +590,10 @@
 					method: 'post',
 					data: {
 						projectSn: this.projectSn,
-						enterpriseTypeId: 7,
+						// enterpriseTypeId: 7,
+						qualityRegionId: this.form.regionId,
+						qualityRegionBindType: 2,
+						isSupervisingRoleName: 1
 					},
 					success: res => {
 						console.log(res.result)
@@ -749,7 +752,8 @@
 					url: 'xmgl/qualityRegion/list',
 					method: 'post',
 					data: {
-						projectSn: this.projectSn
+						projectSn: this.projectSn,
+						notSupervisingUnit: 1
 					},
 					success: res => {
 						if (res.code == 200) {
@@ -810,6 +814,7 @@
 					// 		this.changePeopleIndex = index
 					// 	}
 					// });
+					this.getReviewPeopleList()
 				} else if (type == 2) {
 					console.log('选择问题描述的数据', val);
 					//设置问题描述
diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue
index fa2e8c7a..2b469abf 100644
--- a/pages/projectEnd/safeSame/addIssue.vue
+++ b/pages/projectEnd/safeSame/addIssue.vue
@@ -89,6 +89,7 @@
 				<textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent"
 					@input='supplementTextarea' :value="form.dangerDesc" placeholder="请输入"></textarea>
 			</view>
+			
 			<view class="type flex3" v-if="typeCheck == 'type1'">
 				<view class="name">整改要求：</view>
 				<textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent"
@@ -572,7 +573,7 @@
 			this.getCheckPointList();
 			this.getIssueList();
 			this.getPersonList();
-			this.getReviewPeopleList();
+			// this.getReviewPeopleList();
 			// this.getPersonUpdateList();
 			this.getProgressListData()
 			console.log('lll', option.taskId, option.itemId)
@@ -594,7 +595,10 @@
 					method: 'post',
 					data: {
 						projectSn: this.projectSn,
-						enterpriseTypeId: 7,
+						// enterpriseTypeId: 7,
+						qualityRegionId: this.form.regionId,
+						qualityRegionBindType: 2,
+						isSupervisingRoleName: 1
 					},
 					success: res => {
 						console.log(res.result)
@@ -753,7 +757,8 @@
 					url: 'xmgl/qualityRegion/list',
 					method: 'post',
 					data: {
-						projectSn: this.projectSn
+						projectSn: this.projectSn,
+						notSupervisingUnit: 1
 					},
 					success: res => {
 						if (res.code == 200) {
@@ -817,6 +822,7 @@
 					// 		this.changePeopleIndex = index
 					// 	}
 					// });
+					this.getReviewPeopleList()
 				} else if (type == 2) {
 					console.log('选择问题描述的数据', val);
 					//设置问题描述