From 930bb5973273864f63bf45d2502f11f97a3d5f9e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 02 Dec 2024 21:24:32 +0800
Subject: [PATCH] 企业详情、应急物资表格样式调整
---
src/views/companyInfo/components/rightContainer.vue | 8 ++++----
src/views/companyInfo/components/box/fireTrend.vue | 41 +++++++++--------------------------------
2 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/src/views/companyInfo/components/box/fireTrend.vue b/src/views/companyInfo/components/box/fireTrend.vue
index 75f4f5b..3f49081 100644
--- a/src/views/companyInfo/components/box/fireTrend.vue
+++ b/src/views/companyInfo/components/box/fireTrend.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-28 19:28:35
+ * @LastEditTime: 2024-12-02 21:23:17
* @FilePath: \bigScreen\src\views\companyInfo\components\box\fireTrend.vue
* @Description:
*
@@ -17,7 +17,8 @@
let image = ref(VITE_APP_BASE + 'img/mapicon/yjwz.png')
-
+const TableContent = ref(null)
+const curTableHeight = ref(0)
const loading = ref(false)
const tableData = ref([])
@@ -32,20 +33,11 @@
})
onMounted(() => {
+ curTableHeight.value = TableContent.value.offsetHeight
data.companyInfo = JSON.parse(localStorage.getItem('companyInfo'))
getLists()
})
-// 表格样式
-const tableCellStyle = ({ row, column }) => {
- return { background: "#152851", color: "#fff" }
-}
-// 表格表头样式
-const headerCellStyle = ({ }) => {
- return {
- background: "#152851",
- color: "#fff",
- }
-}
+
// 搜索条件
const formInline = reactive({
name: "",
@@ -191,7 +183,7 @@
</script>
<template>
- <div class="search-box w100 h100">
+ <div class="search-box w100 h100 flex f-d-c">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="" class="form-item-input">
<el-input v-model="formInline.name" placeholder="请输入名称" clearable style="width: 120px" />
@@ -201,11 +193,11 @@
<el-button class="reset-btn" :icon="Refresh" @click="clearBtn">重 置</el-button>
</el-form-item>
</el-form>
+
<!-- <global-search :options="options" @searchBtn="searchBtn" @resetBtn="resetBtn" ref="SeachBarCondition"></global-search> -->
- <div class="table-box">
+ <div class="table-box h0 flex-1" ref="TableContent">
<el-table empty-text="暂无数据" border :data="tableData" @row-click="rowClick" style="width: 100%"
- :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
- element-loading-background="rgba(122, 122, 122, 0.1)">
+ element-loading-background="rgba(122, 122, 122, 0.1)" :height="curTableHeight">
<el-table-column prop="name" label="名称" width="240" />
<el-table-column prop="numUnit" label="数量" />
<el-table-column prop="personInCha" label="负责人" />
@@ -225,25 +217,10 @@
color: #fff !important;
}
-.search-box {
- padding: 10px;
-
- ::v-deep .el-table__body-wrapper {
- background-color: #152851;
- }
-}
-
.reset-btn {
color: #D4E8F8;
background: #43779B;
border-color: #43779B;
-}
-
-.search-box .table-box {
- height: 700px;
- overflow: scroll;
- // 隐藏滚动条
- scrollbar-width: none;
}
/* 当表格没有数据时，修改表格的背景颜色 */
diff --git a/src/views/companyInfo/components/rightContainer.vue b/src/views/companyInfo/components/rightContainer.vue
index d8f25ee..14b8103 100644
--- a/src/views/companyInfo/components/rightContainer.vue
+++ b/src/views/companyInfo/components/rightContainer.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-10 15:27:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-08 12:25:35
+ * @LastEditTime: 2024-12-02 21:15:44
* @FilePath: \bigScreen\src\views\companyInfo\components\rightContainer.vue
* @Description:
*
@@ -29,7 +29,7 @@
<template>
<div class="right-container">
- <div class="fire-source box" v-if="state.buttonIndex == 1">
+ <div class="fire-source box h100" v-if="state.buttonIndex == 1">
<title-box>
<template #titleName>
企业信息
@@ -40,10 +40,10 @@
</div>
</div>
- <div class="occur-statistics box" v-if="state.buttonIndex == 2">
+ <div class="occur-statistics box h100" v-if="state.buttonIndex == 2">
<title-box>
<template #titleName>
- 应急物质
+ 应急物资
</template>
</title-box>
<div class="content-box">
--
Gitblit v1.9.3