From 8e72ebbb44dba3ec5cf6dd3cd2613e6e9aed31ef Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 22 Nov 2024 15:37:33 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/rs/components/box/dataContent.vue | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index d56a15d..4baed8a 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-13 14:54:26
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-19 17:57:39
+ * @LastEditTime: 2024-11-20 18:50:27
* @FilePath: \bigScreen\src\views\rs\components\box\dataContent.vue
* @Description:
*
@@ -167,7 +167,7 @@
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip prop="name" label="名称" />
- <el-table-column align="center" show-overflow-tooltip prop="category" label="类别" width="96" />
+ <el-table-column align="center" show-overflow-tooltip prop="category" label="类别" width="92" />
<el-table-column align="center" show-overflow-tooltip prop="mainProduct" label="主要产品" width="112" />
<el-table-column align="center" width="62" label="操作">
<template #default="scope">
@@ -197,14 +197,5 @@
.table-content {
flex-basis: auto;
height: calc(100% - 40px);
-}
-
-.el-page {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 100%;
- height: 40px;
- line-height: 40px;
}
</style>
--
Gitblit v1.9.3