From ce8333d79bde86166f182a721c7390b5b4c16cf4 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 25 Jul 2024 10:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/globalJs/request.js                    |  8 +--
 .../components/investigation-item2.vue        |  2 +-
 .../investigation/components/problem-box.vue  |  2 +-
 .../components/problem-tree-item.vue          |  4 +-
 pages/investigation/task.vue                  | 57 +++++++++++++++----
 5 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/common/globalJs/request.js b/common/globalJs/request.js
index 05b44fe..359f2df 100644
--- a/common/globalJs/request.js
+++ b/common/globalJs/request.js
@@ -69,10 +69,10 @@ class Request {
             // console.log('resInterceptors-----------------',resInterceptors)
             if(resInterceptors.statusCode == 400 || resInterceptors.data.code == 403){
               $.toast('登录信息已过期，请重新登录')
-              $.removeData('token')
-              setTimeout(() => {
-                $.openNew('/pages/logIn/logIn')
-              },1500)
+              // $.removeData('token')
+              // setTimeout(() => {
+              //   $.openNew('/pages/logIn/logIn')
+              // },1500)
               return
             }
             if (!resInterceptors && resInterceptors != '') {
diff --git a/pages/investigation/components/investigation-item2.vue b/pages/investigation/components/investigation-item2.vue
index 972b824..d9f8df8 100644
--- a/pages/investigation/components/investigation-item2.vue
+++ b/pages/investigation/components/investigation-item2.vue
@@ -122,7 +122,7 @@
       <view class="investigation-item" style="width: 96%; padding: 0">
         <view class="detail-item">
           <uni-forms-item
-            label="需采集补充信息"
+            label="补充信息"
             label-position="top"
             label-width="200px"
           />
diff --git a/pages/investigation/components/problem-box.vue b/pages/investigation/components/problem-box.vue
index 1cdd9e1..e06df95 100644
--- a/pages/investigation/components/problem-box.vue
+++ b/pages/investigation/components/problem-box.vue
@@ -29,7 +29,7 @@
       ></u-upload>
     </view>
     <view class="detail-item">
-      <uni-forms-item label="需采集补充信息" label-position="top" label-width="200px"/>
+      <uni-forms-item label="补充信息" label-position="top" label-width="200px"/>
       <u-textarea
           placeholder="请输入"
           border="none"
diff --git a/pages/investigation/components/problem-tree-item.vue b/pages/investigation/components/problem-tree-item.vue
index 2c6b761..0dab9a3 100644
--- a/pages/investigation/components/problem-tree-item.vue
+++ b/pages/investigation/components/problem-tree-item.vue
@@ -23,11 +23,11 @@
     <view
       class="investigation-item"
       :class="problemTreeSelect === item.id ? 'active' : ''"
-      v-for="(item, index) in 50"
+      v-for="(item, index) in problemTreeSelectList"
       :key="item.itemname"
       @click="handleSelectProblem(item, index)"
     >
-      <text>{{ item.itemname }}</text>111
+      <text>{{ item.itemname }}</text>
       <uni-icons
         type="checkmarkempty"
         size="24"
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 5db98c3..4c2c3d3 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -98,9 +98,9 @@
 						</view>
 					</uni-forms-item>
 				</uni-forms>
-				<view class="photo">
+				<!-- <view class="photo">
 					<image src="/static/base.jpg" mode="widthFix"></image>
-				</view>
+				</view> -->
 			</view>
 			<view class="echarts" v-if="active === 2">
 				<qiun-data-charts type="area" :opts="opts" :chartData="chartData" />
@@ -250,8 +250,8 @@
 						<view v-for="(item,index) in hiddenDangerList" :key="item" style="width: 100%">
 							<view class="problem-item">
 								<view style="display: flex; justify-content: space-between">
-									<view style="width: 80%">
-										{{ item.dangerProblem }}
+									<view style="width: 80%;line-height: 30px;">
+										{{ item.hdTermName }}
 									</view>
 									<view>
 										<view class="check" @click="onHiddenDangerList(item,index)">
@@ -266,7 +266,7 @@
 									</view>
 								</view>
 								<!-- <view class="text">{{ item.hdTerm }}</view> -->
-								<view class="text">{{ item.hdDesc }}</view>
+								<!-- <view class="text">{{ item.hdDesc }}</view> -->
 							</view>
 						</view>
 						
@@ -321,7 +321,7 @@
 								@delete="(e) => deletePic(e, 'fileList')" name="1" :maxCount="1"></u-upload>
 						</view>
 						<view class="detail-item">
-							<uni-forms-item label="需采集补充信息" label-position="top" label-width="200px" />
+							<uni-forms-item label="补充信息" label-position="top" label-width="200px" />
 							<u-textarea placeholder="请输入" border="none" v-model="describe.hdInfo" />
 						</view>
 					</view>
@@ -350,6 +350,18 @@
 			@first="active = 1" @last="active = 3" />
 		<bottom-button v-else-if="active === 3" :secondText="'暂存'" @first="active = 2" @second="submit(false)"
 			@last="submit(true)" />
+		<u-modal
+			:show="modalShow"
+			content="您未录入任何隐患问题，该点段将以“无隐患”结论提交结果，请确认是否提交？"
+			confirm-text="确定"
+			cancel-text="取消"
+			:showConfirmButton="true"
+			:showCancelButton="true"
+			@confirm="postSaveManualInvestigation"
+			@cancel="modalShow = false"
+			:closeOnClickOverlay="false"
+			></u-modal>
+
 	</view>
 </template>
 
@@ -550,6 +562,10 @@
 				//选中排查数据
 				troubleshootingData: [],
 				checked: [],
+				modalShow: false,
+				extraConfigs: [],
+				describeArr: [],
+				temporary: ''
 			};
 		},
 		methods: {
@@ -1078,14 +1094,30 @@
 						extraConfigs: extraConfigs,
 						describe: describe,
 				});
+				this.extraConfigs = extraConfigs
+				this.describeArr = describe
+				this.temporary = temporary
+				console.log(this.extraConfigs,this.describeArr)
+				if(!temporary) {
+					this.postSaveManualInvestigation()
+					return
+				}
+				if(this.extraConfigs.length <= 0 || this.describeArr.length <= 0) {
+					this.modalShow = true
+				} else {
+					this.postSaveManualInvestigation()
+				}
 				
+			},
+			postSaveManualInvestigation() {
 				this.$request
 					.globalRequest(
 						"/hiddenDanger/highDanger/saveManualInvestigation", {
 						...this.formData,
 						businessId: this.businessId,
-						extraConfigs: extraConfigs,
-						describe: describe,
+						extraConfigs: this.extraConfigs,
+						describe: this.describeArr,
+						temporary: this.temporary,
 						// 							describe: [{
 						//     "bigCategory": "1",
 						//     "bigCategoryName": "道路线性断面",
@@ -1097,14 +1129,17 @@
 						//     "hdPic": "",
 						//     "hdInfo": ""
 						// }],
-						temporary,
 					},
 						"POST"
 					)
 					.then((res) => {
 						console.log(res);
 						if (res.code === 200) {
-							this.$.toast("保存成功");
+							if(this.temporary) {
+								this.$.toast("保存成功");
+							} else {
+								this.$.toast("暂存成功");
+							}
 							setTimeout(() => {
 								uni.navigateBack({
 									delta: 2, // 默认值是1，表示返回的页面层数
@@ -1127,7 +1162,7 @@
 							this.$.toast(res.msg);
 						}
 					});
-			},
+			}
 		},
 	};
 </script>