From a96e7a6704cb34ece8835066ff9f069014062e3d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 21:32:36 +0800
Subject: [PATCH] 文件合并方法

---
 src/views/MapTemplate.vue |   69 ++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 681a454..dd708d9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,8 +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>
-    <PublicBounced ref="PublicBounced"></PublicBounced>
+    <!--    <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>
@@ -39,15 +39,12 @@
 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 AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
 import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
-// import PopupGas from '@/components/flueGas/popup-gas'
 // // 鍏叡灞曠ず鏁版嵁
 import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
 
-// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
 export default {
   name: 'MapTemplate',
   components: {
@@ -62,8 +59,6 @@
     LcServiceLayer,
     Popup,
     summarySheets,
-    // SolidContent,
-    // PopupGas,
     PublicBounced
   },
   data () {
@@ -106,17 +101,24 @@
       AddGas.requestData(data)
       AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
     },
-    ChangeState () {
+    ChangeWaterState () {
       const data = {
         companyId: 3900100145,
+        id: '',
+        monType: 1,
         userCode: 'wenchun.deng',
-        name: '',
-        marginWarr: '',
-        longDayWarr: ''
+        monDuration: '',
+        epName: '',
+        secdDeptId: '',
+        contrLevel: '',
+        dataStatus: '',
+        dataFlag: '',
+        runStatus: '',
+        emissTypeId: ''
       }
-      const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
-      AddSolidWaste.requestData(data)
-      AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
+      const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+      AddWasteWater.requestData(data)
+      AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
     },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
@@ -132,18 +134,27 @@
       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.ChangeWaterState()
 
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
@@ -206,6 +217,13 @@
   z-index: 999;
 }
 
+.Waste-water {
+  position: absolute;
+  top: 88px;
+  left: 280px;
+  z-index: 999;
+}
+
 .full-screen {
   width: 100%;
   height: 100%;
@@ -235,5 +253,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