From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/LayerController/logic/WasteGas.js |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 4ecd0e0..9e7b219 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -50,16 +50,18 @@
   this.clickListener = async (e) => {
     // console.log(e)
     this.animalService.pulseEffect(e.latlng)
-    // const dataValue = {
-    //   StoragePlaceId: e.layer.options.test.StoragePlaceId
-    // }
-    // const result = await mapApi.getWasteGas(dataValue)
+    const dataValue = {
+      StoragePlaceId: e.layer.options.test.StoragePlaceId
+    }
+    const result = await mapApi.getWasteGasDetails(dataValue)
+    // console.log(result.Result.DataInfo)
     const PublicBounced = window.Vue.extend(publicBounced)
     const instance = new PublicBounced()
-    instance.setGasData(e.layer.options.test, 'feiqi')
-    console.log(e.layer.options.test)
+    instance.setGasData(e.layer.options.test, result.Result.DataInfo, 'feiqi')
+    // console.log(e.layer.options.test)
     instance.$mount()
     document.body.appendChild(instance.$el)
+    this.setPanTo(e.latlng, 240)
   }
   // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
   this.differentTypes = (ContrLevel) => {
@@ -75,4 +77,11 @@
     }
     return effectOfChange
   }
+  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