From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index dd708d9..5463f63 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,8 +17,8 @@
<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="AddGasHelper" class="flue-gas">搴熸皵</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>
@@ -39,6 +39,7 @@
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'
// // 鍏叡灞曠ず鏁版嵁
@@ -63,12 +64,12 @@
},
data () {
return {
- // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
@@ -135,7 +136,6 @@
this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
-
var layerFactory = new LayerFactory({
L: window.L,
map: this.map
--
Gitblit v1.8.0