From cf5ab6da9ff676fab8a10d4299bd5a04a07bf50f Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期一, 17 五月 2021 10:05:53 +0800 Subject: [PATCH] 修复默认选中图层时出现的BUG --- src/components/LayerController/logic/WasteGas.js | 62 +++++++++++++------------------ 1 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js index 9e30e54..17706bc 100644 --- a/src/components/LayerController/logic/WasteGas.js +++ b/src/components/LayerController/logic/WasteGas.js @@ -7,18 +7,24 @@ // 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓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_new.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 || {} @@ -40,8 +46,8 @@ test: data[i], icon: L.icon({ iconUrl: iconUrl, - iconSize: [20, 20], - iconAnchor: [10, 10] + iconSize: [30, 30], + iconAnchor: [15, 15] }) }) layer.addLayer(marker) @@ -50,34 +56,25 @@ } 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 GasOnlinedata = { - // onLineMonEmissPointId: 23, - // monItemId: 28, - // emissTypeld: 2, - // beginTime: 2020/0o4/0o6 15:13:20, - // endTime=2020/0o4/0o7;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, 'feiqi') - // console.log(e.layer.options.test) - instance.$mount() - document.body.appendChild(instance.$el) - this.setPanTo(e.latlng, 80) + 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.animalService.setPanTo(e.latlng, 150) } // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇 this.differentTypes = (ContrLevel) => { @@ -94,12 +91,5 @@ // 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