From 56790c9824bfbe2e946b02eb4a8b73525e0cb81c Mon Sep 17 00:00:00 2001
From: wl <867869915@qq.com>
Date: Thu, 11 Apr 2024 00:55:48 +0000
Subject: [PATCH] =?UTF-8?q?css=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90flex=E5=B8=83=E5=B1=80=EF=BC=8Ccss=E7=9C=8B?=
 =?UTF-8?q?=E7=9D=80=E6=9B=B4=E6=B8=85=E6=99=B0=E3=80=82=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/styles/index.scss        |  4 ----
 ruoyi-ui/src/assets/styles/ruoyi.scss        | 13 +++----------
 ruoyi-ui/src/components/Pagination/index.vue | 14 +-------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/index.scss b/ruoyi-ui/src/assets/styles/index.scss
index 2f3b9ef9c..bb87292cb 100644
--- a/ruoyi-ui/src/assets/styles/index.scss
+++ b/ruoyi-ui/src/assets/styles/index.scss
@@ -129,10 +129,6 @@ aside {
   position: relative;
 }
 
-.pagination-container {
-  margin-top: 30px;
-}
-
 .text-center {
   text-align: center
 }
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 4e298744c..c773221d1 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -117,11 +117,9 @@
 
 /** 表格布局 **/
 .pagination-container {
-  position: relative;
-  height: 25px;
-  margin-bottom: 10px;
-  margin-top: 15px;
-  padding: 10px 20px !important;
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px
 }
 
 /* tree border */
@@ -132,11 +130,6 @@
   border-radius: 4px;
 }
 
-.pagination-container .el-pagination {
-  right: 0;
-  position: absolute;
-}
-
 @media (max-width: 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {
     display: none !important;
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 1617af004..90c48f2d3 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
+  <div class="pagination-container">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"
@@ -55,16 +55,8 @@ export default {
     autoScroll: {
       type: Boolean,
       default: true
-    },
-    hidden: {
-      type: Boolean,
-      default: false
     }
   },
-  data() {
-    return {
-    };
-  },
   computed: {
     currentPage: {
       get() {
@@ -106,9 +98,5 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
-}
-.pagination-container.hidden {
-  display: none;
 }
 </style>
-- 
Gitee