From 81e426e19db140e630f45409c1569fe16dbcc33f Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期二, 18 五月 2021 15:25:19 +0800 Subject: [PATCH] 修复点击弹窗bug --- src/components/helpers/LocateHelper.js | 182 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 138 insertions(+), 44 deletions(-) diff --git a/src/components/helpers/LocateHelper.js b/src/components/helpers/LocateHelper.js index 876e74e..6354244 100644 --- a/src/components/helpers/LocateHelper.js +++ b/src/components/helpers/LocateHelper.js @@ -1,5 +1,33 @@ import { pulseEffect, reversePolyLine } from '../../utils/utils' +import Popup from '@views/popup/Popup' +import { LAYERPROPS, LAYERS } from '../../conf/Constants' +/** + * 鏁村悎瀹氫綅銆侀珮浜�佸脊绐� + * @param feature geojson + * @param config 鍥惧眰鐨刢onfig + */ +export const locate = function (feature, config, filter) { + fitBounds(feature) + highlight(feature, config) + setTimeout(() => { + const centerPoint = getCenterPoint(feature) + const params = { LAYERS: config.layerGroup || config.typeName, QUERY_LAYERS: config.layerGroup || config.typeName } + const filters = [] + if (config.filter) { + filters[filters.length] = config.filter + } + if (filter) { + filters[filters.length] = filter + } + if (filters.length > 0) { + params.CQL_FILTER = filters.join(' AND ') + } + window.mapManager.loadWfsDatas(centerPoint, params).then((res) => { + openPropsPopup(centerPoint, res.features) + }) + }, 1000) +} /** * 鏍规嵁浼犵殑 feature瀵硅薄瀹氫綅锛� * @param code @@ -22,57 +50,123 @@ } } -export const highlight = function (feature, config) { - const L = window.L - const type = feature.geometry.type - const highlightLayer = window.mapManager.hightlightLayer - if (type === 'MultiLineString') { - L.geoJSON(feature, { - style: function () { - return { - fillColor: 'red', - color: 'red' - } - } - }).addTo(highlightLayer) - } else if (type === 'Point') { - // 鍙犲姞涓�涓ぇ灏哄鐨勫浘鏍� - let point = feature.geometry.coordinates - point = [point[1], point[0]] - - if (config) { - L.marker(point, { - icon: L.icon({ - iconUrl: '/assets/images/map/' + config.icon, - iconSize: [30, 30], - iconAnchor: [15, 15] - }) - }).addTo(highlightLayer) +export const highlight = function (feature, icon) { + if (Array.isArray(feature)) { + for (let i = 0; i < feature.length; i++) { + highlight(feature[i], icon) } - pulseEffect(point) - } else if (type === 'LineString') { - L.polyline(reversePolyLine(feature), { color: 'red' }).addTo(highlightLayer) + } else { + const L = window.L + const type = feature.geometry.type + window.mapManager.clearHighlight() + const highlightLayer = window.mapManager.hightlightLayer + if (type === 'MultiLineString') { + L.geoJSON(feature, { + style: function () { + return { + fillColor: 'red', + color: 'red' + } + } + }).addTo(highlightLayer) + } else if (type === 'Point') { + // 鍙犲姞涓�涓ぇ灏哄鐨勫浘鏍� + let point = feature.geometry.coordinates + point = [point[1], point[0]] + + if (icon) { + L.marker(point, { + icon: L.icon({ + iconUrl: '/assets/images/map/' + icon, + iconSize: [30, 30], + iconAnchor: [15, 15] + }) + }).addTo(highlightLayer) + } + pulseEffect(point) + } else if (type === 'LineString') { + L.polyline(reversePolyLine(feature), { color: 'red' }).addTo(highlightLayer) + } } } -export const openPopup = function (layerId, id) { - const layer = this.layers[layerId] - - if (layer) { - layer.eachLayer(function (layer) { - const layers = layer.getLayers() - for (var i = 0; i < layers.length; i++) { - const lay = layers[i] - const feature = lay.feature - lay.closePopup() - if (feature.id === id) { - lay.openPopup() - break +/** + * 寮瑰嚭灞炴�у垪琛ㄥ睍绀虹獥鍙� + * @param xy 寮瑰嚭绐楀彛璺熼殢瑕佺礌鐨勭粡绾害 + * @param layer 鏌ヨ鎸囧畾鐨勫浘灞傘�備笉鎸囧畾鏃讹紝榛樿涓哄嬀閫夌殑鍥惧眰 + */ +export const openPropsPopup = function (xy, features) { + const lt = window.map.latLngToContainerPoint(xy) + const datas = popupDatas(features) + console.log(datas) + if (datas.length > 0) { + window.$layer.open({ + content: { + comp: Popup, // 缁勪欢 + data: { // 浼犻�掔殑鍙傛暟 + datas: datas } - } + }, + title: '', // 鏍囬 + left: lt.x, + top: lt.y }) } - return null +} + +export const getCenterPoint = function (feature) { + const type = feature.geometry.type + var point = [] + switch (type) { + case 'Point': + point = feature.geometry.coordinates + break + case 'MultiLineString': + var coordinates = feature.geometry.coordinates + var coordinate = coordinates[parseInt(coordinates.length / 2)][0] + if (coordinate.length > 2) { + point = [coordinate[0], coordinate[1]] + } + break + case 'LineString': + var lineString = feature.geometry.coordinates + point = lineString[parseInt(lineString.length / 2)][0] + break + } + if (point.length > 2) { + point.splice(2, 1) + } + return point.reverse() +} + +const popupDatas = function (features) { + const datas = [] + if (features) { + for (var i = 0; i < features.length; i++) { + const feature = features[i] + const id = feature.id + const properties = feature.properties + const ids = id.split('.') + + const propValues = LAYERPROPS[ids[0]] + const contents = {} + if (!propValues) { + continue + } + for (const k in properties) { + if (propValues[k]) { + contents[propValues[k]] = properties[k] + } + } + datas.push({ + title: LAYERS[ids[0]], + name: feature.id, + content: contents + }) + console.log(properties) + } + } + return datas } export const getLayer = function (layerId, id) { -- Gitblit v1.8.0