Merge remote-tracking branch 'origin/master'

YANGDL

2021-03-12 1bbce96c3e694c834a830b2c038f9303e35895b5

 src/views/MapTemplate.vue

@@ -11,7 +11,7 @@
    <monitor-panel></monitor-panel>
    <!--        <top-enterprise-panel></top-enterprise-panel>-->
    <tool-box-panel ref="toolBox"></tool-box-panel>
    <menu-special></menu-special>
<!--    <menu-special></menu-special>-->
    <legend-panel></legend-panel>
    <summary-sheets v-show="isShowbtn"></summary-sheets>
    <enterprise></enterprise>
@@ -31,7 +31,7 @@
import summarySheets from '@components/table/summarySheets.vue'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
import Popup from '@views/popup/Popup'
import MenuSpecial from '@components/panel/MenuTopic'
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'

@@ -40,7 +40,7 @@
  components: {
    Enterprise,
    LegendPanel,
    MenuSpecial,
    // MenuSpecial,
    ToolBoxPanel,
    // TopEnterprisePanel,
    SgisLayerController,