From 9a691ac7fb86f2ae776fe23d74a398cc53ab6ec4 Mon Sep 17 00:00:00 2001
From: limingtao <@ming_tao_li>
Date: Wed, 17 Jul 2024 23:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/governance/index.vue    |  4 +--
 pages/index/index.vue         |  4 +--
 pages/investigation/index.vue |  4 +--
 pages/investigation/task.vue  | 50 ++++++++++++++++++++++++-----------
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/pages/governance/index.vue b/pages/governance/index.vue
index 89303d0..cba3d05 100644
--- a/pages/governance/index.vue
+++ b/pages/governance/index.vue
@@ -272,8 +272,8 @@ page {
     box-shadow: 1px 1px 3px #ccc;
     .trapezoidal {
       position: absolute;
-      top: -4px;
-      right: 0;
+      top: 0px;
+      right: 0px;
       color: #ffffff;
       font-size: 14px;
       font-weight: normal;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a06de79..890150f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -331,8 +331,8 @@ page {
     box-shadow: 1px 1px 3px #ccc;
     .trapezoidal {
       position: absolute;
-      top: -4px;
-      right: 0;
+      top: 0px;
+      right: 0px;
       color: #ffffff;
       font-size: 14px;
       font-weight: normal;
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index fc3fdc5..c48824e 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -275,8 +275,8 @@
       box-shadow: 1px 1px 3px #ccc;
 			.trapezoidal {
 				position: absolute;
-				top: -4px;
-				right: 0;
+				top: -0px;
+				right: 4px;
 				color: #ffffff;
 				font-size: 14px;
 				font-weight: normal;
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 12cbd5b..7c8eb85 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -892,15 +892,15 @@
 				}
 			},
 			submit(temporary) {
-				console.log(this.formData);
-				console.log(this.investigationSelectList);
-				console.log({
-					...this.formData,
-					businessId: this.businessId,
-					extraConfigs: extraConfigs,
-					describe: this.hiddenDangerList,
-					temporary,
-				});
+				// console.log(this.formData);
+				// console.log(this.investigationSelectList);
+				// console.log({
+				// 	...this.formData,
+				// 	businessId: this.businessId,
+				// 	extraConfigs: extraConfigs,
+				// 	describe: this.hiddenDangerList,
+				// 	temporary,
+				// });
 				let extraConfigs = [];
 				this.investigationSelectList.map((r) => {
 					r.extraConfigs.map((s) => {
@@ -914,13 +914,33 @@
 						extraConfigs.push(s);
 					});
 				});
+				let describe = JSON.parse(JSON.stringify(this.hiddenDangerList))
+				try {
+					for (let item of describe) {
+						if (item.nid) {
+							delete item.nid
+						}
+						if (item.businessId) {
+							delete item.businessId
+						}
+						if (item.pcCount||item.pcCount==null) {
+							delete item.pcCount
+						}
+						if (item.dangerProblem) {
+							delete item.dangerProblem
+						}
+
+					}
+				} catch (e) {
+					//TODO handle the exception
+				}
 				this.$request
 					.globalRequest(
 						"/hiddenDanger/highDanger/saveManualInvestigation", {
 							...this.formData,
 							businessId: this.businessId,
 							extraConfigs: extraConfigs,
-							describe: this.hiddenDangerList,
+							describe: describe,
 							temporary,
 						},
 						"POST"
@@ -929,11 +949,11 @@
 						console.log(res);
 						if (res.code === 200) {
 							this.$.toast("保存成功");
-							setTimeout(() => {
-								uni.navigateBack({
-									delta: 1, // 默认值是1，表示返回的页面层数
-								});
-							}, 1000);
+							// setTimeout(() => {
+							// 	uni.navigateBack({
+							// 		delta: 1, // 默认值是1，表示返回的页面层数
+							// 	});
+							// }, 1000);
 
 							// this.data = res.result;
 							// this.rname = this.data[0].name;