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/components/BaseNav/PublicBounced/PublicBounced.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 003f1dc..8326dfa 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -5,13 +5,14 @@
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
- <span>鍐呭</span>
+<!-- <span>鍐呭</span>-->
+ <popup-gas></popup-gas>
</div>
</div>
</template>
<script>
-
+import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
data () {
@@ -20,6 +21,9 @@
flag: false
}
},
+ components: {
+ PopupGas
+ },
methods: {
setData (data) {
this.displayContent = data
--
Gitblit v1.8.0