From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteGas.js | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bf0a41c..9e7b219 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -11,6 +11,7 @@
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
+const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
@@ -18,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
@@ -30,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],
@@ -42,15 +44,26 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
- return '娴嬭瘯搴熸皵'
+ return layer.options.test.Name
}
- this.clickListener = (e) => {
- console.log(e)
+ this.clickListener = async (e) => {
+ // console.log(e)
this.animalService.pulseEffect(e.latlng)
+ 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.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) => {
var effectOfChange
if (ContrLevel === 1) {
@@ -64,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