From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteGas.js | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index b2ead2d..99fee38 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -5,29 +5,36 @@
// const AjaxUtils = require('../../../utils/AjaxUtils').default
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const defaultImg = '/assets/images/map/exhaust/fq_blue.png'
-const setting = '/assets/images/map/exhaust/fq_gray.png'
+const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
+const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green.png'
+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瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- this.animalService = new AnimalService({ L: L, layer: layer })
+ 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
const positionY = data[i].Longitude
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
- const judgeValue = data[i].StorageQty
- var iconUrl = this.differentTypes(judgeValue)
+ const ContrLevel = data[i].ContrLevel
+ var iconUrl = this.differentTypes(ContrLevel)
const marker = L.marker.magic([positionX, positionY], {
+ test: data[i],
icon: L.icon({
iconUrl: iconUrl,
iconSize: [50, 50],
@@ -40,21 +47,33 @@
}
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(result)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
}
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
- this.differentTypes = (judgeValue) => {
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
+ this.differentTypes = (ContrLevel) => {
var effectOfChange
- if (judgeValue === 1) {
- effectOfChange = defaultImg
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ effectOfChange = ImagGreen
+ } else if (ContrLevel === 3) {
+ effectOfChange = ImagBright
} else {
- effectOfChange = setting
+ effectOfChange = ImgGray
}
return effectOfChange
}
--
Gitblit v1.8.0