Merge remote-tracking branch 'origin/master'

YANGDL

2021-03-13 10b5efefb0f22715ecf871e79a67a165ab8610a7

 src/views/MapTemplate.vue

@@ -11,9 +11,10 @@
    <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>
    <el-button id="mapbtn" type="primary" icon="el-icon-c-scale-to-original" circle @click="isshowhidden"></el-button>
  </div>
</template>
@@ -30,14 +31,16 @@
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'

export default {
  name: 'MapTemplate',
  components: {
    Enterprise,
    LegendPanel,
    MenuSpecial,
    // MenuSpecial,
    ToolBoxPanel,
    // TopEnterprisePanel,
    SgisLayerController,
@@ -160,12 +163,6 @@
    //height: 1px;
    //background-color: #0661AE;
    border-top: 1px solid #0661AE;
  }
  #mapbtn {
    position: fixed;
    top: 0;
    left: 100px;
    z-index: 9999!important;
  }
}
</style>