From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 18:21:27 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 3 +--
src/components/LayerController/service/LayerFactory.js | 13 +++++--------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index 484d6e2..d12719b 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -1,4 +1,3 @@
-import store from '@/store'
import WfsLayerService from './WfsLayerService'
import BusiLayerService from './BusiLayerService'
import WmsLayerService from './WmsLayerService'
@@ -10,17 +9,15 @@
this.layers = {}
}
- init () {
+ init (layerConfig) {
// 1. 閬嶅巻layer config
- var layerConfig = store.state.map.serviceLayers.LayerSewersLine
for (var i = 0, l = layerConfig.length; i < l; i++) {
var config = layerConfig[i]
var layers = config.layers
- for (var j = 0; j < layers.length; j++) {
- var childConfig = layers[j]
- var checked = childConfig.checked
- checked && this.load(childConfig)
- }
+ layers && this.init(config.layers)
+
+ var checked = config.checked
+ checked && this.load(config)
}
}
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index fbe6525..e19b47f 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -90,7 +90,7 @@
L: window.L,
map: this.map
})
- layerFactory.init()
+ layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
@@ -106,7 +106,6 @@
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
- this.addMarker()
},
onLayerClick () {
this.$refs.popup.setShow()
--
Gitblit v1.8.0