From e6c30728a206a54cb9736355175ae078702f4d6f Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期三, 10 三月 2021 10:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/helpers/ServiceLayerHelper.js | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 8d1ab87..567be72 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -126,10 +126,8 @@
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)
@@ -143,7 +141,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 +167,8 @@
})
},
onEachFeature: function (feature, layer) {
+ console.log(feature)
+ console.log(layer)
featureList.push(layer)
layer.addTo(featureGroup)
}
@@ -233,7 +233,8 @@
} else {
geojson.bringToFront()
}
- return geojson
+ featureGroup.addTo(that.map)
+ return featureGroup
}
removeLayer (item) {
--
Gitblit v1.8.0