From 9b4688d253fe2ab54868ba10ff5bd89051971d0c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 09:54:52 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 2a6d685..a6b9aa8 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,9 +6,8 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <el-col class="main-video">
+ <div class="main-video">
<el-table
- border
tooltip-effect="dark"
:data="data"
>
@@ -20,7 +19,7 @@
<el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
<el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
</el-table>
- </el-col>
+ </div>
</div>
</div>
</template>
@@ -34,11 +33,15 @@
data: [{
date: '2016-05-03',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ address: '涓婃捣甯傛櫘闄�鍖�'
}, {
date: '2016-05-02',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ address: '涓婃捣甯傛櫘闄�鍖�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖�'
}]
}
},
@@ -67,9 +70,8 @@
height: 100%;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
- height: 100%;
+ min-height: 195px;
video {
width: 100%;
--
Gitblit v1.8.0