From 8792f905ede68bb1161a1c90948df937861481ad Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 18:22:08 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 0522449..850980d 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,8 +6,9 @@
</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>
@@ -22,10 +23,12 @@
import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+// import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
+ // GasTabs,
GasTable,
GasECharts,
GasVideo
@@ -50,18 +53,15 @@
<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;
@@ -82,20 +82,15 @@
}
.public-bounced-content {
- width: 100%;
- height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
.public-bounced-content-left {
- width: 48%;
- height: 400px;
+
}
.public-bounced-content-right {
- width: 48%;
- height: 400px;
}
}
--
Gitblit v1.8.0