From be771111fb2a9770a9fbf13c5d7e976bf8688b6d Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 11:08:38 +0800
Subject: [PATCH] 问题修改

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

diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index ec726a0..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.setPanTo(e.latlng, 300)
   }
 
   // 涓嶅悓绫诲瀷鍥剧墖灏佽
@@ -78,14 +79,5 @@
       effectOfChange = setting
     }
     return effectOfChange
-  }
-
-  // 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