From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/MapTemplate.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 6354a8c..a1c32db 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -9,8 +9,10 @@
<lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
</sgis-layer-controller>
<monitor-panel></monitor-panel>
- <top-enterprise-panel></top-enterprise-panel>
+<!-- <top-enterprise-panel></top-enterprise-panel>-->
<tool-box-panel></tool-box-panel>
+ <menu-special></menu-special>
+ <legend-panel></legend-panel>
</div>
</template>
@@ -22,15 +24,19 @@
import LcBasemap from '@components/LayerController/modules/LcBaseMap'
import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
import MonitorPanel from '@components/panel/RightSearchPanel'
-import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
import Popup from '@views/popup/Popup'
+import MenuSpecial from '@components/panel/MenuTopic'
+import LegendPanel from '@components/panel/LegendPanel'
export default {
name: 'MapTemplate',
components: {
+ LegendPanel,
+ MenuSpecial,
ToolBoxPanel,
- TopEnterprisePanel,
+ // TopEnterprisePanel,
SgisLayerController,
MonitorPanel,
LcBasemap,
@@ -47,8 +53,8 @@
}
},
computed: {
- mapConfig () {
- return this.$store.state.map.mapConfig
+ config () {
+ return this.$store.state.map.config
}
},
beforeMount () {
@@ -71,13 +77,14 @@
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)
+ console.log(this.$refs.popup.$el)
+ this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
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