Преглед на файлове

fix: 新增分组,排序值添加默认值0,修改分页样式

wu.jian2 преди 1 година
родител
ревизия
5d2c97b0f2

+ 0 - 1
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"
               >

+ 2 - 1
data-room-ui/packages/BigScreenList/CatalogEditForm.vue

@@ -221,7 +221,8 @@ export default {
       this.currentCatalog = {
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       }
       this.catalogVisible = true
     },

+ 2 - 1
data-room-ui/packages/ComponentList/CatalogEditForm.vue

@@ -222,7 +222,8 @@ export default {
       this.currentCatalog = {
         name: '',
         id: '',
-        code: ''
+        code: '',
+        orderNum: 0
       }
       this.catalogVisible = true
     },

+ 4 - 2
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) {

+ 5 - 1
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;