From e97a404960da3964475aebbef4ff069be2e4ccfc Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期三, 12 五月 2021 17:54:29 +0800
Subject: [PATCH] 修改问题,污染源
---
src/components/LayerController/logic/WasteGas.js | 85 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 574ed9f..7d57975 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -5,21 +5,28 @@
// const AjaxUtils = require('../../../utils/AjaxUtils').default
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-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 ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
+// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green2.png'
+// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').default
+// const WasteGasChats = require('./WasteGasChats').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
this.init = async (layer, L) => {
- this.animalService = new AnimalService({ L: L, layer: layer })
+ // console.log(WasteGasChats)
+ this.animalService = new AnimalService({
+ L: L,
+ layer: layer
+ })
const res = await mapApi.getWasteGas()
+ // console.log(res)
const data = res.Result.DataInfo || {}
// console.log(data)
for (let i = 0; i < data.length; i++) {
@@ -29,13 +36,18 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
const ContrLevel = data[i].ContrLevel
var iconUrl = this.differentTypes(ContrLevel)
-
- const marker = L.marker.magic([positionX, positionY], {
+ // const marker = L.canvasMarker([positionX, positionY], {
+ // img: {
+ // // url: 'assets/images/map/marker-icon.png',
+ // url: iconUrl,
+ // size: STYLES.ICON_SIZE
+ // }
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
@@ -44,34 +56,47 @@
}
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.test.Name
}
this.clickListener = async (e) => {
- // console.log(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)
+ const title = e.layer.options.test.Name
+ const res = e.layer.options.test
+ window.$layer.open({
+ content: {
+ content: WasteGasIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: res
+ }
+ },
+ title: title // 鏍囬
+ })
+ this.setPanTo(e.latlng, 150)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
var effectOfChange
- if (ContrLevel === 1) {
- effectOfChange = ImgBlue
- } else if (ContrLevel === 2) {
- effectOfChange = ImagGreen
- } else if (ContrLevel === 3) {
- effectOfChange = ImagBright
- } else {
- effectOfChange = ImgGray
- }
+ /*
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ */
+ effectOfChange = ImagGreen
+ // } else if (ContrLevel === 3) {
+ // effectOfChange = ImagBright
+ // } else {
+ // effectOfChange = ImgGray
+ // }
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