From 856df58ee56f3c6163bdc938b4fb7c5085ede6b5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 11 Nov 2024 18:35:09 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/supplies/components/box/dataContent.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/views/supplies/components/box/dataContent.vue b/src/views/supplies/components/box/dataContent.vue
index e5b2fa1..5ac17b0 100644
--- a/src/views/supplies/components/box/dataContent.vue
+++ b/src/views/supplies/components/box/dataContent.vue
@@ -26,7 +26,7 @@
<div class="page_box">
<div>
<el-table v-if="formInline.ownership == 1" :data="tableData" style="width: 100%"
- :header-cell-style="headerCellStyle" :cell-style="tableCellStyle" v-loading="loading">
+ :header-cell-style="headerCellStyle" :cell-style="tableCellStyle">
<el-table-column fixed prop="name" label="物资名称" />
<el-table-column fixed prop="personInCha" label="负责人" />
@@ -36,7 +36,7 @@
</el-table>
<el-table v-else :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle"
- :cell-style="tableCellStyle" v-loading="loading">
+ :cell-style="tableCellStyle">
<el-table-column fixed prop="firmName" label="企业名称" />
<el-table-column fixed prop="name" label="物资名称" />
@@ -187,26 +187,38 @@
<style lang="scss" scoped>
.content_box {
color: #fff;
- overflow: hidden;
}
.list_box {
- display: flex;
+ overflow-x: auto;
+ white-space: nowrap;
+ // scrollbar-width: thin;
+ scrollbar-color: rgba(255, 255, 255, 0.3) transparent;
}
+.list_box ul {
+ display: flex;
+ /* 使用 Flexbox 布局 */
+ padding: 0;
+ margin: 0;
+ list-style: none;
+}
-
-.list_box ul li {
- display: inline-block;
+.list_box li {
padding: 10px;
- font-size: 15px;
- text-align: center;
- // background: url(/images/mode-tab-ac.png) no-repeat center / 100% 100%;
+ margin-right: 10px;
+ cursor: pointer;
+}
+
+.list_box li.active {
+ background-color: rgba(117, 116, 116, 0.3);
+ color: white;
}
.page_box .el-table {
width: 100%;
- height: 670px;
+ height: 700px;
+ background-color: rgba(117, 116, 116, 0.3);
}
.active {
--
Gitblit v1.9.3