Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

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"

pages/investigation/index.vue

@@ -190,9 +190,12 @@
 					})
 			},
 			handleClick(row) {
-				// console.log(row)
+				console.log(row)
 				if (this.tab === 1) {
-					this.$.open('/pages/map/index?businessId=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
+					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'))

pages/investigation/task.vue

@@ -871,7 +871,7 @@
 				this.$request
 					.globalRequest(
 						"/hiddenDanger/highDanger/getUserHiddenDangerList", {
-						nuserid: this.$.getData("token"),
+						// nuserid: this.$.getData("token"),
 						pcType: 2,
 						businessId
 					},

pages/map/index.vue

@@ -214,10 +214,14 @@ export default {
       faddress: "",
       fcoordinate: "",
       businessId: "",
+      operator: "",
+      deptId: "",
+      sectionCode: "",
+      roadName: "",
+      pointType: "",
       pageType1Result: {
         deadlineType: 3,
       },
-      pageType2Result: null,
       rname: "",
       search: "",
       name1: "",
@@ -233,6 +237,9 @@ export default {
     console.log(options);
     // this.businessId = "RX202310210238";
     this.businessId = options.businessId;
+    this.operator = options.operator;
+    this.deptId = options.deptId;
+
     this.type = options.type;
     this.pageHeight = uni.getSystemInfoSync().windowHeight;
 
@@ -326,6 +333,9 @@ export default {
           if (res.code === 200) {
             if (res.result) {
               this.pageType1Result = res.result;
+              this.sectionCode = res.result.sectionCode;
+              this.roadName = res.result.name;
+              this.pointType = res.result.pointType;
               this.longitude = res.result.coordinateList[0].longitude; //118.787575;
               this.latitude = res.result.coordinateList[0].latitude; //32.05024;
               this.covers = [
@@ -371,7 +381,9 @@ export default {
           console.log(res);
           if (res.code === 200) {
             this.data = res.result;
-            this.pageType2Result = this.data[0];
+            this.sectionCode = this.data[0].sectionCode;
+            this.roadName = this.data[0].name;
+            this.pointType = this.data[0].type;
             this.rname = this.data[0].name;
             this.polyline = [
               {
@@ -405,8 +417,6 @@ export default {
     handleCheck(v) {
       this.show = false;
       if (v == 1) {
-        let json =
-          this.pageType == 1 ? this.pageType1Result : this.pageType2Result;
         // let json = {
         //   name: "023县道",
         //   operator: "admin1",
@@ -417,19 +427,19 @@ export default {
         // };
         this.$.open(
           "/pages/index/detail?taskId=" +
-            json.businessId +
+            this.businessId +
             "&id=" +
-            json.sectionCode +
+            this.sectionCode +
             "&sectionId=" +
-            json.sectionCode +
+            this.sectionCode +
             "&roadName=" +
-            json.name +
+            this.roadName +
             "&userId=" +
-            json.operator +
+            this.operator +
             "&deptId=" +
-            json.deptId +
+            this.deptId +
             "&sectionType=" +
-            json.pointType
+            this.pointType
         );
       }
       if (v == 2) {
@@ -460,6 +470,9 @@ export default {
           console.log(res);
           if (res.code === 200) {
             this.show = true;
+            this.sectionCode = res.sectionCode;
+            this.roadName = address;
+            this.pointType = this.ftype;
             // this.data = res.result;
             // console.log(this.data[0][Object.keys(this.data[0])])
             // this.rname = Object.keys(this.data[0])[0]
@@ -482,7 +495,9 @@ export default {
       console.log(e);
       this.pageType = 2;
       this.idx = i;
-      this.pageType2Result = e;
+      this.sectionCode = e.sectionCode;
+      this.roadName = e.name;
+      this.pointType = e.type;
       if (e && e.name && e.position) {
         this.rname = e.name;
         this.longitude = e.position[0].longitude;