From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/SolidWaste.js | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index e12ae43..8f9e12b 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -1,9 +1,10 @@
/**
* 鍥哄簾
*/
+
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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
@@ -35,11 +36,11 @@
var iconUrl = this.differentTypes(judgeValue)
const marker = L.marker([positionX, positionY], {
- test: getSolidWasteData[i],
+ totransferData: getSolidWasteData[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -47,33 +48,15 @@
}
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return layer.options.totransferData.Name
}
- this.clickListener = async (e) => {
+ this.clickListener = (e) => {
+ // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- // this.setPanTo(e.latlng, 200)
- console.log(e)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.getSolidWasteBaseInfo(dataValue)
- // console.log(result)
- const PublicBounced = window.Vue.extend(publicBounced)
- const instance = new PublicBounced()
- instance.$mount()
- document.body.appendChild(instance.$el)
- instance.setData(result, 'gufei')
+ /* 鐐瑰嚮鏁版嵁鐨勬帴鍙ｈ姹� */
+ this.requestSolidWasteData(e).then(e)
}
-
- // panTo
- // this.setPanTo = (pos, value) => {
- // var position = pos
- // position = this.map.latLngToLayerPoint(position)
- // position.y += value
- // position = this.map.layerPointToLatLng(position)
- // this.map.flyTo(position)
- // }
// 涓嶅悓绫诲瀷鍥剧墖灏佽
this.differentTypes = (judgeValue) => {
@@ -85,4 +68,35 @@
}
return effectOfChange
}
+
+ // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
+ 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.Result.DataInfo, 'gufei')
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
+ this.setPanTo(e.latlng, 200)
+ }
+
+ // 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