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/views/MapTemplate.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 6354a8c..b7bac3b 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,6 +11,7 @@
<monitor-panel></monitor-panel>
<top-enterprise-panel></top-enterprise-panel>
<tool-box-panel></tool-box-panel>
+ <menu-special></menu-special>
</div>
</template>
@@ -25,10 +26,12 @@
import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
import Popup from '@views/popup/Popup'
+import MenuSpecial from '@components/panel/MenuSpecial'
export default {
name: 'MapTemplate',
components: {
+ MenuSpecial,
ToolBoxPanel,
TopEnterprisePanel,
SgisLayerController,
@@ -47,8 +50,8 @@
}
},
computed: {
- mapConfig () {
- return this.$store.state.map.mapConfig
+ config () {
+ return this.$store.state.map.config
}
},
beforeMount () {
@@ -71,13 +74,13 @@
this.map = Sgis.initMap(mapcontainer)
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.mapConfig, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
+ this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
- this.serviceLayerHelper.initServiceLayers(this.mapConfig)
+ this.serviceLayerHelper.initServiceLayers(this.config)
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
- this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+ this.vectorLayerHelper.initVectorLayers(this.config)
this.saveMapStatus()
// this.setMapObj(this.mapObj)
--
Gitblit v1.8.0