From 500416123c4db839e0b6d21a10b1b58189f30ceb Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 17:03:11 +0800
Subject: [PATCH] 修改表格echats冲突
---
src/views/MapTemplate.vue | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 3c4b0f5..9a2be67 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,14 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
+// import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+// import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
-import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
+// 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 +66,7 @@
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -80,25 +85,6 @@
})
},
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(data)
- AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
- },
ChangeState () {
const data = {
companyId: 3900100145,
@@ -111,6 +97,25 @@
AddSolidWaste.requestData(data)
AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
+ // 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(data)
+ // AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
+ // },
ChangeWaterState () {
const data = {
companyId: 3900100145,
@@ -145,7 +150,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
@@ -159,7 +168,7 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
- // this.ChangeState()
+ this.ChangeState()
// this.AddGasHelper()
// this.ChangeWaterState()
--
Gitblit v1.8.0