From 17ba6febdaacf7563f7688bae473a4a89e914ff5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:04:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index dcbaf77..c4a64c0 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -22,7 +22,6 @@
<PublicBounced ref="PublicBounced"></PublicBounced>
<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
- <popup-gas ref="FlueGas"></popup-gas>
<PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -51,7 +50,7 @@
// import SolidContent from '@components/SolidWaste/SolidContent'
// 搴熸皵
import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
+// import PopupGas from '@/components/flueGas/popup-gas'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
@@ -71,12 +70,11 @@
SolidContent,
// WasteWaterContent,
// SolidContent,
- PopupGas,
+ // PopupGas,
PublicBounced
},
data () {
return {
- show: true,
// isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
@@ -175,7 +173,6 @@
// this.ChangeState()
// this.AddGasHelper()
- // this.ChangeState()
// this.ChangeWaterState()
this.saveMapStatus()
--
Gitblit v1.8.0