From f4cf3f1acf2582b87bb7e7ca87ebc29341c9ea8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 26 三月 2024 15:38:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-table/index.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue
index d1a90d1..d52ef07 100644
--- a/src/views/screen/components/screen-table/index.vue
+++ b/src/views/screen/components/screen-table/index.vue
@@ -4,11 +4,23 @@
<el-table :data="tableData" border :height="tableHeight" :max-height="tableHeight" class="rank-table">
<el-table-column prop="name" label="鍦板尯" align="center" width="100">
</el-table-column>
- <el-table-column prop="data1" label="浜鸿劯璁惧鎬绘暟" align="center">
+ <el-table-column label="浜鸿劯璁惧" align="center">
+ <el-table-column prop="data1" label="璁惧姝ｅ父鏁�" align="center">
+ </el-table-column>
+ <el-table-column prop="data1" label="璁惧寮傚父鏁�" align="center">
+ </el-table-column>
</el-table-column>
- <el-table-column prop="data2" label="杞﹁締璁惧鎬绘暟" align="center">
+ <el-table-column label="杞﹁締璁惧" align="center">
+ <el-table-column prop="data1" label="璁惧姝ｅ父鏁�" align="center">
+ </el-table-column>
+ <el-table-column prop="data1" label="璁惧寮傚父鏁�" align="center">
+ </el-table-column>
</el-table-column>
- <el-table-column prop="data3" label="瑙嗛璁惧鎬绘暟" align="center">
+ <el-table-column label="瑙嗛璁惧" align="center">
+ <el-table-column prop="data1" label="璁惧姝ｅ父鏁�" align="center">
+ </el-table-column>
+ <el-table-column prop="data1" label="璁惧寮傚父鏁�" align="center">
+ </el-table-column>
</el-table-column>
</el-table>
</div>
@@ -87,7 +99,7 @@
.table-container {
width: 100%;
// flex: 1;
- height: 355px;
+ height: 380px;
position: relative;
background: rgba(67, 102, 155, 0.3);
border: 1px solid rgba(47, 91, 157, 0.8);
--
Gitblit v1.8.0