From 181c63668c5d81002fa2dd4f5312318cf81f2180 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 15:50:44 +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, 7 insertions(+), 1 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ed22e56..dab29fe 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="public-bounced" v-draw v-show="flag">
+  <div class="public-bounced" v-show="flag">
     <div class="public-bounced-title">
       <span>{{ displayContent.Name }}</span>
       <i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,6 +7,8 @@
     <div class="public-bounced-content">
       <div class="public-bounced-content-left"></div>
       <div class="public-bounced-content-right"></div>
+<!--      <span>鍐呭</span>-->
+      <popup-gas></popup-gas>
     </div>
   </div>
 </template>
@@ -15,6 +17,7 @@
 
 import '@/components/BaseNav/SolidWaste/directive'
 
+import PopupGas from '@components/flueGas/popup-gas'
 export default {
   name: 'PublicBounced',
   data () {
@@ -23,6 +26,9 @@
       flag: false
     }
   },
+  components: {
+    PopupGas
+  },
   methods: {
     setData (data) {
       this.displayContent = data

--
Gitblit v1.8.0