From f1d92a66c3d5f2c0b1625dc17f045f5f5a24e247 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 19:22:48 +0800
Subject: [PATCH] 图表

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

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 3c4b0f5..ce51726 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -15,9 +15,10 @@
     <legend-panel></legend-panel>
     <summary-sheets></summary-sheets>
     <enterprise></enterprise>
-    <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>
+    <!--    <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="AddGasHelper" class="flue-gas">搴熸皵</el-button>-->
     <PublicBounced ref="PublicBounced"></PublicBounced>
   </div>
 </template>
@@ -38,11 +39,12 @@
 import LegendPanel from '@components/panel/LegendPanel'
 import Enterprise from '../components/table/enterprise'
 // 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+
 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',
@@ -66,7 +68,8 @@
       lcServiceLayerVisible: false,
       basemapHelper: {},
       serviceLayerHelper: {},
-      vectorLayerHelper: {}
+      vectorLayerHelper: {},
+      toolBoxVisible: false
     }
   },
   computed: {
@@ -99,18 +102,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)
-    },
     ChangeWaterState () {
       const data = {
         companyId: 3900100145,
@@ -142,10 +133,12 @@
     init () {
       const mapcontainer = this.$refs.rootmap
       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 })
+      var layerFactory = new LayerFactory({
+        L: window.L,
+        map: this.map
+      })
       layerFactory.init()
       window.layerFactory = layerFactory
 
@@ -162,7 +155,7 @@
       // this.ChangeState()
       // this.AddGasHelper()
       // this.ChangeWaterState()
-
+      this.$refs.toolBox.init(this.map)
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
       // this.setBasemapHelper(this.basemapHelper)

--
Gitblit v1.8.0