From 0692a3ae256df6e6f322b01deac853f774535e26 Mon Sep 17 00:00:00 2001
From: wangrui <zephyrs0894@163.com>
Date: 星期三, 23 十二月 2020 17:56:23 +0800
Subject: [PATCH] 实现WMS服务加载

---
 src/components/helpers/BasemapHelper.js |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/helpers/BasemapHelper.js b/src/components/helpers/BasemapHelper.js
index a1d315b..aa8c72f 100644
--- a/src/components/helpers/BasemapHelper.js
+++ b/src/components/helpers/BasemapHelper.js
@@ -46,44 +46,43 @@
 
     /**
      * 鏄剧ず鏌愪釜鍥惧眰
-     * @param map 鍦板浘瀵硅薄
      * @param layer 寰呮樉绀哄浘灞傚紩鐢�
      * @param isHideOthers 鏄惁鍏堝叧闂叾浠栧浘灞傦紝榛樿鏄痶rue
      */
-    showBasemap = (map, code, isHideOthers = true) => {
+    showBasemap = (code, isHideOthers = true) => {
         let basemap = this.basemapMap.get(code)
         if(isHideOthers) {
             for(let i = 0, len = this.basemapList.length; i < len; ++i){
-                map.removeLayer(this.basemapList[i])
+                this.map.removeLayer(this.basemapList[i].layer)
+                this.map.removeLayer(this.basemapList[i].annotation)
             }
         }
-        map.addLayer(basemap.layer)
-        map.addLayer(basemap.annotation)
+        this.map.addLayer(basemap.layer)
+        this.map.addLayer(basemap.annotation)
     }
 
     /**
      * 闅愯棌鏌愪釜鍥惧眰
-     * @param map 鍦板浘瀵硅薄
      * @param layer 寰呭叧闂浘灞傚紩鐢�
      */
-    hideBasemap = (map, code) => {
+    hideBasemap = (code) => {
         let basemap = this.basemapMap.get(code)
-        map.removeLayer(basemap.layer)
-        map.removeLayer(basemap.annotation)
+        this.map.removeLayer(basemap.layer)
+        this.map.removeLayer(basemap.annotation)
     }
 
     // 鍏綉鍒涘缓鍦板浘閮ㄥ垎
     _createBasemapByConfig(mapConfig){
-        console.log(mapConfig)
         let internetBasemaps = mapConfig.mapConfig.InternetBaseMaps
         for(let i = 0, len = internetBasemaps.length; i < len; ++i) {
             let basemapConfig = internetBasemaps[i]
-            let basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.options)
-            let basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.options)
+            let basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.option)
+            let basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.option)
 
             let basemap = {
                 code: basemapConfig.code,
                 name: basemapConfig.name,
+                conf: basemapConfig,
                 layer: basemapLayer,
                 annotation: basemapAnnotationLayer
             }
@@ -111,12 +110,13 @@
         let intranetBasemaps = mapConfig.mapConfig.IntranetBaseMaps
         for(let i = 0, len = intranetBasemaps.length; i < len; ++i) {
             let basemapConfig = intranetBasemaps[i]
-            let basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.options)
-            let basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.options)
+            let basemapLayer = this.L.tileLayer(basemapConfig.map.url, basemapConfig.map.option)
+            let basemapAnnotationLayer = this.L.tileLayer(basemapConfig.annotation.url, basemapConfig.annotation.option)
 
             let basemap = {
                 code: basemapConfig.code,
                 name: basemapConfig.name,
+                conf: basemapConfig,
                 layer: basemapLayer,
                 annotation: basemapAnnotationLayer
             }

--
Gitblit v1.8.0