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/companyInfo/components/box/fireTrend.vue |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/companyInfo/components/box/fireTrend.vue b/src/views/companyInfo/components/box/fireTrend.vue
index 0c4f447..6834d19 100644
--- a/src/views/companyInfo/components/box/fireTrend.vue
+++ b/src/views/companyInfo/components/box/fireTrend.vue
@@ -18,7 +18,7 @@
 const tableData = ref([])
 const pages = {
   page: 1,
-  pageSize: 13,
+  pageSize: 1000,
   total: 0,
 }
 
@@ -50,7 +50,7 @@
 // 提交查询
 const onSubmit = () => {
   pages.page = 1
-  pages.pageSize = 13
+  pages.pageSize = 1000
   pages.total = 0
   console.log("submit!")
   getLists(formInline)
@@ -71,13 +71,13 @@
   formInline.name = ''
   formInline.ownership = ''
   pages.page = 1
-  pages.pageSize = 13
+  pages.pageSize = 1000
   pages.total = 0
   getLists(formInline)
 }
 
 // 查询分页数据
-function getLists (param = {}) {
+function getLists(param = {}) {
   param.current = pages.page
   param.size = pages.pageSize
   param.firmId = data.companyInfo.id
@@ -109,28 +109,24 @@
       <el-form-item label="" class="form-item-input">
         <el-input v-model="formInline.name" placeholder="请输入名称" clearable style="width: 120px" />
       </el-form-item>
-      <!-- <el-form-item label="归属">
-                        <el-select v-model="formInline.ownership" placeholder="请选择" clearable style="width: 120px">
-                            <el-option label="园区" value="1" />
-                            <el-option label="企业" value="2" />
-                        </el-select>
-                    </el-form-item> -->
       <el-form-item class="search-btn">
         <el-button type="primary" @click="onSubmit">查询</el-button>
         <el-button type="primary" @click="clearBtn">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
-      v-loading="loading" element-loading-background="rgba(122, 122, 122, 0.1)">
-      <el-table-column fixed prop="name" label="名称" />
-      <el-table-column prop="numUnit" label="数量" width="100" />
-      <!-- <el-table-column prop="firmName" label="单位名称" /> -->
-      <el-table-column prop="personInCha" label="负责人" width="100" />
-    </el-table>
-    <div class="el-page">
+    <div class="table-box">
+      <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle" :cell-style="tableCellStyle"
+        v-loading="loading" element-loading-background="rgba(122, 122, 122, 0.1)">
+        <el-table-column fixed prop="name" label="名称" />
+        <el-table-column prop="numUnit" label="数量" width="100" />
+        <!-- <el-table-column prop="firmName" label="单位名称" /> -->
+        <el-table-column prop="personInCha" label="负责人" width="100" />
+      </el-table>
+    </div>
+    <!-- <div class="el-page">
       <el-pagination background layout="prev, pager, next" :page-size="pages.pageSize" :total="pages.total"
         @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -147,6 +143,13 @@
   }
 }
 
+.search-box .table-box {
+  height: 700px;
+  overflow: scroll;
+  // 隐藏滚动条
+  scrollbar-width: none;
+}
+
 /* 当表格没有数据时,修改表格的背景颜色 */
 .el-table--empty .el-table__body {
   background-color: rgba(135, 158, 199, 0.3) !important;

--
Gitblit v1.9.3