From dde5df08bdcecbbc61f1a4a004803b693cc660aa Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 15:29:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/SolidWaste.js | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index bb980a5..cd3d48a 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -4,7 +4,7 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const defaultImg = '/assets/images/map/solidwaste/voc.png'
-const setting = '/assets/images/map/solidwaste/gf_green.png'
+const setting = '/assets/images/map/solidwaste/gf_green2.png'
// 璇锋眰鎺ュ彛鏁版嵁
const mapApi = require('../../../api/mapApi').default
@@ -39,15 +39,9 @@
totransferData: getSolidWasteData[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
- })
- marker.bindTooltip(getSolidWasteData[i].Name, {
- permanent: true,
- offset: [0, 14],
- direction: 'bottom',
- className: 'company-bindTooltip'
})
layer.addLayer(marker)
}
@@ -77,24 +71,30 @@
// 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
this.requestSolidWasteData = async (e) => {
- // 鍩烘湰淇℃伅灞曠ず
+ // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
const dataValue = {
StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
}
+ // console.log(e.layer.options.totransferData.Name)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ // 鍩烘湰淇℃伅 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()
+ const instance = new PublicBounced().$mount()
document.body.appendChild(instance.$el)
- instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+ // document.body.removeChild(instance.$el)
+ // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
+ instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
- this.setPanTo(e.latlng, 200)
+ this.setPanTo(e.latlng, 300)
}
- // flayTo()
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
this.setPanTo = (pos, value) => {
var position = pos
position = window.map.latLngToLayerPoint(position)
--
Gitblit v1.8.0