Merge remote-tracking branch 'origin/master'

YANGDL

2021-01-15 74deb02c39383fdad17240a23602d49ab44f5ae3

 src/views/MapTemplate.vue

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

@@ -20,12 +21,21 @@
import LcBasemap from '@components/LayerController/modules/LcBaseMap'
import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
import MonitorPanel from '@components/panel/MonitorPanel'
import MonitorPanel from '@components/panel/RightSearchPanel'
import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'

export default {
  name: 'MapTemplate',
  components: { TopEnterprisePanel, SgisLayerController, MonitorPanel, LcBasemap, LcServiceLayer, LcServiceLayerFilter },
  components: {
    ToolBoxPanel,
    TopEnterprisePanel,
    SgisLayerController,
    MonitorPanel,
    LcBasemap,
    LcServiceLayer,
    LcServiceLayerFilter
  },
  data () {
    return {
      basemapHelper: {},
@@ -84,10 +94,12 @@
    margin: 0;
    padding: 0;
    position: absolute;

  #map{
    height: 100%;
    width: 100%;
  }

  .barline{
    //width: 100%;
    //height: 1px;