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

---
 src/views/MapTemplate.vue |   63 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 441dd80..28deeac 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,7 +16,8 @@
     <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>
+<!--    <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>
@@ -37,14 +38,10 @@
 // import MenuSpecial from '@components/panel/MenuTopic'
 import LegendPanel from '@components/panel/LegendPanel'
 import Enterprise from '../components/table/enterprise'
-// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
-// import SolidContent from '@components/SolidWaste/SolidContent'
-// 搴熸皵
-import AddGasHelper from '@components/flueGas/flueGas'
-// import PopupGas from '@/components/flueGas/popup-gas'
 // // 鍏叡灞曠ず鏁版嵁
 import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
+
 export default {
   name: 'MapTemplate',
   components: {
@@ -59,8 +56,6 @@
     LcServiceLayer,
     Popup,
     summarySheets,
-    // SolidContent,
-    // PopupGas,
     PublicBounced
   },
   data () {
@@ -103,18 +98,6 @@
       AddGas.requestData(data)
       AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
     },
-    ChangeState () {
-      const data = {
-        companyId: 3900100145,
-        userCode: 'wenchun.deng',
-        name: '',
-        marginWarr: '',
-        longDayWarr: ''
-      }
-      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
-      AddSolidWaste.requestData(data)
-      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
-    },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -129,18 +112,23 @@
       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)
-
-      // this.ChangeState()
-      // this.AddGasHelper()
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -190,15 +178,23 @@
 
 <style lang="less">
 .flue-gas {
-  position:fixed;
+  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;
 }
 
@@ -231,5 +227,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