From ee12a1872d54fa2e40ccc85334db7afd19c641f4 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Tue, 4 Mar 2025 02:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=BA=E8=B4=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
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       |  2 +-
 src/views/matrixManage/matrixList.vue |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/History.vue b/src/views/History.vue
index 6439de3..7803234 100644
--- a/src/views/History.vue
+++ b/src/views/History.vue
@@ -3,8 +3,8 @@
     <div class="spurt_print_btn ml-[3rem]">
       <el-button @click="onDel">删除</el-button>
     </div>
-    <div class="w-[90vw] ml-[2rem] mt-[2rem] h-[70vh] history_table">
-      <el-table :data="tableData" stripe style="width: 100%" ref="historyTableRef">
+    <div class=" mt-[2rem] h-[70vh] history_table">
+      <el-table :data="tableData" stripe style="width: 100%" ref="historyTableRef" v-loading="loading">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="matrixName" label="基质名称" />
         <el-table-column prop="name" label="工艺名称"/>
@@ -17,14 +17,14 @@
         <el-table-column prop="nitrogenFlowVelocity" label="氮气流速" width="100" />
         <el-table-column prop="matrixFlowVelocity" label="基质流速" width="100" />
         <el-table-column prop="voltage" label="电压" width="100" />
-        <el-table-column prop="movementSpeed" label="移速" width="100" />
+        <el-table-column prop="movementSpeed" label="移速" width="80" />
         <el-table-column prop="space" label="行间距" width="80" />
-        <el-table-column prop="createTime" label="时间" width="200"/>
+        <el-table-column prop="createTime" label="时间" width="180"/>
       </el-table>
     </div>
     
   </main>
-  <footer class="footer"  v-if="total">
+  <footer class="footer w-[93vw]" v-if="total">
     <el-pagination background layout="prev, pager, next" :total="total" />
   </footer>
 </template>
@@ -35,6 +35,7 @@
   import type { CraftItem } from "@/services/matrix/type";
   import { ElMessage, ElMessageBox } from "element-plus";
   let total = ref()
+  const loading = ref(false)
   const settingStore = useSettingStore()
   let tableData = ref<any>([])
   const defaultCraft: CraftItem = {
@@ -64,6 +65,7 @@
       pageNum:1,
       pageSize:10,
     }
+    loading.value = true;
     getHistoryList(params).then((res:any)=>{
       
       let list = <any>[]
@@ -80,6 +82,8 @@
       })
       tableData.value = list
       total.value = res.data.total
+    }).finally(()=>{
+      loading.value = false;
     })
   }
 
diff --git a/src/views/matrixCraft/index.vue b/src/views/matrixCraft/index.vue
index 566584a..a8e7a9c 100644
--- a/src/views/matrixCraft/index.vue
+++ b/src/views/matrixCraft/index.vue
@@ -49,7 +49,7 @@
     </div>
     
   </main>
-  <footer class="footer">
+  <footer class="footer w-[93vw]">
     <el-pagination background layout="prev, pager, next" :total="total" />
   </footer>
 
diff --git a/src/views/matrixManage/matrixList.vue b/src/views/matrixManage/matrixList.vue
index c50bdcc..fcab8ad 100644
--- a/src/views/matrixManage/matrixList.vue
+++ b/src/views/matrixManage/matrixList.vue
@@ -27,7 +27,7 @@
     </div>
     <Add ref="addRef" @save="onSave"/>
   </main>
-  <footer class="footer">
+  <footer class="footer w-[93vw]">
     <el-pagination background layout="prev, pager, next" :total="totalData" />
   </footer>
 </template>
@@ -190,7 +190,7 @@
     }
   }
   .matrix_table{
-    padding:20px;
+    margin: -2rem 20px;
     height: 65vh;
     background: #ffffff;
   }