From 74af7e38b277395b635c6b45f9607e2f0b89aa8f Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 10 三月 2021 10:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/helpers/ServiceLayerHelper.js | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 8d1ab87..6a67caa 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -126,13 +126,12 @@
const res = await AjaxUtils.GetDataAsynByUrl(newUrl, {})
if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
store.commit('addSewersDatas', res.data)
- if (newUrl.indexOf('绠＄綉') !== -1 || newUrl.indexOf('鍥涢��') !== -1) {
- var layer = that.loadGeojson(res.data, item)
- that.layerArray[code] = layer
- }
+ var layer = that.loadGeojson(res.data, item)
+ that.layerArray[code] = layer
}
} else {
- that.layerArray[code].addTo(that.map)
+ var _layer = that.layerArray[code].addTo(that.map)
+ that.setZIndex(_layer)
}
}
@@ -143,7 +142,7 @@
loadGeojson (res, opt) {
var that = this
var icon = opt.icon
- const featureGroup = that.L.featureGroup().addTo(that.map)
+ const featureGroup = that.L.featureGroup()
const featureList = []
const geojson = that.L.geoJSON(res.features, {
style: function (feature) {
@@ -169,6 +168,8 @@
})
},
onEachFeature: function (feature, layer) {
+ console.log(feature)
+ console.log(layer)
featureList.push(layer)
layer.addTo(featureGroup)
}
@@ -228,12 +229,26 @@
// }).addTo(featureGroup)
})
store.commit('addSewersDatas', geojson)
- if (Object.prototype.hasOwnProperty.call(res, 'features') && res.features.length > 0 && (res.features[0].geometry.type === 'LineString' || res.features[0].geometry.type === 'MultiLineString')) {
- geojson.bringToBack()
- } else {
- geojson.bringToFront()
+ featureGroup.addTo(that.map)
+ that.setZIndex(featureGroup)
+ return featureGroup
+ }
+
+ /**
+ * 璁剧疆index,绾垮湪鏈�涓嬮潰锛岀偣鍦ㄤ笂闈�
+ * @param layerGroup 鍥惧眰缁�
+ */
+ setZIndex (layerGroup) {
+ console.log(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()
+ } else {
+ layerGroup.bringToFront()
+ }
}
- return geojson
}
removeLayer (item) {
--
Gitblit v1.8.0