From 4f210560973162685449e99ece819a1aad190db1 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期二, 20 四月 2021 14:12:16 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteWater.js | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index d9deccb..0305114 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -56,8 +56,21 @@
this.clickListener = (e) => {
// 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
- this.requestWasteWaterData(e).then(e)
+ // 寮规鏍囬
+ 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.setPanTo(e.latlng, 150)
}
this.requestWasteWaterData = async (e) => {
// 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
@@ -65,7 +78,7 @@
// StoragePlaceId: e.layer.options.test.StoragePlaceId
// }
// 寮规鏍囬
- const title = e.layer.options.totransferData.Name
+ // const title = e.layer.options.totransferData.Name
// console.log(e.layer.options)
// 鍩烘湰淇℃伅 tabs
// const resultBasic = await mapApi.getWasteWater(dataValue)
@@ -87,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 // 鏍囬
- })
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
--
Gitblit v1.8.0