From 231ed8b3de4866ceb5bbb9833c0a7afaee9583d6 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 12 三月 2021 18:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/MapTemplate.vue |   92 +++++++++++++++++++++++++++-------------------
 1 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 6354a8c..5e3f482 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,17 +1,21 @@
 <template>
-    <div class="full-screen">
-        <popup ref="popup" @callPopup="callPopup"></popup>
-        <div id="map" ref="rootmap">
-        </div>
-        <sgis-layer-controller :preset="'warningPreset'">
-            <lc-basemap></lc-basemap>
-            <!--            <div class="barline"></div>-->
-            <lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
-        </sgis-layer-controller>
-        <monitor-panel></monitor-panel>
-        <top-enterprise-panel></top-enterprise-panel>
-        <tool-box-panel></tool-box-panel>
+  <div class="full-screen">
+    <popup ref="popup" @callPopup="callPopup"></popup>
+    <div id="map" ref="rootmap">
     </div>
+    <sgis-layer-controller :preset="'warningPreset'">
+      <lc-basemap></lc-basemap>
+      <!--            <div class="barline"></div>-->
+      <lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
+    </sgis-layer-controller>
+    <monitor-panel></monitor-panel>
+    <!--        <top-enterprise-panel></top-enterprise-panel>-->
+    <tool-box-panel ref="toolBox"></tool-box-panel>
+    <menu-special></menu-special>
+    <legend-panel></legend-panel>
+    <summary-sheets v-show="isShowbtn"></summary-sheets>
+    <el-button id="mapbtn" type="primary" icon="el-icon-c-scale-to-original" circle @click="isshowhidden"></el-button>
+  </div>
 </template>
 
 <script>
@@ -22,23 +26,30 @@
 import LcBasemap from '@components/LayerController/modules/LcBaseMap'
 import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
 import MonitorPanel from '@components/panel/RightSearchPanel'
-import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+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 LegendPanel from '@components/panel/LegendPanel'
 
 export default {
   name: 'MapTemplate',
   components: {
+    LegendPanel,
+    MenuSpecial,
     ToolBoxPanel,
-    TopEnterprisePanel,
+    // TopEnterprisePanel,
     SgisLayerController,
     MonitorPanel,
     LcBasemap,
     LcServiceLayer,
-    Popup
+    Popup,
+    summarySheets
   },
   data () {
     return {
+      isShowbtn: false,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -47,8 +58,8 @@
     }
   },
   computed: {
-    mapConfig () {
-      return this.$store.state.map.mapConfig
+    config () {
+      return this.$store.state.map.config
     }
   },
   beforeMount () {
@@ -57,6 +68,9 @@
     })
   },
   methods: {
+    isshowhidden () {
+      this.isShowbtn = !this.isShowbtn
+    },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -69,15 +83,17 @@
     init () {
       const mapcontainer = this.$refs.rootmap
       this.map = Sgis.initMap(mapcontainer)
+      this.$refs.toolBox.map = this.map
 
       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)
+      console.log('-------' + this.$refs.popup.$el)
+      this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
 
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
-      this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+      this.vectorLayerHelper.initVectorLayers(this.config)
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -127,23 +143,23 @@
 
 <style lang="less">
 
-    .full-screen {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        padding: 0;
-        position: absolute;
+.full-screen {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  position: absolute;
 
-        #map {
-            height: 100%;
-            width: 100%;
-        }
+  #map {
+    height: 100%;
+    width: 100%;
+  }
 
-        .barline {
-            //width: 100%;
-            //height: 1px;
-            //background-color: #0661AE;
-            border-top: 1px solid #0661AE;
-        }
-    }
-</style>>
+  .barline {
+    //width: 100%;
+    //height: 1px;
+    //background-color: #0661AE;
+    border-top: 1px solid #0661AE;
+  }
+}
+</style>

--
Gitblit v1.8.0