From a70b76f5f880dc6dfc9da8754e1d117c7ca5c7e7 Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期一, 17 五月 2021 16:07:57 +0800 Subject: [PATCH] 公共flyTo方法 --- src/components/LayerController/logic/WasteGas.js | 81 +++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 26 deletions(-) diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js index bf0a41c..6c2fe65 100644 --- a/src/components/LayerController/logic/WasteGas.js +++ b/src/components/LayerController/logic/WasteGas.js @@ -3,24 +3,33 @@ */ const AnimalService = require('../service/AnimalService').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_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 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 }) - const res = await mapApi.GetWasteGas() + // 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) + // console.log(data) for (let i = 0; i < data.length; i++) { // 缁忕含搴� 浣嶇疆 const positionX = data[i].Latitude @@ -28,12 +37,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) @@ -42,26 +57,40 @@ } this.bindTooltip = (layer) => { - console.log(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: { + content: 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 - } + /* + 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