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/WasteWater.js | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 16c4f17..9d10a57 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -1,15 +1,18 @@
/**
* 搴熸按
*/
+// import WasteWater from "../../table/components/WasteWater";
+
const AnimalService = require('../service/AnimalService').default
const mapApi = require('../../../api/mapApi').default
// 寮圭獥鏁版嵁寮曡繘
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteWaterIndex = require('@components/BaseNav/WasteWater/WasteWaterIndex').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const NormalImg = '/assets/images/map/wastewater/fs_green.png' // 姝ｅ父
+const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
const AbnormalImg = '/assets/images/map/wastewater/fs_blue.png' // 寮傚父
-const MissImg = '/assets/images/map/wastewater/fs_yellow.png' // 缂哄け
+const MissImg = '/assets/images/map/wastewater/fs_bright_green.png' // 缂哄け
const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
@@ -24,9 +27,7 @@
layer: layer
})
const res = await mapApi.getWasteWater()
- console.log(res)
- const data = res.Result.DataInfo
- console.log(data)
+ const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
@@ -35,34 +36,70 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
- const marker = L.marker.magic([positionX, positionY], {
- test: data[i],
+ const marker = L.marker([positionX, positionY], {
+ totransferData: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [35, 35],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
}
}
+ // 鍒嗗壊绾�-------------------------------------------------------------------------------
this.bindTooltip = (layer) => {
- return layer.options.test.Name
+ return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.totransferData.Name
}
- this.clickListener = async (e) => {
- // console.log(e)
+ this.clickListener = (e) => {
+ // 鐐瑰嚮marker鐨刾ulse()鍏夋尝
this.animalService.pulseEffect(e.latlng)
- const dataValue = {
- StoragePlaceId: e.layer.options.test.StoragePlaceId
- }
- const result = await mapApi.getWasteWater(dataValue)
- const PublicBounced = window.Vue.extend(publicBounced)
- const instance = new PublicBounced()
- instance.setData(result)
- instance.$mount()
- document.body.appendChild(instance.$el)
+ // 寮规鏍囬
+ const title = e.layer.options.totransferData.Name
+ const res = e.layer.options.totransferData
+ window.$layer.open({
+ content: {
+ content: WasteWaterIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ // info: this.info
+ storagePlaceId: res
+ }
+ },
+ title: title // 鏍囬
+ })
+ this.setPanTo(e.latlng, 150)
+ }
+ this.requestWasteWaterData = async (e) => {
+ // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.test.StoragePlaceId
+ // }
+ // 寮规鏍囬
+ // const title = e.layer.options.totransferData.Name
+ // console.log(e.layer.options)
+ // 鍩烘湰淇℃伅 tabs
+ // const resultBasic = await mapApi.getWasteWater(dataValue)
+ // 鍥捐〃淇℃伅灞曠ず echarts
+ // 瀹炴椂鏁版嵁
+ // const resultReal = await mapApi.getDataItems(Value)
+ // 灏忔椂鏁版嵁 鍙� 鏄庣粏琛ㄦ暟鎹�
+ // const result = await mapApi.getQueryOnlineMonData(dataValue)
+ // 鏃ユ暟鎹� 鍙� 鏄庣粏琛ㄦ暟鎹�
+ // const result = await mapApi.getQueryOnlineMonData(dataValue)
+ // 浜哄伐鏁版嵁
+ // const resultEchart = await mapApi.getQueryLabMonData(dataValue)
+
+ // // 缁戝畾寮规瀹炰緥
+ // const PublicBounced = window.Vue.extend(publicBounced)
+ // const instance = new PublicBounced().$mount()
+ // document.body.appendChild(instance.$el)
+ // // document.body.removeChild(instance.$el)
+ // // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
+ // instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+ /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
@@ -96,4 +133,12 @@
}
return testChange
}
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
+ 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