From 957200ba89a34071a5981680f0caf2ee3cc6adfb Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 25 三月 2021 16:31:55 +0800
Subject: [PATCH] 文件调整

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

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 5e3f482..7665bb1 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,10 +11,13 @@
     <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>
-    <el-button id="mapbtn" type="primary" icon="el-icon-c-scale-to-original" circle @click="isshowhidden"></el-button>
+    <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>
   </div>
 </template>
 
@@ -30,14 +33,19 @@
 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'
+import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+// 搴曞浘涓氬姟js閫昏緫
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
 
 export default {
   name: 'MapTemplate',
   components: {
+    Enterprise,
     LegendPanel,
-    MenuSpecial,
+    // MenuSpecial,
     ToolBoxPanel,
     // TopEnterprisePanel,
     SgisLayerController,
@@ -45,11 +53,11 @@
     LcBasemap,
     LcServiceLayer,
     Popup,
-    summarySheets
+    summarySheets,
+    SolidContent
   },
   data () {
     return {
-      isShowbtn: false,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -68,8 +76,13 @@
     })
   },
   methods: {
-    isshowhidden () {
-      this.isShowbtn = !this.isShowbtn
+    ChangeState () {
+      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
+      AddSolidWaste.requestData()
+      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
+    },
+    isShowHidden () {
+      this.isShowBtn = !this.isShowBtn
     },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
@@ -94,6 +107,8 @@
 
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
+
+      this.ChangeState()
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -143,6 +158,13 @@
 
 <style lang="less">
 
+.solid-waste {
+  position: absolute;
+  top: 88px;
+  left: 88px;
+  z-index: 999;
+}
+
 .full-screen {
   width: 100%;
   height: 100%;
@@ -161,5 +183,16 @@
     //background-color: #0661AE;
     border-top: 1px solid #0661AE;
   }
+
+  #map-btn {
+    position: fixed;
+    top: 20px;
+    left: 100px;
+    z-index: 9999;
+  }
+
+  .leaflet-custom-icon {
+    background: white;
+  }
 }
 </style>

--
Gitblit v1.8.0