From 1602bcb0af9757e6d3af0b509060c4c0a40e1ba8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 14:36:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bf0a41c..574ed9f 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,23 @@
}
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.getWasteGas(dataValue)
+ const PublicBounced = window.Vue.extend(publicBounced)
+ const instance = new PublicBounced()
+ instance.setData(e.layer.options.test)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
}
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
var effectOfChange
if (ContrLevel === 1) {
--
Gitblit v1.8.0