From da2ff97717da1482d9a998074e9f1653f4de3178 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 11:19:12 +0800
Subject: [PATCH] 从新设置数据请求方式

---
 src/views/MapTemplate.vue |   61 ++++++++++++++++++------------
 1 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index c5d2668..ea2a854 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -15,8 +15,9 @@
     <legend-panel></legend-panel>
     <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="ChangeWaterState" class="Waste-water">搴熸按</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,10 +40,11 @@
 import Enterprise from '../components/table/enterprise'
 // 搴曞浘涓氬姟js閫昏緫
 import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
-import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+// 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',
@@ -62,6 +64,7 @@
   },
   data () {
     return {
+      // isShowBtn: false,
       map: null,
       lcServiceLayerVisible: false,
       basemapHelper: {},
@@ -111,25 +114,25 @@
       AddSolidWaste.requestData(data)
       AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
     },
-    ChangeWaterState () {
-      const data = {
-        companyId: 3900100145,
-        id: '',
-        monType: 1,
-        userCode: 'wenchun.deng',
-        monDuration: '',
-        epName: '',
-        secdDeptId: '',
-        contrLevel: '',
-        dataStatus: '',
-        dataFlag: '',
-        runStatus: '',
-        emissTypeId: ''
-      }
-      const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
-      AddWasteWater.requestData(data)
-      AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
-    },
+    // ChangeWaterState () {
+    //   const data = {
+    //     companyId: 3900100145,
+    //     id: '',
+    //     monType: 1,
+    //     userCode: 'wenchun.deng',
+    //     monDuration: '',
+    //     epName: '',
+    //     secdDeptId: '',
+    //     contrLevel: '',
+    //     dataStatus: '',
+    //     dataFlag: '',
+    //     runStatus: '',
+    //     emissTypeId: ''
+    //   }
+    //   const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+    //   AddWasteWater.requestData(data)
+    //   AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
+    // },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -144,17 +147,25 @@
       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.ChangeState()
       // this.AddGasHelper()
       // this.ChangeWaterState()
 

--
Gitblit v1.8.0