Merge remote-tracking branch 'origin/master'

YANGDL

2021-02-25 6cdcf30b52502fa2b7db21064c40b7193bf7e25f

 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)