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 | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 3781da2..fed1e41 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,19 +6,11 @@
<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">
- <el-table
- border
- tooltip-effect="dark"
- :data="displayContentTableData"
- >
- <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="StorageType" label="浜х敓瑁呯疆"></el-table-column>
+ <div class="main-table">
+ <el-table :data="listData" style="width: 100%" stripe='stripe'
+ 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>
</div>
</div>
@@ -31,39 +23,74 @@
props: ['displayContentTable'],
data () {
return {
- displayContentTableData: []
+ listData: [],
+ listLabel: [
+ {
+ label: '搴忓彿',
+ prop: 'StoragePlaceId'
+ },
+ {
+ label: '绫诲埆',
+ prop: 'StoragePlaceTypeName'
+ },
+ {
+ label: '鍥哄簾鍚嶇О',
+ prop: 'StoragePlaceName'
+ },
+ {
+ label: '浠ｇ爜',
+ prop: 'StorageZDMJ'
+ },
+ {
+ label: '浜х敓閲�(t)',
+ prop: 'StorageZCL'
+ },
+ {
+ label: '璐瓨閲�(t)',
+ prop: 'StorageZCNL'
+ },
+ {
+ label: '浜х敓瑁呯疆',
+ prop: 'StorageType'
+ }
+ ]
}
},
mounted () {
this.$nextTick(() => {
this.displayContentTable.forEach(item => {
- this.displayContentTableData = item
- // console.log(item[0])
+ this.listData = item
})
})
+ },
+ 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);
+ //width: 6rem;
+ height: 1.5rem;
}
.main {
- width: 100%;
- height: 100%;
-
- .main-video {
+ .main-table {
width: 100%;
- min-height: 195px;
-
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
}
}
@@ -73,7 +100,7 @@
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