From 9f77315b5327bb5f32eacb31a69c9601a30e3800 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 17:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index aa27868..c751820 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,7 +7,7 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
- <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
<GasECharts v-else></GasECharts>
</div>
<div class="public-bounced-content-right">
@@ -19,7 +19,7 @@
<script>
-import '@/components/BaseNav/SolidWaste/directive'
+import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
@@ -54,11 +54,11 @@
<style lang="less" scoped>
.public-bounced {
+ width: 75%;
z-index: 999;
position: absolute;
- top: 50%;
- left: 50%;
- width: 60%;
+ bottom: 5%;
+ left: 15%;
background-color: #002432;
border: 1px #9fc5c8 solid;
@@ -68,7 +68,6 @@
align-items: center;
justify-content: space-between;
padding: 5px 0;
- background-color: #002433;
span {
color: #f4f7ff;
@@ -84,27 +83,19 @@
}
.public-bounced-content {
+ margin: 15px auto;
display: flex;
align-items: center;
justify-content: space-around;
- padding: 12px;
- //width: 100%;
- //height: 100%;
.public-bounced-content-left {
- //float: left;
- //display: flex;
- flex: 1;
- width: 100%;
- flex-direction: column;
- margin-right: 13px;
+ width: 48%;
+ height: 100%;
}
.public-bounced-content-right {
- width: 100%;
+ width: 48%;
height: 100%;
- //float: left;
- flex: 1;
}
}
--
Gitblit v1.8.0