From dd48001d9793e5d338d38feebee5fc44e1296005 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 15:33:24 +0800
Subject: [PATCH] 公共弹框修改 固废内容修改

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

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 0870334..f5d03d2 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,7 +16,7 @@
     <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>
@@ -42,10 +42,10 @@
 import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
 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'
+
 export default {
   name: 'MapTemplate',
   components: {
@@ -60,8 +60,6 @@
     LcServiceLayer,
     Popup,
     summarySheets,
-    // SolidContent,
-    // PopupGas,
     PublicBounced
   },
   data () {
@@ -85,6 +83,18 @@
     })
   },
   methods: {
+    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)
+    },
     AddGasHelper () {
       const data = {
         companyId: 3900100145,
@@ -103,18 +113,6 @@
       const AddGas = new AddGasHelper({ map: this.map })
       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)
     },
     ChangeWaterState () {
       const data = {
@@ -135,9 +133,6 @@
       AddWasteWater.requestData(data)
       AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
     },
-    // isShowHidden () {
-    //   this.isShowBtn = !this.isShowBtn
-    // },
     saveMapStatus () {
       window.serviceLayerHelper = this.serviceLayerHelper
       this.$store.commit('setMapObj', this.map)
@@ -153,7 +148,11 @@
       this.$refs.toolBox.map = this.map
 
       window.popupComp = this.$refs.popup
-      var layerFactory = new LayerFactory({ L: window.L, map: this.map })
+
+      var layerFactory = new LayerFactory({
+        L: window.L,
+        map: this.map
+      })
       layerFactory.init()
       window.layerFactory = layerFactory
 
@@ -167,7 +166,7 @@
       this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
       this.vectorLayerHelper.initVectorLayers(this.config)
 
-      // this.ChangeState()
+      this.ChangeState()
       // this.AddGasHelper()
       // this.ChangeWaterState()
 

--
Gitblit v1.8.0