From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期五, 21 五月 2021 14:30:44 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/LayerController/logic/WasteGas.js | 98 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 71 insertions(+), 27 deletions(-) diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js index 2744f36..935c9ff 100644 --- a/src/components/LayerController/logic/WasteGas.js +++ b/src/components/LayerController/logic/WasteGas.js @@ -2,45 +2,89 @@ * 搴熸皵 */ const AnimalService = require('../service/AnimalService').default -const AjaxUtils = require('../../../utils/AjaxUtils').default +// const AjaxUtils = require('../../../utils/AjaxUtils').default +// 鍏叡鏂规硶 panTo() 寮曠敤 +const { setPanTo } = require('../../../utils/utils') +// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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 WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').default +// const WasteGasChats = require('./WasteGasChats').default module.exports = function () { /** * 杩斿洖marker瀵硅薄鏁扮粍 * @param L leaflet瀵硅薄 */ - this.init = (layer, L) => { - 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], {})) - } + this.init = async (layer, L) => { + // 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++) { + // 缁忕含搴� 浣嶇疆 + const positionX = data[i].Latitude + const positionY = data[i].Longitude + // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁 + const ContrLevel = data[i].ContrLevel + var iconUrl = this.differentTypes(ContrLevel) + 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 '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.test.Name } - this.clickListener = (e) => { - console.log(e) + this.clickListener = async (e) => { + // console.log(e) this.animalService.pulseEffect(e.latlng) + setPanTo(e.latlng, 200) + const title = e.layer.options.test.Name + const res = e.layer.options.test + window.$layer.open({ + content: { + comp: WasteGasIndex, // 缁勪欢 + parent: this, // 鐖剁粍浠� + data: { // 浼犻�掔殑鍙傛暟 + storagePlaceId: res + } + }, + title: '澶╂触鐭冲寲' + title // 鏍囬 + }) + } + // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇 + 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 } } -- Gitblit v1.8.0