From bba9dae2c534caefd1009f3cc7b3889b58566de9 Mon Sep 17 00:00:00 2001
From: 陈泽平 <qibolin02429@126.com>
Date: 星期一, 17 五月 2021 10:31:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/service/WmsLayerService.js |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/LayerController/service/WmsLayerService.js b/src/components/LayerController/service/WmsLayerService.js
index fbc74bd..3b25bc6 100644
--- a/src/components/LayerController/service/WmsLayerService.js
+++ b/src/components/LayerController/service/WmsLayerService.js
@@ -29,9 +29,11 @@
     this.featureGroup = this.L.featureGroup({}).addTo(this.map)
 
     this.wmsLayerList = new WmsLayerList()
-    for (var i = 0; i < layersConfig.length; i++) {
-      const config = layersConfig[i]
-      this.wmsLayerList.addConfig(config)
+    if (layersConfig) {
+      for (var i = 0; i < layersConfig.length; i++) {
+        const config = layersConfig[i]
+        this.wmsLayerList.addConfig(config)
+      }
     }
     this.load()
   }
@@ -41,28 +43,24 @@
   }
 
   add (config) {
+    console.log(config)
     this.wmsLayerList.addConfig(config)
-    const layers = this.wmsLayerList.getLayers()
-    const filter = this.wmsLayerList.getFilters()
+    const layers = this.wmsLayerList.getLayers() || ''
+    const filter = this.wmsLayerList.getFilters() || ''
     const params = {}
-    if (filter) {
-      params.cql_filter = filter
-    }
-    if (layers) {
-      params.layers = layers
-    }
+    params.cql_filter = filter
+    params.layers = layers
+    console.log(this.wmsLayerList)
     this.wmsLayer.setParams(params)
   }
 
   remove (config) {
     console.log(config)
     this.wmsLayerList.remove(config.typeName, config.filter)
-    const layers = this.wmsLayerList.getLayers()
-    const filter = this.wmsLayerList.getFilters()
+    const layers = this.wmsLayerList.getLayers() || ''
+    const filter = this.wmsLayerList.getFilters() || ''
     const params = { layers: layers }
-    if (filter) {
-      params.cql_filter = filter
-    }
+    params.cql_filter = filter
     this.wmsLayer.setParams(params)
   }
 
@@ -109,13 +107,13 @@
         AjaxUtils.get4JsonDataByUrl(WMS_URL, params, (res) => {
           const features = res.data.features
           /**
-           * {
-           *     title: 'New Tab',
-           *     name: newTabName,
-           *     content: 'New Tab content'
-           * }
-           * @type {*[]}
-           */
+                     * {
+                     *     title: 'New Tab',
+                     *     name: newTabName,
+                     *     content: 'New Tab content'
+                     * }
+                     * @type {*[]}
+                     */
           const popupDatas = []
           if (features) {
             for (var i = 0; i < features.length; i++) {

--
Gitblit v1.8.0