From b1cc03bbc0b301414ce9fbaf4d19e697418bab1b Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Tue, 4 Mar 2025 02:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E8=89=BA=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/History.vue                 | 14 ++++++++------
 src/views/matrixCraft/index.vue       |  8 +++++++-
 src/views/matrixManage/matrixList.vue |  7 ++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/History.vue b/src/views/History.vue
index e8ce23e..6439de3 100644
--- a/src/views/History.vue
+++ b/src/views/History.vue
@@ -3,7 +3,7 @@
     <div class="spurt_print_btn ml-[3rem]">
       <el-button @click="onDel">删除</el-button>
     </div>
-    <div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
+    <div class="w-[90vw] ml-[2rem] mt-[2rem] h-[70vh] history_table">
       <el-table :data="tableData" stripe style="width: 100%" ref="historyTableRef">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="matrixName" label="基质名称" />
@@ -24,7 +24,7 @@
     </div>
     
   </main>
-  <footer class="footer" v-if="total">
+  <footer class="footer"  v-if="total">
     <el-pagination background layout="prev, pager, next" :total="total" />
   </footer>
 </template>
@@ -37,8 +37,6 @@
   let total = ref()
   const settingStore = useSettingStore()
   let tableData = ref<any>([])
-  let currentPage = ref(1)
-  let pageSize = ref(20)
   const defaultCraft: CraftItem = {
     id: 1,
     name: '',
@@ -75,7 +73,7 @@
           matrixInfo = JSON.parse(matrixInfo)
           item ={
             ...item,
-            ...matrixInfo
+            ...matrixInfo,
           }
         }
         list.push(item)
@@ -120,11 +118,15 @@
     display: flex;
     justify-content: end;
     position: relative;
-
+    
     .pagination{
       position: absolute;
       bottom: 0;
       right: 3rem;
     }
   }
+  .history_table{
+    height: 65vh;
+    background: #ffffff;
+  }
 </style>
\ No newline at end of file
diff --git a/src/views/matrixCraft/index.vue b/src/views/matrixCraft/index.vue
index 7e86f07..4f56af4 100644
--- a/src/views/matrixCraft/index.vue
+++ b/src/views/matrixCraft/index.vue
@@ -27,7 +27,7 @@
 
       <el-button @click="getCraftList">搜索</el-button>
     </div>
-    <div class="w-[90vw] ml-[3rem] mt-[2rem] h-[70vh]">
+    <div class="w-[90vw] ml-[2rem] mt-[2rem] h-[70vh] craft_table">
       <el-table empty-text="无数据" :data="tableData" stripe style="width: 100%" ref="craftTableRef" v-loading="loading" >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="matrixName" label="基质名称" width="100" />
@@ -263,4 +263,10 @@
       right: 3rem;
     }
   }
+
+  .craft_table{
+    height: 65vh;
+    background: #ffffff;
+  }
+
 </style>
\ No newline at end of file
diff --git a/src/views/matrixManage/matrixList.vue b/src/views/matrixManage/matrixList.vue
index b5d97b6..5dfff15 100644
--- a/src/views/matrixManage/matrixList.vue
+++ b/src/views/matrixManage/matrixList.vue
@@ -19,7 +19,7 @@
       <!-- <div v-for="(item, index) in matrixList" class="w-[8rem] h-[3rem] matrix_module" @click="toggleSelection(index)" :style="{ backgroundColor: item.isSelected ? '#65a8ff' : '#ffffff' }">
         {{ item.name }}
       </div> -->
-    <div style="padding:20px">
+    <div class="matrix_table">
       <el-table :data="matrixList" empty-text="无数据" stripe style="width: 100%;" ref="matrixTableRef" v-loading="loading">
         <el-table-column type="selection" />
         <el-table-column prop="name" label="基质名称" />
@@ -179,4 +179,9 @@
       right: 3rem;
     }
   }
+  .matrix_table{
+    padding:20px;
+    height: 65vh;
+    background: #ffffff;
+  }
 </style>
\ No newline at end of file