From 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/LayerController/logic/SolidWaste.js |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 3eee0e3..9344ecf 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -54,8 +54,6 @@
   this.clickListener = (e) => {
     // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
     this.animalService.pulseEffect(e.latlng)
-    /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
-    // this.setPanTo(e.latlng, 200)
     /* 鐐瑰嚮鏁版嵁鐨勬帴鍙h姹� */
     this.requestSolidWasteData(e).then(e)
   }
@@ -85,15 +83,17 @@
     const instance = new PublicBounced()
     instance.$mount()
     document.body.appendChild(instance.$el)
-    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+    /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+    this.setPanTo(e.latlng, 200)
   }
 
-  // flayTo()
-  // this.setPanTo = (pos, value) => {
-  //   var position = pos
-  //   position = this.map.latLngToLayerPoint(position)
-  //   position.y += value
-  //   position = this.map.layerPointToLatLng(position)
-  //   this.map.flyTo(position)
-  // }
+  // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
+  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