From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index e120cfa..574ed9f 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -19,9 +19,9 @@
*/
this.init = async (layer, L) => {
this.animalService = new AnimalService({ L: L, layer: layer })
- const res = await mapApi.GetWasteGas()
+ const res = await mapApi.getWasteGas()
const data = res.Result.DataInfo || {}
- console.log(data)
+ // console.log(data)
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
@@ -31,6 +31,7 @@
var iconUrl = this.differentTypes(ContrLevel)
const marker = L.marker.magic([positionX, positionY], {
+ test: data[i],
icon: L.icon({
iconUrl: iconUrl,
iconSize: [50, 50],
@@ -43,20 +44,19 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
- return '搴熸皵鐐�'
+ return layer.options.test.Name
}
this.clickListener = async (e) => {
// console.log(e)
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.GetWasteGas(dataValue)
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.StoragePlaceId
+ // }
+ // const result = await mapApi.getWasteGas(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result)
+ instance.setData(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
}
--
Gitblit v1.8.0