From 80078586462a5d66221d716adca79b6173c2bc08 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 09 三月 2021 17:04:33 +0800
Subject: [PATCH] 修改已知问题

---
 src/components/helpers/ServiceLayerHelper.js |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index a38ef6c..96da67f 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -116,18 +116,21 @@
      * @param url
      * @param item
      */
-  loadGeojsonLayer (url, item) {
+  async loadGeojsonLayer (url, item) {
     var matches = this.regex.exec(url)
     var matchValue = item[matches[1]]
     var code = item.code
     var newUrl = url.replace(this.regex, matchValue)
     var that = this
     if (!that.layerArray[code]) {
-      AjaxUtils.GetDataAsynByUrl(newUrl, {}, function (res) {
-        store.commit('addSewersDatas', res)
-        var layer = that.loadGeojson(res, item)
-        that.layerArray[code] = layer
-      })
+      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
+        }
+      }
     } else {
       that.layerArray[code].addTo(that.map)
     }
@@ -140,6 +143,7 @@
   loadGeojson (res, opt) {
     var that = this
     var icon = opt.icon
+    const layergroup = that.L.featureGroup().addTo(that.map)
     const geojson = that.L.geoJSON(res.features, {
       style: function (feature) {
         return {
@@ -215,7 +219,8 @@
             }
           })
         }
-      }).addTo(that.map)
+      // }).addTo(that.map)
+      }).addTo(layergroup)
     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()

--
Gitblit v1.8.0