From 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 09:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteGas.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 7a9d673..9e7b219 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -21,7 +21,7 @@
this.animalService = new AnimalService({ L: L, layer: layer })
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
@@ -44,22 +44,24 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
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.getWasteGasDetails(dataValue)
+ // console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(e.layer.options.test)
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, 'feiqi')
+ // console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
+ this.setPanTo(e.latlng, 240)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
@@ -75,4 +77,11 @@
}
return effectOfChange
}
+ 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