From 0976a86e697f64c9193a4496df3f3fe483d6654b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 31 三月 2021 11:24:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 3c4b0f5..28deeac 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 type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>
- <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</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>
@@ -37,12 +38,9 @@
// import MenuSpecial from '@components/panel/MenuTopic'
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',
@@ -62,6 +60,7 @@
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -99,37 +98,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,
- 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)
@@ -145,7 +113,10 @@
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
@@ -158,10 +129,6 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
-
- // this.ChangeState()
- // this.AddGasHelper()
- // this.ChangeWaterState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
--
Gitblit v1.8.0