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 |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 363515c..be50061 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,8 +11,15 @@
     <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></summary-sheets>
+    <enterprise></enterprise>
+    <!--    <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
+    <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>
+    <SolidContent ref="SolidWastePopup"></SolidContent>
+    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>
+    <WasteWaterContent ref="WasteWaterPopup"></WasteWaterContent>
   </div>
 </template>
 
@@ -25,14 +32,22 @@
 import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
 import MonitorPanel from '@components/panel/RightSearchPanel'
 // 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'
+import Enterprise from '../components/table/enterprise'
+import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
+// 搴曞浘涓氬姟js閫昏緫
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
 
 export default {
   name: 'MapTemplate',
   components: {
+    Enterprise,
     LegendPanel,
     // MenuSpecial,
     ToolBoxPanel,
@@ -41,10 +56,14 @@
     MonitorPanel,
     LcBasemap,
     LcServiceLayer,
-    Popup
+    Popup,
+    summarySheets,
+    SolidContent,
+    WasteWaterContent
   },
   data () {
     return {
+      show: true,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -63,6 +82,21 @@
     })
   },
   methods: {
+    ChangeState () {
+      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
+      AddSolidWaste.requestData()
+      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
+    },
+    ChangeWaterState () {
+      if (this.show) {
+        const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+        AddWasteWater.requestData()
+        AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
+      }
+    },
+    // isShowHidden () {
+    //   this.isShowBtn = !this.isShowBtn
+    // },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -81,11 +115,14 @@
       this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
 
       this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
-      console.log(this.$refs.popup.$el)
+      console.log('-------' + this.$refs.popup.$el)
       this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
 
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
+
+      // this.ChangeState()
+      // this.ChangeWaterState()
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -135,6 +172,20 @@
 
 <style lang="less">
 
+.solid-waste {
+  position: absolute;
+  top: 88px;
+  left: 88px;
+  z-index: 999;
+}
+
+.Waste-water {
+  position: absolute;
+  top: 88px;
+  left: 180px;
+  z-index: 999;
+}
+
 .full-screen {
   width: 100%;
   height: 100%;
@@ -153,5 +204,27 @@
     //background-color: #0661AE;
     border-top: 1px solid #0661AE;
   }
+
+  #map-btn {
+    position: fixed;
+    top: 20px;
+    left: 100px;
+    z-index: 9999;
+  }
+
+  .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