1

pages/index/index.vue

@@ -172,7 +172,7 @@
 				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.handleDept + '&taskName=' + row.name)
+					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode + '&deptId=' + row.handleDept + '&taskName=' + row.name + '&pcType' + row.pcType)
 				}
 			},
 			konw() {

pages/investigation/index.vue

@@ -3,12 +3,12 @@
 		<view class="Width100 Box BorderBox">
 			<view class="Content BorderBox Width100">
 				<top-title :is-show-left="false" :title="'排查'" :rightWidth='120' class="custom_bg">
-					<template slot="right">
+					<!-- <template slot="right">
 						<image :src="$.imgSrc + '/mine/search.png'" @click="$.open('/pages/mine/setting')"
 							mode="aspectFit" class="InlineBlock imgIcon"></image>
 						<image :src="$.imgSrc + '/mine/plus.png'" mode="aspectFit"
 							@click="$.open('/pages/create/create')" class="InlineBlock imgIcon"></image>
-					</template>
+					</template> -->
 				</top-title>
 			</view>
 			<view class="query-form">
@@ -196,8 +196,9 @@
 						this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
 					} else {
 						this.$.open('/pages/map/index?businessId=' + row.businessId + 
-							'&operator' + row.operator + 
+							'&operator=' + row.operator + 
-							'&deptId' + row.handleDept + 
+							'&deptId=' + row.handleDept + 
+							'&pcType=' + row.pcType + 
 							'&type=' + (this.tab == 1 ? 'edit' : 'view'))
 							// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}

pages/map/index.vue

@@ -24,7 +24,7 @@
       </view>
       <view class="btn-box">
         <view @click="handleCheck(1)" class="btn btn1" v-show="type!='view'"> 智能排查 </view>
-        <view @click="show2 = true" class="btn btn2" v-show="type!='view'"> 人工排查 </view>
+        <view @click="handleCheck2" class="btn btn2" v-show="type!='view'"> 人工排查 </view>
         <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
@@ -34,7 +34,7 @@
       <view class="btn-box">
         <view @click="onJump(3)" class="btn btn3" v-show="type!='view'"> 更换 </view>
         <view @click="handleCheck(1)" class="btn btn4" v-show="type!='view'"> 智能排查 </view>
-        <view @click="show2 = true" class="btn btn5" v-show="type!='view'"> 人工排查 </view>
+        <view @click="handleCheck2" class="btn btn5" v-show="type!='view'"> 人工排查 </view>
         <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
@@ -103,7 +103,7 @@
         <cover-view class="umodal-content"> 新增成功</cover-view>
         <cover-view class="umodal-line1"></cover-view>
         <cover-view class="umodal-btnbox">
-          <cover-view class="umodal-btn" @click="show2 = true">
+          <cover-view class="umodal-btn" @click="handleCheck2">
             人工排查
           </cover-view>
           <cover-view class="umodal-line2"></cover-view>
@@ -176,7 +176,8 @@
         show: false,
         type: 'edit',
         show2: false,
-        pcType: 0
+        pcType: 0,
+        pcTypes: 0,
       };
     },
     onLoad(options) {
@@ -185,6 +186,7 @@
       this.businessId = options.businessId;
       this.operator = options.operator;
       this.deptId = options.deptId;
+      this.pcType = options.pcType;
 
       this.type = options.type;
       this.pageHeight = uni.getSystemInfoSync().windowHeight;
@@ -194,8 +196,8 @@
       this.getSystemInfo()
     },
     onShow() {
-      if (this.pcType == 2) {
+      if (this.pcTypes == 2) {
-        this.pcType = 0
+        this.pcTypes = 0
         this.backPage()
       }
     },
@@ -425,22 +427,40 @@
           //   businessId: "000001",
           //   pointType: '1'
           // };
-          this.$.open(
+          
-            "/pages/index/detail?taskId=" +
+          this.$request
-            this.businessId +
+              .globalRequest(
-            "&id=" +
+                "/hiddenDanger/highDanger/HighDangerSaveStatus",
-            this.sectionCode +
+                {
-            "&sectionId=" +
+                  businessId: this.businessId,
-            this.sectionCode +
+                  pcType: "1",
-            "&roadName=" +
+                },
-            this.roadName +
+                "GET"
-            "&userId=" +
+              )
-            this.operator +
+              .then((res) => {
-            "&deptId=" +
+                console.log(res);
-            this.deptId +
+                if (res.code === 200) {
-            "&sectionType=" +
+                  this.pcType = 1
-            this.pointType
+                  this.$.open(
-          );
+                    "/pages/index/detail?taskId=" +
+                    this.businessId +
+                    "&id=" +
+                    this.sectionCode +
+                    "&sectionId=" +
+                    this.sectionCode +
+                    "&roadName=" +
+                    this.roadName +
+                    "&userId=" +
+                    this.operator +
+                    "&deptId=" +
+                    this.deptId +
+                    "&sectionType=" +
+                    this.pointType
+                  );
+                } else {
+                  this.$.toast(res.message);
+                }
+              });
         }
         if (v == 2) {
           if (t) {
@@ -456,6 +476,7 @@
               .then((res) => {
                 console.log(res);
                 if (res.code === 200) {
+                  this.pcTypes = 2
                   this.pcType = 2
                   this.show2 = false;
                   this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
@@ -472,6 +493,15 @@
 
         // this.$.open(url + "?id=" + 'RX202310210236');
       },
+      handleCheck2() {
+        if(this.pcType == 1) {
+          this.show2 = true
+        } 
+        if(this.pcType == 2) {
+          this.handleCheck(2, true)
+        }
+        
+      },
       handleSubmit() {
         let address = "";
         if (this.ftype == 1) {