From 7cb769fa01008d3ad0d5ec3cf3ad56c0156f9153 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 18:31:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 29294dc..152f458 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,8 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTable></GasTable>
+ <GasTable :displayContent="displayContent"></GasTable>
<GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -53,18 +52,14 @@
<style lang="less" scoped>
.public-bounced {
- width: 80%;
- height: 450px;
z-index: 999;
- position: absolute;
- top: 25%;
- left: 10%;
+ position: fixed;
+ top: 50%;
+ left: 50%;
background-color: #002432;
- margin: 1% auto;
border: 1px #9fc5c8 solid;
.public-bounced-title {
- width: 100%;
border: 1px #a4c0d8 solid;
display: flex;
align-items: center;
@@ -85,21 +80,14 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
display: flex;
- //align-items: center;
+ align-items: center;
justify-content: space-around;
.public-bounced-content-left {
- //flex: 1;
- width: 48%;
- height: 400px;
}
.public-bounced-content-right {
- width: 48%;
- height: 400px;
}
}
--
Gitblit v1.8.0