From 9760171bc3d60cc981c71953bcafec8998fc7622 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 02 三月 2021 17:41:53 +0800
Subject: [PATCH] 修改图层控制

---
 src/components/helpers/ServiceLayerHelper.js |   82 +++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index fa100b0..656f362 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -5,7 +5,6 @@
 import AjaxUtils from '@/utils/AjaxUtils'
 import store from '@/store'
 
-var myRenderer = window.L.canvas()
 class ServiceLayerHelper {
   constructor (options) {
     this.map = options.map
@@ -18,6 +17,7 @@
     this.geojsonArray = {} // 鍒濆鐨刧eojson闆�
     this.layerConfig = {}
     this.regex = /\{(.+?)\}/g // 鍖归厤{}
+    this.popupComp = null
   }
 
   getTileLayer (code) {
@@ -27,9 +27,11 @@
   /**
      * 鏍规嵁閰嶇疆鏂囦欢鍒濆鍖栦笟鍔″簳鍥�
      */
-  initServiceLayers (layerConfig) {
+  initServiceLayers (layerConfig, popupComp) {
     this.layerConfig = layerConfig
+    this.popupComp = popupComp
     this.loadLayers(layerConfig.mapConfig.Layers.LayerSewersLine)
+    this.loadLayers(layerConfig.mapConfig.Layers.layerSewersPoint)
   }
 
   /**
@@ -41,19 +43,17 @@
     console.debug('ServiceLayerHelper鍔犺浇鍙傛暟锛�', layerConfig)
     for (let i = 0, len = layerConfig.length; i < len; ++i) {
       const opt = layerConfig[i]
-      if (opt.checked) {
-        if (opt.type === 'wmts') {
-          this.loadWmtsLayer(opt, isAddToMap)
-          this.tileLayersWMTSArray.push(opt)
-        } else if (opt.type === 'wms') {
-          this.loadWmsLayer(opt, isAddToMap)
-          this.tileLayersWMSArray.push(opt)
-        } else if (opt.type === 'tile') {
-          this.loadTileLayer(opt, isAddToMap)
-          this.tileLayersTileArray.push(opt)
-        } else if (opt.type === 'geojson') {
-          this.loadGeojsonLayers(opt)
-        }
+      if (opt.type === 'wmts') {
+        this.loadWmtsLayer(opt, isAddToMap)
+        this.tileLayersWMTSArray.push(opt)
+      } else if (opt.type === 'wms') {
+        this.loadWmsLayer(opt, isAddToMap)
+        this.tileLayersWMSArray.push(opt)
+      } else if (opt.type === 'tile') {
+        this.loadTileLayer(opt, isAddToMap)
+        this.tileLayersTileArray.push(opt)
+      } else if (opt.type === 'geojson') {
+        this.loadGeojsonLayers(opt)
       }
     }
   }
@@ -70,6 +70,11 @@
     }
   }
 
+  /**
+   * 璇锋眰wfs鏁版嵁
+   * @param url
+   * @param item
+   */
   loadGeojsonLayer (url, item) {
     var matches = this.regex.exec(url)
     var matchValue = item[matches[1]]
@@ -86,13 +91,14 @@
   }
 
   /**
-     * 鍔犺浇鐐规暟鎹�
-     * @param res
-     */
-  loadGeojson (res, layer) {
+   * 鍔犺浇gis server杩斿洖鐨刧eoson鏁版嵁鍒板湴鍥句腑灞曠ず
+   * @param res
+   */
+  loadGeojson (res, opt) {
     var that = this
-    var icon = layer.icon
-    return that.L.geoJSON(res.features, {
+    var icon = opt.icon
+    const featureGroup = that.L.featureGroup().addTo(that.map)
+    that.L.geoJSON(res.features, {
       style: function (feature) {
         return {
           fill: true,
@@ -115,11 +121,18 @@
               size: [20, 20]
             }
           })
-      },
-      renderer: myRenderer
+      }
     }).bindPopup(function (layer) {
-      return layer.feature.properties.linenumber
-    }).addTo(that.map)
+      that.popupComp.setDatas(layer)
+      that.popupComp.setShow()
+      return that.popupComp.$el
+    }, {
+      className: 's-map-popup',
+      minWidth: 300,
+      closeButton: false,
+      autoClose: false
+    }).addTo(featureGroup).bringToFront()
+    return featureGroup
   }
 
   removeLayer (item) {
@@ -139,11 +152,13 @@
   loadWmtsLayer (options, isAddToMap = true) {
     const layer = this.L.tileLayer(options.url, options.option)
     layer.config = options
-
-    if (isAddToMap) {
-      layer.addTo(this.map)
+    var checked = options.checked
+    if (checked) {
+      if (isAddToMap) {
+        layer.addTo(this.map)
+      }
+      this.loadedLayersMap.set(options.code, layer)
     }
-    this.loadedLayersMap.set(options.code, layer)
   }
 
   /**
@@ -155,10 +170,13 @@
     const layer = this.L.tileLayer.wms(options.url, options.option)
     layer.config = options
 
-    if (isAddToMap) {
-      layer.addTo(this.tileLayerWmslayerGroup)
+    var checked = options.checked
+    if (checked) {
+      if (isAddToMap) {
+        layer.addTo(this.tileLayerWmslayerGroup)
+      }
+      this.loadedLayersMap.set(options.code, layer)
     }
-    this.loadedLayersMap.set(options.code, layer)
   }
 
   /**

--
Gitblit v1.8.0