From c63087b698d27edf8d5867a78a04a0713498a0c2 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 17:42:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 114 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 27 deletions(-)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 2744f36..bdc5e30 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -2,45 +2,105 @@
* 搴熸皵
*/
const AnimalService = require('../service/AnimalService').default
-const AjaxUtils = require('../../../utils/AjaxUtils').default
+// 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_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 WasteGasChats = require('./WasteGasChats').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
* @param L leaflet瀵硅薄
*/
- this.init = (layer, L) => {
+ this.init = async (layer, L) => {
+ // console.log(WasteGasChats)
this.animalService = new AnimalService({ L: L, layer: layer })
- AjaxUtils.get4JsonDataByUrl('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', {
- companyId: 3900100145,
- id: '',
- monType: 1,
- userCode: 'wenchun.deng',
- monDuration: '',
- epName: '',
- secdDeptId: '',
- contrLevel: '',
- dataStatus: '',
- dataFlag: '',
- runStatus: '',
- emissTypeId: ''
- }, function (res) {
- const data = res.data.Result.DataInfo
- for (let i = 0; i < data.length; i++) {
- // 缁忕含搴� 浣嶇疆
- const positionX = data[i].Latitude
- const positionY = data[i].Longitude
- layer.addLayer(L.marker([positionX, positionY], {}))
- }
- })
+ const res = await mapApi.getWasteGas()
+ // console.log(res)
+ const data = res.Result.DataInfo || {}
+ // console.log(data)
+ for (let i = 0; i < data.length; i++) {
+ // 缁忕含搴� 浣嶇疆
+ const positionX = data[i].Latitude
+ const positionY = data[i].Longitude
+ // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
+ const ContrLevel = data[i].ContrLevel
+ var iconUrl = this.differentTypes(ContrLevel)
+ // 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: [30, 30],
+ iconAnchor: [15, 15]
+ })
+ })
+ layer.addLayer(marker)
+ // layer.addLayer(L.marker([positionX, positionY], {}))
+ }
}
this.bindTooltip = (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 GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
+ console.log(Mondata)
+ 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, Mondata.Result.DataInfo, 'feiqi')
+ // console.log(e.layer.options.test)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
+ this.setPanTo(e.latlng, 80)
+ }
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
+ 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
+ // }
+ 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