From 926b7b7df19001370520b7efcf49a612f9201264 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 3 Aug 2023 16:31:08 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=97=B6=EF=BC=8C=E9=80=89=E6=8B=A9=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=EF=BC=8C=E8=B5=84=E6=BA=90=E5=BA=93=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=9B=BA=E5=AE=9A=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E5=92=8C=E5=BA=95=E9=83=A8=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/SourceDialog/index.vue    | 69 ++++++++++---------
 .../ComponentList/CatalogEditForm.vue         | 15 ++--
 .../packages/assets/style/common/index.scss   |  3 +
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
index 8eca96ae..7c1bf2a2 100644
--- a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue
@@ -38,7 +38,6 @@
           </el-select>
           <el-button
             size="small"
-            style="margin-right: 20px"
             type="primary"
             @click="reSearch"
           >
@@ -52,7 +51,9 @@
           element-loading-text="加载中"
           :style="{
             display: gridComputed ? 'grid' : 'flex',
-            justifyContent: gridComputed ? 'space-around' : 'flex-start'
+            justifyContent: gridComputed ? 'space-around' : 'flex-start',
+            height: 'calc(100vh - 400px)',
+            marginBottom: '38px'
           }"
         >
           <!-- <div v-if="list.length !== 0"> -->
@@ -100,23 +101,23 @@
         >
           暂无数据
         </div>
-        <div class="footer-pagination-wrap">
-          <div class="bs-pagination">
-            <el-pagination
-              class="bs-el-pagination"
-              popper-class="bs-el-pagination"
-              background
-              layout="total, prev, pager, next, sizes"
-              :page-size="size"
-              prev-text="上一页"
-              next-text="下一页"
-              :total="totalCount"
-              :page-sizes="[10, 20, 50, 100]"
-              :current-page="current"
-              @current-change="currentChangeHandle"
-              @size-change="sizeChangeHandle"
-            />
-          </div>
+      </div>
+      <div class="footer-pagination-wrap">
+        <div class="bs-pagination">
+          <el-pagination
+            class="bs-el-pagination"
+            popper-class="bs-el-pagination"
+            background
+            layout="total, prev, pager, next, sizes"
+            :page-size="size"
+            prev-text="上一页"
+            next-text="下一页"
+            :total="totalCount"
+            :page-sizes="[10, 20, 50, 100]"
+            :current-page="current"
+            @current-change="currentChangeHandle"
+            @size-change="sizeChangeHandle"
+          />
         </div>
       </div>
     </div>
@@ -224,7 +225,11 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../assets/style/bsTheme.scss';
-
+::v-deep .el-dialog__body{
+  position: relative;
+  min-height: 500px;
+  padding: 0 16px 16px 16px !important;
+}
 .big-screen-list-wrap {
   .el-select {
     display: inline-block !important;
@@ -243,7 +248,11 @@ export default {
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    margin-bottom: 12px;
+    position: sticky;
+    top: 0px;
+    z-index: 999;
+    padding: 16px 0;
+    background-color: var(--bs-background-2);
 
     .el-input {
       width: 200px;
@@ -274,15 +283,6 @@ export default {
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
     grid-gap: 15px;
 
-    // ::v-deep .el-loading-mask {
-    //   display: flex;
-    //   align-items: center;
-    //   justify-content: center;
-    //   height: calc(100vh - 260px) !important;
-    //   z-index: 999;
-    //   top: 50px;
-    // }
-
     .big-screen-card-wrap {
       position: relative;
       height: 230px;
@@ -407,14 +407,15 @@ export default {
   .el-loading-parent--relative {
     position: unset !important;
   }
+}
 
-  .footer-pagination-wrap {
+.footer-pagination-wrap {
+    bottom: 5px;
+    right: 16px;
     width: 100%;
-    position: absolute;
     margin-top: 16px;
+    position: absolute;
   }
-}
-
 .bs-pagination {
   ::v-deep .el-input__inner {
     width: 110px !important;
diff --git a/data-room-ui/packages/ComponentList/CatalogEditForm.vue b/data-room-ui/packages/ComponentList/CatalogEditForm.vue
index 38636ef9..60cdc477 100644
--- a/data-room-ui/packages/ComponentList/CatalogEditForm.vue
+++ b/data-room-ui/packages/ComponentList/CatalogEditForm.vue
@@ -41,7 +41,7 @@
         </div>
         <el-table
           :key="randomKey"
-          max-height="450"
+          max-height="400"
           class="bs-el-table"
           :data="tableList"
         >
@@ -83,7 +83,7 @@
     </el-dialog>
     <!-- 新增或编辑目录弹窗 -->
     <el-dialog
-      :title="currentCatalog.code ? '编辑分组':'新建分组'"
+      :title="currentCatalog.code ? '编辑分组' : '新建分组'"
       :visible.sync="catalogVisible"
       custom-class="bs-el-dialog"
       width="30%"
@@ -107,9 +107,7 @@
             clearable
           />
         </el-form-item>
-        <el-form-item
-          label="排序"
-        >
+        <el-form-item label="排序">
           <el-input-number
             v-model="currentCatalog.orderNum"
             :min="0"
@@ -205,7 +203,7 @@ export default {
           this.dataList = data
           this.$emit('updateCatalogList', data)
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 新增编辑目录（点击确定）
     addOrEditCatalog () {
@@ -280,12 +278,14 @@ export default {
 @import '../assets/style/bsTheme.scss';
 .catalog-edit-wrap{
  ::v-deep .el-dialog__body{
-    min-height: 500px !important;
+    min-height: 300px !important;
   }
+
   .el-input {
     width: 200px;
     margin-right: 20px;
   }
+
   .top-search-wrap {
     display: flex;
     align-items: center;
@@ -295,6 +295,7 @@ export default {
     .el-input {
       width: 200px;
       margin-right: 20px;
+
       ::v-deep.el-input__inner {
         background-color: #151A26 !important;
       }
diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss
index 0b0bf6c1..d4d5e0ea 100644
--- a/data-room-ui/packages/assets/style/common/index.scss
+++ b/data-room-ui/packages/assets/style/common/index.scss
@@ -186,6 +186,9 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
 }
 //分页样式
 .bs-pagination {
+  .el-pagination .el-select .el-input{
+    margin: 0 10px;
+  }
   .el-pagination.is-background .btn-prev,
   .el-pagination.is-background .btn-next,
   .el-pagination.is-background .el-pager li {