From 6cdcf30b52502fa2b7db21064c40b7193bf7e25f Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期四, 25 二月 2021 10:55:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/store/modules/map.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index d45b265..c6b997e 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -1,9 +1,8 @@
-import mapConfig from '../../conf/MapConfig'
+import config from '../../conf/MapConfig'
 
 const state = {
   currentCorp: null,
   currentCorpType: null,
-  L: null,
   map: null, // 瀹炰緥鍖栫殑map
   basemapHelper: {}, // 褰卞儚鍦板浘鍥惧眰鎺у埗鍣ㄥ疄鐜板姪鎵嬬▼搴�
   serviceLayerHelper: {}, // 鏈嶅姟鍥惧眰鎺у埗鍣ㄥ疄鐜板姪鎵嬬▼搴�
@@ -14,16 +13,20 @@
   showServiceLayerFilter: false, // Service鍥惧眰杩囨护鍣�
   selectedServiceLayer: '', // 浣跨敤杩囨护鍣ㄦ椂锛岃鎵撳紑鐨刉MS鏈嶅姟鐨凜ODE
   serviceLayerFilters: {}, // 鏈嶅姟鍥惧眰鎺у埗杩囨护閰嶇疆
-  mapConfig: mapConfig
+  checkedLayers: {}, // 閫変腑鍥惧眰瀵硅薄
+  config: config,
+  serviceLayers: config.mapConfig.Layers
 }
 const mutations = {
-  setMapObj (state, mObject) {
-    state.L = mObject.L
-    state.map = mObject.map
+  setMapObj (state, map) {
+    state.map = map
   },
   setBasemapHelper (state, layerHelper) {
     state.basemapHelper = layerHelper
   },
+  setCheckedLayers (state, checkedLayers) {
+    state.checkedLayers = checkedLayers
+  },
   setServiceLayerHelper (state, layerHelper) {
     state.serviceLayerHelper = layerHelper
   },

--
Gitblit v1.8.0