From 57d2a23177e74aefe80beca793d0e9ea8c3834ac Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期六, 08 五月 2021 14:58:50 +0800
Subject: [PATCH] 管线分析

---
 src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index 816259b..c2c2e5e 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -230,7 +230,7 @@
                         style="width: 100%" size="mini">
                     <el-table-column
                             :show-overflow-tooltip="true"
-                            prop="lineloopna"
+                            prop="pipecode"
                             label="绠$嚎绫诲瀷"
                     >
                     </el-table-column>
@@ -246,7 +246,7 @@
                             sortable
                             :show-overflow-tooltip="true"
                             width="100"
-                            prop="startpoint"
+                            prop="pipecode"
                             label="璧风偣缂栧彿"
                     >
                     </el-table-column>
@@ -254,7 +254,7 @@
                             :show-overflow-tooltip="true"
                             sortable
                             width="100"
-                            prop="endpointnu"
+                            prop="pipecode"
                             label="缁堢偣缂栧彿"
                     >
                     </el-table-column>
@@ -566,15 +566,14 @@
       return window.L.marker(point, {
         icon: window.L.divIcon({
           className: 'dIcon',
-          html: '<div class="plane live">' +
-              // '<img src="'+require("../../assets/images/map/ship.png")+
-              '<div style="position: absolute;' +
-              '    width: 20px;' +
-              '    height: 20px;' +
-              '    border-radius: 50%;' +
-              '  content: \'\'; background-color: #FF664A;"/>' +
-              '<span></span><span></span></div></>',
-          iconSize: [90, 36]
+          // html: '<div class="plane live">' +
+          //     '<div style="position: absolute;' +
+          //     '    width: 20px;' +
+          //     '    height: 20px;' +
+          //     '    border-radius: 50%;' +
+          //     '  content: \'\'; background-color: #FF664A;"/>' +
+          //     '<span></span><span></span></div></>',
+          iconSize: [36, 36]
         })
       })
     },
@@ -705,7 +704,7 @@
         style: function (feature) {
           return {
             color: 'rgba(255,0,0,.6)',
-            weight: 6
+            weight: 10
           }
         }
       }).addTo(window.map)
@@ -753,7 +752,10 @@
       const geom = JSON.parse(e.geomText)
       this.currentSelectEndLine = window.L.geoJSON(geom, {
         style: function (feature) {
-          return { color: 'rgba(200,0,200,.6)' }
+          return {
+            weight: 10,
+            color: 'rgba(200,0,200,.6)'
+          }
         }
       }).addTo(window.map)
       window.map.panInsideBounds(this.currentSelectEndLine.getBounds())
@@ -763,7 +765,7 @@
         lineID: e.pipesegcode
       }
       const res = await mapApi.findLeakages(param)
-      console.log(res)
+      // console.log(res)
 
       const len = res.data.length
       if (len === 0) {
@@ -772,7 +774,7 @@
       }
       res.data.reverse()
       this.bgFm = res.data
-      console.log(res.data)
+      // console.log(res.data)
 
       this.bgPoint = res.data[0].startControlPoint
 
@@ -781,7 +783,7 @@
       const p = [point.coordinates[1], point.coordinates[0]]
 
       this.bgMarker = this.createFlowMarker(p)
-      this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
+      // this.bgMarker.bindTooltip(this.bgPoint.pointnumbe)
       this.bgMarker.addTo(window.map)
       window.map.flyTo(p)
 
@@ -809,12 +811,12 @@
       })
     },
     bgFmClick (e) {
-      console.log('鐐瑰嚮褰卞搷鐨勯榾闂�')
+      // console.log('鐐瑰嚮褰卞搷鐨勯榾闂�')
       console.log(e)
       // const point = [e.data[0][0], e.data[0][1]]
-      const point = [e.startControlPoint.x, e.startControlPoint.y]
+      const point = [e.startControlPoint.y, e.startControlPoint.x]
       const marker = this.createFlowMarker(point)
-      marker.addTo(this.map)
+      marker.addTo(window.map)
       window.map.flyTo(point, 16)
     },
 
@@ -830,7 +832,10 @@
       }
       this.currentSelectResultLine = window.L.geoJSON(geom, {
         style: function (feature) {
-          return { color: 'rgba(0,250,255,.6)' }
+          return {
+            weight: 10,
+            color: 'rgba(0,250,255,.6)'
+          }
         }
       }).addTo(window.map)
       window.map.panInsideBounds(this.currentSelectResultLine.getBounds())

--
Gitblit v1.8.0