Merge remote-tracking branch 'origin/master'

YANGDL

2021-01-05 1e40f7d8824d8859a6edbec3ae3fd0d857115553

 src/views/MapTemplate.vue

@@ -8,6 +8,7 @@
        </sgis-layer-controller>
        <lc-service-layer-filter v-show="showServiceLayerFilter" ref="serviceLayerFilter"></lc-service-layer-filter>
        <monitor-panel></monitor-panel>
        <top-enterprise-panel></top-enterprise-panel>
  </div>
</template>

@@ -20,11 +21,11 @@
import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
import MonitorPanel from '@components/panel/MonitorPanel'
import { mapMutations, mapState } from 'vuex'
import TopEnterprisePanel from "@components/panel/TopEnterprisePanel";

export default {
  name: 'MapTemplate',
  components: {SgisLayerController, MonitorPanel, LcBasemap, LcServiceLayer, LcServiceLayerFilter},
  components: {TopEnterprisePanel, SgisLayerController, MonitorPanel, LcBasemap, LcServiceLayer, LcServiceLayerFilter},
  data(){
    return {
      basemapHelper: {},
@@ -33,10 +34,12 @@
    }
  },
  computed:{
    ...mapState({
      showServiceLayerFilter: state => state.showServiceLayerFilter,
      mapConfig: state => state.mapConfig
    })
    showServiceLayerFilter(){
      return this.$store.state.map.showServiceLayerFilter
    },
    mapConfig(){
      return this.$store.state.map.mapConfig
    }
  },
  beforeMount(){
      this.$nextTick(() => {
@@ -44,12 +47,12 @@
      })
  },
  methods:{
      ...mapMutations({
        setMapObj: 'setMapObj',
        setBasemapHelper: 'setBasemapHelper',
        setServiceLayerHelper: 'setServiceLayerHelper',
        setVectorLayerHelper: 'setVectorLayerHelper'
      }),
    saveMapStatus(){
      this.$store.commit('setMapObj', this.mapObj);
      this.$store.commit('setBasemapHelper', this.basemapHelper);
      this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper);
      this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper);
    },
      init() {
        const mapcontainer = this.$refs.rootmap
        this.mapObj = Sgis.initMap(mapcontainer)
@@ -63,10 +66,12 @@
        this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.mapObj.map, this.mapObj.L) // 初始化动态要素图层助手
        this.vectorLayerHelper.initVectorLayers(this.mapConfig)

        this.setMapObj(this.mapObj)
        this.setBasemapHelper(this.basemapHelper)
        this.setServiceLayerHelper(this.serviceLayerHelper)
        this.setVectorLayerHelper(this.vectorLayerHelper)

        this.saveMapStatus()
        // this.setMapObj(this.mapObj)
        // this.setBasemapHelper(this.basemapHelper)
        // this.setServiceLayerHelper(this.serviceLayerHelper)
        // this.setVectorLayerHelper(this.vectorLayerHelper)
      }
  }
}