From b89ad0355f2d466304ecc2dad86407e26aa69db4 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 22 二月 2021 18:37:47 +0800
Subject: [PATCH] 修改图层控制

---
 src/views/MapTemplate.vue |   88 +++++++++++++++++++++++---------------------
 1 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index bde308c..3ae9ff2 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,18 +1,17 @@
 <template>
-  <div class="full-screen">
-    <popup ref="popup" @callPopup="callPopup"></popup>
-    <div id="map" ref="rootmap">
+    <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>
-    <sgis-layer-controller :preset="'warningPreset'">
-      <lc-basemap></lc-basemap>
-      <!--            <div class="barline"></div>-->
-      <lc-service-layer class="barline"></lc-service-layer>
-    </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>
-    <tool-box-panel></tool-box-panel>
-  </div>
 </template>
 
 <script>
@@ -22,11 +21,11 @@
 import SgisLayerController from '@components/LayerController/LayerController'
 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/RightSearchPanel'
 import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
 import ToolBoxPanel from '@components/panel/ToolBoxPanel'
 import Popup from '@views/popup/Popup'
+
 export default {
   name: 'MapTemplate',
   components: {
@@ -36,23 +35,20 @@
     MonitorPanel,
     LcBasemap,
     LcServiceLayer,
-    LcServiceLayerFilter,
     Popup
   },
   data () {
     return {
       map: null,
+      lcServiceLayerVisible: false,
       basemapHelper: {},
       serviceLayerHelper: {},
       vectorLayerHelper: {}
     }
   },
   computed: {
-    showServiceLayerFilter () {
-      return this.$store.state.map.showServiceLayerFilter
-    },
-    mapConfig () {
-      return this.$store.state.map.mapConfig
+    config () {
+      return this.$store.state.map.config
     }
   },
   beforeMount () {
@@ -62,23 +58,26 @@
   },
   methods: {
     saveMapStatus () {
+      window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
       this.$store.commit('setBasemapHelper', this.basemapHelper)
-      this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
+      // this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
       this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper)
+
+      this.lcServiceLayerVisible = true
     },
     init () {
       const mapcontainer = this.$refs.rootmap
       this.map = Sgis.initMap(mapcontainer)
 
       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)
+      this.serviceLayerHelper.initServiceLayers(this.config)
 
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
-      this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+      this.vectorLayerHelper.initVectorLayers(this.config)
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -100,7 +99,12 @@
       var marker = L.marker([32.2221, 118.7843], {
         icon: icon
       }).addTo(this.map)
-        .bindPopup(() => this.$refs.popup.$el, { className: 's-map-popup', minWidth: 300, closeButton: false, autoClose: false })
+        .bindPopup(() => this.$refs.popup.$el, {
+          className: 's-map-popup',
+          minWidth: 300,
+          closeButton: false,
+          autoClose: false
+        })
         .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
           // permanent : true,
           offset: [0, 0], // 鍋忕Щ
@@ -123,23 +127,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;
-  }
-}
+        .barline {
+            //width: 100%;
+            //height: 1px;
+            //background-color: #0661AE;
+            border-top: 1px solid #0661AE;
+        }
+    }
 </style>>

--
Gitblit v1.8.0