From cd80929f0ae8882a98cfe3936b2a96bded1c12d8 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index eb2bcda..fed1e41 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -8,9 +8,9 @@
<div class="main">
<div class="main-table">
<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>
@@ -84,23 +84,13 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- min-height: 300px;
+ //width: 6rem;
+ height: 1.5rem;
}
.main {
- width: 100%;
- height: 100%;
-
.main-table {
width: 100%;
- min-height: 195px;
- //border: 1px @color solid;
-
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
}
}
--
Gitblit v1.8.0