From b1f1538f433486783db4a042d8f9ba540892e320 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 09 四月 2021 17:54:34 +0800
Subject: [PATCH] 管线在下面显示
---
src/components/LayerController/service/WfsLayerService.js | 5 ++---
src/conf/MapConfig.js | 4 +---
src/components/LayerController/service/LayerFactory.js | 44 ++++++++++++++++++++++++++++----------------
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index d12719b..b617ae5 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -11,13 +11,17 @@
init (layerConfig) {
// 1. 閬嶅巻layer config
- for (var i = 0, l = layerConfig.length; i < l; i++) {
- var config = layerConfig[i]
- var layers = config.layers
- layers && this.init(config.layers)
+ if (layerConfig) {
+ for (var i = 0, l = layerConfig.length; i < l; i++) {
+ var config = layerConfig[i]
+ var layers = config.layers
+ var childLayer = config.childLayer
+ layers && this.init(config.layers)
+ childLayer && this.init(config.childLayer)
- var checked = config.checked
- checked && this.load(config)
+ var checked = config.checked
+ checked && this.load(config)
+ }
}
}
@@ -72,17 +76,25 @@
}
/**
- * 璁剧疆index,绾垮湪鏈�涓嬮潰锛岀偣鍦ㄤ笂闈�
- * @param layerGroup 鍥惧眰缁�
- */
- setZIndex (layerGroup) {
- var layers = layerGroup.getLayers()
- if (layers.length > 0) {
- var layer = layers[0]
- if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
- layerGroup.bringToBack()
+ * todo 杩欓噷鏃犳晥锛岃矊浼兼槸鍥犱负geojson鍔犺浇鍒板湴鍥句篃鏄釜layergroup
+ *
+ * 璁剧疆index,绾垮湪鏈�涓嬮潰锛岀偣鍦ㄤ笂闈�
+ * @param layerGroup 鍥惧眰缁�
+ */
+ setZIndex (layer) {
+ if (Array.isArray(layer)) {
+ for (var i = 0; i < layer.length; i++) {
+ this.setZIndex(layer[i])
+ }
+ } else {
+ if (layer.getLayers) {
+ this.setZIndex(layer.getLayers())
} else {
- layerGroup.bringToFront()
+ if (layer.feature && (layer.feature.geometry.type === 'LineString' || layer.feature.geometry.type === 'MultiLineString')) {
+ layer.bringToBack()
+ } else {
+ layer.bringToFront()
+ }
}
}
}
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index b263e46..f00eaeb 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -1,7 +1,6 @@
/**
* 鍔犺浇涓氬姟鏁版嵁鍥惧眰
*/
-
import { STYLES } from '../../../conf/Constants'
import AjaxUtils from '../../../utils/AjaxUtils'
@@ -30,14 +29,13 @@
loadData (wfsUrl) {
AjaxUtils.get4JsonDataByUrl(wfsUrl, this.params, (res) => {
- console.log(res)
this.draw(res.data.features)
})
}
draw (features) {
const icon = this.config.icon
- this.L.geoJSON(features, {
+ const geojsonLayer = this.L.geoJSON(features, {
style: function (feature) {
return {
fill: STYLES.FILL,
@@ -75,6 +73,7 @@
.on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
}
}).addTo(this.layer)
+ window.layerFactory.setZIndex(geojsonLayer)
}
mouseOverListener (e, layer) {
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a89c954..6e6ea34 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,6 +1,5 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'
@@ -42,8 +41,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerBasin, LayerTopic],
- layerSewersPoint: LayerSewersPoint
+ LayerSewersLine: [LayerBasin, LayerTopic]
} // 姹￠洦姘村浘灞傞厤缃�
}
--
Gitblit v1.8.0