From c92dd3fca165ddd8d73d29a640ec22c89c45260f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 15:38:53 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/views/MapTemplate.vue |   83 +++++++++++++++++++++++++++++++++++------
 1 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 01277f1..08c1765 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,11 +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 v-show="isShowbtn"></summary-sheets>
+    <summary-sheets></summary-sheets>
     <enterprise></enterprise>
-    <el-button id="mapbtn" type="primary" icon="el-icon-c-scale-to-original" circle @click="isshowhidden"></el-button>
+    <!--    <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>-->
+<!--    <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>-->
+<!--    <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
+    <PublicBounced ref="PublicBounced"></PublicBounced>
   </div>
 </template>
 
@@ -31,16 +35,22 @@
 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'
+// 搴曞浘涓氬姟js閫昏緫
+// import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+// import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
+// // 鍏叡灞曠ず鏁版嵁
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
 
 export default {
   name: 'MapTemplate',
   components: {
     Enterprise,
     LegendPanel,
-    MenuSpecial,
+    // MenuSpecial,
     ToolBoxPanel,
     // TopEnterprisePanel,
     SgisLayerController,
@@ -48,11 +58,11 @@
     LcBasemap,
     LcServiceLayer,
     Popup,
-    summarySheets
+    summarySheets,
+    PublicBounced
   },
   data () {
     return {
-      isShowbtn: false,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -71,9 +81,6 @@
     })
   },
   methods: {
-    isshowhidden () {
-      this.isShowbtn = !this.isShowbtn
-    },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -88,12 +95,20 @@
       this.map = Sgis.initMap(mapcontainer)
       this.$refs.toolBox.map = this.map
 
+      window.popupComp = this.$refs.popup
+      var layerFactory = new LayerFactory({
+        L: window.L,
+        map: this.map
+      })
+      layerFactory.init()
+      window.layerFactory = layerFactory
+
       this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
       this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
 
-      this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
-      console.log('-------' + this.$refs.popup.$el)
-      this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
+      // this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
+      // 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)
@@ -145,6 +160,26 @@
 </script>
 
 <style lang="less">
+.flue-gas {
+  position: fixed;
+  top: 88px;
+  left: 180px;
+  z-index: 500;
+}
+
+.solid-waste {
+  position: absolute;
+  top: 88px;
+  left: 88px;
+  z-index: 999;
+}
+
+.Waste-water {
+  position: absolute;
+  top: 88px;
+  left: 280px;
+  z-index: 999;
+}
 
 .full-screen {
   width: 100%;
@@ -164,5 +199,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