From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 9ff98d3..4e750c7 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,18 +6,20 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <div class="main-video">
+ <div class="main-table">
<el-table
- border
+ stripe='stripe'
+ :height="300"
tooltip-effect="dark"
:data="displayContentTableData"
+ :row-class-name="tableRowClassName"
>
<el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>
<el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>
<el-table-column prop="StoragePlaceName" label="鍥哄簾鍚嶇О"></el-table-column>
<el-table-column prop="StorageZDMJ" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="StorageZCNL" label="浜х敓閲�"></el-table-column>
- <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�"></el-table-column>
+ <el-table-column prop="StorageZCNL" label="浜х敓閲�(t)"></el-table-column>
+ <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�(t)"></el-table-column>
<el-table-column prop="StorageType" label="浜х敓瑁呯疆"></el-table-column>
</el-table>
</div>
@@ -38,24 +40,38 @@
this.$nextTick(() => {
this.displayContentTable.forEach(item => {
this.displayContentTableData = item
- // console.log(item[0])
})
})
+ },
+ methods: {
+ tableRowClassName ({
+ row,
+ rowIndex
+ }) {
+ if (rowIndex % 2 === 0) {
+ return 'warning-row'
+ } else if (rowIndex % 2 === 1) {
+ return 'success-row'
+ }
+ return ''
+ }
}
}
</script>
<style lang="less" scoped>
+
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
+ min-height: 300px;
}
.main {
width: 100%;
height: 100%;
- .main-video {
+ .main-table {
width: 100%;
min-height: 195px;
//border: 1px @color solid;
@@ -67,13 +83,14 @@
}
}
}
+
.border_corner {
z-index: 999;
position: absolute;
width: 14px;
height: 14px;
background: rgba(0, 0, 0, 0);
- border: 1.5px solid #47d5ea;
+ border: 1px solid #47d5ea;
}
.border_corner_left_top {
--
Gitblit v1.8.0