From 8a76767b0a7ad271c8487a02063590b956deb5df Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 25 七月 2024 14:30:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/GlassStorage/MaterialRackManagement.vue |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index e1b6d88..0f132b5 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -64,8 +64,17 @@
             <!-- <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> -->
           </template>
         </el-table-column>
-      </el-table>
 
+        
+      </el-table>
+      <el-pagination
+        v-if="totalItems > 0"
+        background
+        layout="prev, pager, next"
+        :total="totalItems"
+        :page-size="pageSize"
+        @current-change="handleCurrentChange"
+      ></el-pagination>
 
       
   </el-dialog>
@@ -256,6 +265,17 @@
    
 
     const Hidden = ref(false)
+
+
+    const totalItems = ref(0);
+    totalItems.value = 10;
+    const pageSize = 10;
+    let currentPage = ref(1);
+    const handleCurrentChange = (val) => {
+
+      currentPage.value = val;
+      
+    };
 
    const getTagType2 =(status) => {
       switch (status) {
@@ -555,17 +575,13 @@
 </script>
 
 <style scoped>
-html, body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  overflow: hidden; /* 绂佹鍑虹幇婊氬姩鏉� */
-}
 
-.app-container {
 
-  flex-direction: column;
-  height: 100vh; /* 浣跨敤瑙嗗彛楂樺害 */
+#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dialog-footer{
+  text-align: center;
+  margin-top: -15px;
 }
 
 

--
Gitblit v1.8.0