From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/LayerController/logic/SolidWaste.js |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index e12ae43..37b4b15 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -1,6 +1,7 @@
 /**
  * 鍥哄簾
  */
+
 // 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
 const defaultImg = '/assets/images/map/solidwaste/voc.png'
 const setting = '/assets/images/map/solidwaste/gf_green.png'
@@ -50,10 +51,17 @@
     return layer.options.test.Name
   }
 
-  this.clickListener = async (e) => {
+  this.clickListener = (e) => {
+    // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
     this.animalService.pulseEffect(e.latlng)
+    /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
     // this.setPanTo(e.latlng, 200)
-    console.log(e)
+    /* 鐐瑰嚮鏁版嵁鐨勬帴鍙h姹� */
+    this.requestSolidWasteData(e).then(e)
+  }
+
+  // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
+  this.requestSolidWasteData = async (e) => {
     const dataValue = {
       StoragePlaceId: e.layer.options.test.StoragePlaceId
     }
@@ -63,10 +71,10 @@
     const instance = new PublicBounced()
     instance.$mount()
     document.body.appendChild(instance.$el)
-    instance.setData(result, 'gufei')
+    instance.setData(result.Result.DataInfo, 'gufei')
   }
 
-  // panTo
+  // flayTo()
   // this.setPanTo = (pos, value) => {
   //   var position = pos
   //   position = this.map.latLngToLayerPoint(position)

--
Gitblit v1.8.0