From b45157223eb027f2ff3b4fa3759fa2de61a0a2e4 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Fri, 26 Jul 2024 10:27:54 +0800
Subject: [PATCH] 1

---
 pages/index/detail.vue        | 11 +++++-----
 pages/index/index.vue         |  6 +++++-
 pages/investigation/index.vue | 15 +++++++++-----
 pages/map/index.vue           | 39 ++++++++++++++++++++++++++++++-----
 4 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 91d6cd8..a25d4aa 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -229,11 +229,12 @@ export default {
   },
   onLoad(options) {
     let params = options;
-    // params.deptId = "3702000000";
-    // params.id = "37020017609";
-    // params.sectionId = "37020017609";
-    // params.roadName = "023县道";
-    // params.taskId = "000001";
+    params.deptId = "3702000000";
+    params.id = "37020017609";
+    params.sectionId = "37020017609";
+    params.roadName = "023县道";
+    params.taskId = "000001";
+    params.userId = "admin1";
     this.params = params;
     let str = "";
     if (params.roadName) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 67e43e9..0c13822 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -168,7 +168,11 @@
 			},
 			handleClick(row) {
 				console.log(row)
-				this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode + '&deptId=' + row.deptId + '&taskName=' + row.name)
+				if(row.pcType == 2) {
+					this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+				} else {
+					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode + '&deptId=' + row.deptId + '&taskName=' + row.name)
+				}
 			},
 			konw() {
 				this.$.open('/pages/knowledge/index')
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index a1c21a4..9ea3c49 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -192,11 +192,16 @@
 			handleClick(row) {
 				console.log(row)
 				if (this.tab === 1) {
-					this.$.open('/pages/map/index?businessId=' + row.businessId + 
-					'operator' + row.operator + 
-					'deptId' + row.deptId + 
-					'&type=' + (this.tab == 1 ? 'edit' : 'view'))
-					// this.$.open('/pages/map/index?businessId=' + row.businessId)
+					if(row.pcType == 2) {
+						this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+					} else {
+						this.$.open('/pages/map/index?businessId=' + row.businessId + 
+							'&operator' + row.operator + 
+							'&deptId' + row.deptId + 
+							'&type=' + (this.tab == 1 ? 'edit' : 'view'))
+							// this.$.open('/pages/map/index?businessId=' + row.businessId)
+					}
+				
 				}else{
 					this.$.open('/pages/investigation/task?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
 				}
diff --git a/pages/map/index.vue b/pages/map/index.vue
index ccc815a..9c3f8d1 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -183,7 +183,7 @@
           </cover-view>
           <cover-view class="umodal-line2"></cover-view>
           
-          <cover-view class="umodal-btn" @click="handleCheck(2)">
+          <cover-view class="umodal-btn" @click="handleCheck(2, true)">
             确认
           </cover-view>
         </cover-view>
@@ -231,6 +231,7 @@ export default {
       show: false,
       type:'edit',
       show2: false,
+      pcType: 0
     };
   },
   onLoad(options) {
@@ -246,7 +247,12 @@ export default {
     this.pageType = 1;
     this.initData();
   },
-
+  onShow() {
+    if(this.pcType == 2) {
+      this.pcType = 0
+      this.backPage()
+    }
+  },
   onReady() {
     // wx请求获取位置权限
     this.getAuthorize()
@@ -414,9 +420,8 @@ export default {
       // }
       // this.data = this.data.concat(data);
     },
-    handleCheck(v) {
+    handleCheck(v, t) {
       this.show = false;
-      this.show2 = false;
       if (v == 1) {
         // let json = {
         //   name: "023县道",
@@ -444,7 +449,31 @@ export default {
         );
       }
       if (v == 2) {
-        this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+        if(t) {
+          this.$request
+        .globalRequest(
+          "/hiddenDanger/highDanger/HighDangerSaveStatus",
+          {
+            businessId: this.businessId,
+            pcType: "2",
+          },
+          "GET"
+        )
+        .then((res) => {
+          console.log(res);
+          if (res.code === 200) {
+            this.pcType = 2
+            this.show2 = false;
+            this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+          } else {
+            this.$.toast(res.message);
+          }
+        });
+        } else {
+          
+          this.show2 = false;
+          this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+        }
       }
 
       // this.$.open(url + "?id=" + 'RX202310210236');