From 7966904bb2c464e0a5c134e1d0df0d1e04a747f7 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 16:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a1e01bd..9d971cd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -10,8 +10,7 @@
<el-table :data="listData" style="width: 100%" stripe='stripe'
:height="300"
tooltip-effect="dark" :row-class-name="tableRowClassName">
- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
- :label="item.label"></el-table-column>
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop" :label="item.label"></el-table-column>
</el-table>
</div>
</div>
@@ -85,7 +84,8 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- min-height: 354px;
+ //min-height: 354px;
+ height: 208px;
}
.main {
@@ -94,7 +94,7 @@
.main-table {
width: 100%;
- min-height: 195px;
+ //min-height: 195px;
//border: 1px @color solid;
video {
--
Gitblit v1.8.0