From c310aa8e462fbadd85df50546bfcbb46bb0d5216 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 13:50:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/SolidWaste.js | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index bb980a5..ffbedfa 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -43,12 +43,6 @@
iconAnchor: [25, 25]
})
})
- marker.bindTooltip(getSolidWasteData[i].Name, {
- permanent: true,
- offset: [0, 14],
- direction: 'bottom',
- className: 'company-bindTooltip'
- })
layer.addLayer(marker)
}
}
@@ -77,24 +71,27 @@
// 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
this.requestSolidWasteData = async (e) => {
- // 鍩烘湰淇℃伅灞曠ず
+ // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
const dataValue = {
StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
}
+ // 鍩烘湰淇℃伅 tabs
const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // 璇︾粏淇℃伅灞曠ず
+ // 璇︾粏淇℃伅灞曠ず table
const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+ // 缁戝畾寮规瀹炰緥
const PublicBounced = window.Vue.extend(publicBounced)
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()
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
this.setPanTo = (pos, value) => {
var position = pos
position = window.map.latLngToLayerPoint(position)
--
Gitblit v1.8.0