From 88ea8c7defd3f24a8a3330520775ce9e84039be6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 19:39:25 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/freightManage.vue | 77 ++++++++++++---------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue
index 7fe6fba6..e907fd69 100644
--- a/src/views/basic/workplace/freightManage.vue
+++ b/src/views/basic/workplace/freightManage.vue
@@ -68,16 +68,18 @@
 
             </el-table-column>
           </el-table>
-          <el-pagination
-            style="width: 100px"
-            small
-            @current-change="handleFreightCurrentChange"
-            :current-page.sync="query.page"
-            :page-size="query.limit"
-            layout="total,prev, pager, next"
-            :total="total"
-          >
-          </el-pagination>
+          <div class="pagination-container">
+            <el-pagination
+              small
+              @current-change="handleFreightCurrentChange"
+              :current-page.sync="query.page"
+              :page-size="query.limit"
+              layout="total,prev, pager, next"
+              :total="total"
+            >
+            </el-pagination>
+          </div>
+
         </el-card>
       </div>
       <div style="width: 322px;height: 340px;margin-bottom: 10px">
@@ -114,16 +116,18 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-            style="width: 100px"
-            small
-            @current-change="handleLayerCurrentChange"
-            :current-page.sync="LayerQuery.page"
-            :page-size="LayerQuery.limit"
-            layout="prev, pager, next"
-            :total="LayerTotal"
-          >
-          </el-pagination>
+          <div class="pagination-container">
+            <el-pagination
+              small
+              @current-change="handleLayerCurrentChange"
+              :current-page.sync="LayerQuery.page"
+              :page-size="LayerQuery.limit"
+              layout="total,prev, pager, next"
+              :total="LayerTotal"
+            >
+            </el-pagination>
+          </div>
+
           <!--<pagination-->
           <!--  :total="LayerTotal"-->
           <!--  :limit.sync="LayerQuery.limit"-->
@@ -161,15 +165,20 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-            small
-            @current-change="handleQueueCurrentChange"
-            :current-page.sync="queueQuery.page"
-            :page-size="queueQuery.limit"
-            layout="prev, pager, next"
-            :total="queueTotal"
-          >
-          </el-pagination>
+          <div class="pagination-container">
+            <el-pagination
+              small
+              @current-change="handleQueueCurrentChange"
+              :current-page.sync="queueQuery.page"
+              :page-size="queueQuery.limit"
+              layout="total,prev, pager, next"
+              :total="queueTotal"
+            >
+            </el-pagination>
+
+          </div>
+
+
           <!--<el-pagination-->
           <!--  layout="prev, pager, next"-->
           <!--  style="float: right"-->
@@ -219,7 +228,7 @@ export default {
     return {
       query: {
         page: 1,
-        limit: 4,
+        limit: 5,
         workPlaceIdFk: '',
         key: ''
         // code: null,
@@ -273,14 +282,17 @@ export default {
       getLayerList(this.LayerQuery).then(res => {
         if (res.code == 20000) {
           this.layerList = res.data.list || []
+          this.LayerTotal = res.data.total
           if (this.layerList.length == 0) {
             this.queueList = []
+            this.queueTotal = 0
           } else {
             this.queueQuery.layerCode = ''
             this.queueQuery.layerCodes = this.layerList.map(item => item.code)
             this.getQueues()
           }
         } else {
+          this.LayerTotal = 0
           this.layerList = []
         }
       })
@@ -394,5 +406,8 @@ export default {
 </script>
 
 <style scoped>
-
+.pagination-container {
+  display: flex;
+  justify-content: flex-end;
+}
 </style>