From 5d2c97b0f2a6b1a32435006cd01ab632fb4f2821 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 25 Jul 2023 11:10:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=E5=80=BC=E6=B7=BB=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC0=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BigScreenDesign/ComponentDialog/index.vue      | 1 -
 data-room-ui/packages/BigScreenList/CatalogEditForm.vue     | 3 ++-
 data-room-ui/packages/ComponentList/CatalogEditForm.vue     | 3 ++-
 data-room-ui/packages/SourceMag/SideMenu.vue                | 6 ++++--
 data-room-ui/packages/assets/style/common/index.scss        | 6 +++++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
index 63baabf7..cf16b0bf 100644
--- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
@@ -43,7 +43,6 @@
               </el-select>
               <el-button
                 size="small"
-                style="margin-right: 20px"
                 type="primary"
                 @click="reSearch"
               >
diff --git a/data-room-ui/packages/BigScreenList/CatalogEditForm.vue b/data-room-ui/packages/BigScreenList/CatalogEditForm.vue
index 89843795..a5c23229 100644
--- a/data-room-ui/packages/BigScreenList/CatalogEditForm.vue
+++ b/data-room-ui/packages/BigScreenList/CatalogEditForm.vue
@@ -221,7 +221,8 @@ export default {
       this.currentCatalog = {
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       }
       this.catalogVisible = true
     },
diff --git a/data-room-ui/packages/ComponentList/CatalogEditForm.vue b/data-room-ui/packages/ComponentList/CatalogEditForm.vue
index 1370ee0d..9f7e3967 100644
--- a/data-room-ui/packages/ComponentList/CatalogEditForm.vue
+++ b/data-room-ui/packages/ComponentList/CatalogEditForm.vue
@@ -222,7 +222,8 @@ export default {
       this.currentCatalog = {
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       }
       this.catalogVisible = true
     },
diff --git a/data-room-ui/packages/SourceMag/SideMenu.vue b/data-room-ui/packages/SourceMag/SideMenu.vue
index a5aac89f..084e6138 100644
--- a/data-room-ui/packages/SourceMag/SideMenu.vue
+++ b/data-room-ui/packages/SourceMag/SideMenu.vue
@@ -162,7 +162,8 @@ export default {
         // 选中目录
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       },
       formRules: {
         name: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }]
@@ -179,7 +180,8 @@ export default {
         // 选中目录
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       }
     },
     mouseenter (code) {
diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss
index 6ecca7d1..b14ab552 100644
--- a/data-room-ui/packages/assets/style/common/index.scss
+++ b/data-room-ui/packages/assets/style/common/index.scss
@@ -219,8 +219,12 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
   }
 
   .el-pagination {
+    padding: 0 !important;
     text-align: right !important;
     font-weight: normal !important;
+    .el-pagination__sizes{
+      margin: 0 !important;
+    }
   }
 
   .el-pager li {
@@ -274,7 +278,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
   }
 
   .el-dialog__body {
-    padding: 18px 24px !important;
+    padding: 16px !important;
     max-height: calc(90vh - 170px) !important;
     min-height: 200px;
     overflow-y: auto;