From 3649b8f4991af4178bea0c73e3d4bfc6c2ae4f03 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 29 三月 2021 18:09:29 +0800
Subject: [PATCH] 图层控制新的逻辑

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

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2e804f4..43c1a35 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,10 +17,8 @@
     <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="AddGasHelper" class="flue-gas">搴熸皵</el-button>
-    <popup-gas ref="FlueGas"></popup-gas>
-    <public-bouncedounced ref="PublicBounced"></public-bouncedounced>
+    <PublicBounced ref="PublicBounced"></PublicBounced>
   </div>
 </template>
 
@@ -44,10 +42,10 @@
 // import SolidContent from '@components/SolidWaste/SolidContent'
 // 搴熸皵
 import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
+// import PopupGas from '@/components/flueGas/popup-gas'
 // // 鍏叡灞曠ず鏁版嵁
-// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
-
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
 export default {
   name: 'MapTemplate',
   components: {
@@ -63,8 +61,8 @@
     Popup,
     summarySheets,
     // SolidContent,
-    PopupGas
-    // PublicBounced
+    // PopupGas,
+    PublicBounced
   },
   data () {
     return {
@@ -88,9 +86,23 @@
   },
   methods: {
     AddGasHelper () {
+      const data = {
+        companyId: 3900100145,
+        id: '',
+        monType: 2,
+        userCode: 'wenchun.deng',
+        monDuration: '',
+        epName: '',
+        secdDeptId: '',
+        contrLevel: '',
+        dataStatus: '',
+        dataFlag: '',
+        runStatus: '',
+        emissTypeId: ''
+      }
       const AddGas = new AddGasHelper({ map: this.map })
-      AddGas.requestData()
-      AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
+      AddGas.requestData(data)
+      AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
     },
     ChangeState () {
       const data = {
@@ -118,12 +130,17 @@
       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)

--
Gitblit v1.8.0