From 097581b136c5889c71c07fb6f17d2f2885ce5a78 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 16:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteWater.js | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 2e1205e..3d9587e 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -50,15 +50,27 @@
// 鍒嗗壊绾�-------------------------------------------------------------------------------
this.bindTooltip = (layer) => {
- return layer.options.totransferData.Name
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.totransferData.Name
}
this.clickListener = (e) => {
// 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
- this.requestWasteWaterData(e).then(e)
- console.log()
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ const res = e.layer.options.totransferData
+ window.$layer.open({
+ content: {
+ content: WasteWaterIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ storagePlaceId: res
+ }
+ },
+ title: title // 鏍囬
+ })
+ this.animalService.setPanTo(e.latlng, 150)
}
this.requestWasteWaterData = async (e) => {
// 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
@@ -66,8 +78,8 @@
// StoragePlaceId: e.layer.options.test.StoragePlaceId
// }
// 寮规鏍囬
- const title = e.layer.options.totransferData.Name
- console.log(e.layer.options)
+ // const title = e.layer.options.totransferData.Name
+ // console.log(e.layer.options)
// 鍩烘湰淇℃伅 tabs
// const resultBasic = await mapApi.getWasteWater(dataValue)
// 鍥捐〃淇℃伅灞曠ず echarts
@@ -88,18 +100,6 @@
// // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
// instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
- this.setPanTo(e.latlng, 150)
- window.$layer.open({
- content: {
- content: WasteWaterIndex, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- info: this.info
- // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
- }
- },
- title: title // 鏍囬
- })
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -132,13 +132,5 @@
break
}
return testChange
- }
- // 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