From 9a3296d09777fbde9a11979db867c7597919c62c Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 18:02:04 +0800
Subject: [PATCH] 弹窗出现位置缩小

---
 src/components/LayerController/logic/WasteWater.js |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 16c4f17..c3bccaf 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -24,9 +24,7 @@
       layer: layer
     })
     const res = await mapApi.getWasteWater()
-    console.log(res)
-    const data = res.Result.DataInfo
-    console.log(data)
+    const data = res.Result.DataInfo || {}
     for (let i = 0; i < data.length; i++) {
       // 缁忕含搴� 浣嶇疆
       const positionX = data[i].Latitude
@@ -35,12 +33,12 @@
       // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
       const testValue = data[i].ContrLevel
       const iconUrl = this.differentTypes(testValue)
-      const marker = L.marker.magic([positionX, positionY], {
+      const marker = L.marker([positionX, positionY], {
         test: data[i],
         icon: L.icon({
           iconUrl: iconUrl,
-          iconSize: [50, 50],
-          iconAnchor: [25, 25]
+          iconSize: [20, 20],
+          iconAnchor: [10, 10]
         })
       })
       layer.addLayer(marker)
@@ -57,12 +55,16 @@
     const dataValue = {
       StoragePlaceId: e.layer.options.test.StoragePlaceId
     }
-    const result = await mapApi.getWasteWater(dataValue)
+    const drawback = await mapApi.getWasteWaterMonitoring()
+    console.log(drawback)
+    const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
     const PublicBounced = window.Vue.extend(publicBounced)
     const instance = new PublicBounced()
-    instance.setData(result)
+    instance.setWaterData(e.layer.options.test, result.Result.DataInfo, drawback.Result.DataInfo, 'feishui')
+    // console.log(e.layer.options.test)
     instance.$mount()
     document.body.appendChild(instance.$el)
+    this.setPanTo(e.latlng, 80)
   }
 
   // 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -96,4 +98,11 @@
     }
     return testChange
   }
+  this.setPanTo = (pos, value) => {
+    var position = pos
+    position = window.map.latLngToLayerPoint(position)
+    position.y += value
+    position = window.map.layerPointToLatLng(position)
+    window.map.flyTo(position)
+  }
 }

--
Gitblit v1.8.0