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 | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 003f1dc..dab29fe 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -5,13 +5,19 @@
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
- <span>鍐呭</span>
+ <div class="public-bounced-content-left"></div>
+ <div class="public-bounced-content-right"></div>
+<!-- <span>鍐呭</span>-->
+ <popup-gas></popup-gas>
</div>
</div>
</template>
<script>
+import '@/components/BaseNav/SolidWaste/directive'
+
+import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
data () {
@@ -19,6 +25,9 @@
displayContent: [],
flag: false
}
+ },
+ components: {
+ PopupGas
},
methods: {
setData (data) {
@@ -42,7 +51,7 @@
left: 10%;
background-color: #002432;
margin: 1% auto;
- border: 1px #a5bfd8 solid;
+ border: 1px #9fc5c8 solid;
.public-bounced-title {
width: 100%;
@@ -65,5 +74,23 @@
}
}
+ .public-bounced-content {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ .public-bounced-content-left {
+ width: 48%;
+ height: 400px;
+ border: 1px red solid;
+ }
+ .public-bounced-content-right {
+ width: 48%;
+ height: 400px;
+ border: 1px red solid;
+ }
+ }
+
}
</style>
--
Gitblit v1.8.0