From 2a99c0727f88565eb2b8c0beeb609618413ff3b0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 09:45:45 +0800
Subject: [PATCH] 文件整合,重新分弹框

---
 src/views/MapTemplate.vue |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 59be60e..be50061 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -38,11 +38,11 @@
 // import MenuSpecial from '@components/panel/MenuTopic'
 import LegendPanel from '@components/panel/LegendPanel'
 import Enterprise from '../components/table/enterprise'
-import SolidContent from '@components/BaseNav/SolidContent'
-import WasteWaterContent from '@components/BaseNav/WasteWaterContent'
+import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
 // 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
-import AddWasteWaterHelper from '@components/BaseNav/WasteWater'
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
 
 export default {
   name: 'MapTemplate',
@@ -63,6 +63,7 @@
   },
   data () {
     return {
+      show: true,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -87,9 +88,11 @@
       AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
     },
     ChangeWaterState () {
-      const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
-      AddWasteWater.requestData()
-      AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
+      if (this.show) {
+        const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+        AddWasteWater.requestData()
+        AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
+      }
     },
     // isShowHidden () {
     //   this.isShowBtn = !this.isShowBtn
@@ -118,7 +121,8 @@
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
 
-      this.ChangeState()
+      // this.ChangeState()
+      // this.ChangeWaterState()
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -211,5 +215,16 @@
   .leaflet-custom-icon {
     background: white;
   }
+
+  .leaflet-marker-icon {
+    background: none;
+  }
+
+  #migic {
+    width: 48px;
+    height: 48px;
+    margin: -18px -20px;
+    z-index: 999;
+  }
 }
 </style>

--
Gitblit v1.8.0