From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/logic/WasteSolid.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index 28b0938..ad4b1e0 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -1,11 +1,12 @@
 /**
  * 鍥哄簾
  */
-const WasteSolidIndex = require('@components/BaseNav/WasteSolid/WasteSolidIndex').default
+const WasteSolidIndex = require('../../../components/BaseNav/WasteSolid/WasteSolidIndex').default
 // 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
 const defaultImg = '/assets/images/map/solidwaste/voc.png'
 const setting = '/assets/images/map/solidwaste/gf_green2.png'
-
+// 鍏叡鏂规硶 panTo() 寮曠敤
+const { setPanTo } = require('../../../utils/utils')
 // 璇锋眰鎺ュ彛鏁版嵁
 const mapApi = require('../../../api/mapApi').default
 // 浣跨敤灏佽鏂规硶
@@ -53,11 +54,13 @@
   this.clickListener = (e) => {
     // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
     this.animalService.pulseEffect(e.latlng)
+    /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+    setPanTo(e.latlng, 200)
     // 寮规鏍囬
     const title = e.layer.options.totransferData.Name
     window.$layer.open({
       content: {
-        content: WasteSolidIndex, // 缁勪欢
+        comp: WasteSolidIndex, // 缁勪欢
         parent: this, // 鐖剁粍浠�
         data: { // 浼犻�掔殑鍙傛暟
           storagePlaceId: e.layer.options.totransferData.StoragePlaceId
@@ -65,8 +68,6 @@
       },
       title: title // 鏍囬
     })
-    /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
-    this.animalService.setPanTo(e.latlng, 300)
   }
 
   // 涓嶅悓绫诲瀷鍥剧墖灏佽

--
Gitblit v1.8.0