From 98e7690b6bd6bbc456cca73f37421bd2686d8779 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 10 四月 2024 18:17:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-table/index.vue | 130 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 58 deletions(-)
diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue
index bb24e4c..0629df0 100644
--- a/src/views/screen/components/screen-table/index.vue
+++ b/src/views/screen/components/screen-table/index.vue
@@ -1,71 +1,81 @@
<template>
<div class="table-container">
+ <wrapper-title :title="'鍖哄煙璁惧鏁版嵁'" :path="'/monitorServe/face'"></wrapper-title>
<div class="table-content" ref="tabContent">
- <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>
+ <div class="table-wrapper">
+ <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 label="浜鸿劯璁惧姝ｅ父鐜�" align="center">
- <template slot-scope="scope">
- <el-tooltip placement="top">
- <div slot="content">
- <div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <el-table-column label="浜鸿劯璁惧姝ｅ父鐜�" align="center">
+ <template slot-scope="scope">
+ <el-tooltip placement="top">
+ <div slot="content">
+ <div class="tip-item">
+ <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-info tip-success">12</div>
+ </div>
+ <div class="tip-item">
+ <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-info tip-danger">4</div>
+ </div>
</div>
- <div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
- </div>
- </div>
- <div class="tip-num">75%</div>
- </el-tooltip>
- </template>
- </el-table-column>
+ <div class="tip-num">75%</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
- <el-table-column label="杞﹁締璁惧姝ｅ父鐜�" align="center">
- <template slot-scope="scope">
- <el-tooltip placement="top">
- <div slot="content">
- <div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <el-table-column label="杞﹁締璁惧姝ｅ父鐜�" align="center">
+ <template slot-scope="scope">
+ <el-tooltip placement="top">
+ <div slot="content">
+ <div class="tip-item">
+ <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-info tip-success">12</div>
+ </div>
+ <div class="tip-item">
+ <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-info tip-danger">4</div>
+ </div>
</div>
- <div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
- </div>
- </div>
- <div class="tip-num">75%</div>
- </el-tooltip>
- </template>
- </el-table-column>
+ <div class="tip-num">75%</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
- <el-table-column label="瑙嗛璁惧姝ｅ父鐜�" align="center">
- <template slot-scope="scope">
- <el-tooltip placement="top">
- <div slot="content">
- <div class="tip-item">
- <div class="tip-label">璁惧姝ｅ父鏁�:</div>
- <div class="tip-info tip-success">12</div>
+ <el-table-column label="瑙嗛璁惧姝ｅ父鐜�" align="center">
+ <template slot-scope="scope">
+ <el-tooltip placement="top">
+ <div slot="content">
+ <div class="tip-item">
+ <div class="tip-label">璁惧姝ｅ父鏁�:</div>
+ <div class="tip-info tip-success">12</div>
+ </div>
+ <div class="tip-item">
+ <div class="tip-label">璁惧寮傚父鏁�:</div>
+ <div class="tip-info tip-danger">4</div>
+ </div>
</div>
- <div class="tip-item">
- <div class="tip-label">璁惧寮傚父鏁�:</div>
- <div class="tip-info tip-danger">4</div>
- </div>
- </div>
- <div class="tip-num">75%</div>
- </el-tooltip>
- </template>
- </el-table-column>
- </el-table>
+ <div class="tip-num">75%</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
</div>
</template>
<script>
+import WrapperTitle from '../wrapper-title/index';
+
export default {
+ name: 'ScreenTable',
+
+ components: {
+ WrapperTitle
+ },
data() {
return {
tableHeight: 40,
@@ -137,14 +147,18 @@
// flex: 1;
height: 350px;
position: relative;
- background: rgba(67, 102, 155, 0.3);
- border: 1px solid rgba(47, 91, 157, 0.8);
+
+ display: flex;
+ flex-direction: column;
.table-content {
- position: absolute;
- width: 100%;
- top: 0;
- bottom: 0;
+ flex: 1;
+ background: rgba(67, 102, 155, 0.3);
+ border: 1px solid rgba(47, 91, 157, 0.8);
+ // position: absolute;
+ // width: 100%;
+ // top: 0;
+ // bottom: 0;
}
}
--
Gitblit v1.8.0