Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -52,7 +52,6 @@
           :data="tableData"
           tooltip-effect="dark"
           style="width: 100%"
-          max-height="676px"
           :row-key="(row) => row.id"
         >
           <el-table-column

sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue

@@ -117,7 +117,7 @@
                 size="small"
                 tooltip-effect="dark"
                 style="width: 100%"
-                max-height="650px"
+                max-height="630px"
                 border
                 :row-key="(row) => row.id"
                 @selection-change="handleSelectionChange"

sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue

@@ -55,7 +55,6 @@
           border
           tooltip-effect="dark"
           style="width: 100%"
-          max-height="676px"
           :row-key="(row) => row.id"
           @selection-change="handleSelectionChange"
         >
@@ -282,4 +281,4 @@ export default {
   //   height: 550px;
   // }
 }
-</style>
\ No newline at end of file
+</style>

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -57,7 +57,6 @@
               border
               tooltip-effect="dark"
               style="width: 100%"
-              max-height="676px"
               highlight-current-row
               reserve-selection
               :row-key="(row) => row.id"
@@ -178,7 +177,6 @@
             border
             tooltip-effect="dark"
             style="width: 100%"
-            max-height="676px"
             :row-key="(row) => row.id"
             @selection-change="handleSelectionChangeRight"
           >
@@ -607,4 +605,4 @@ export default {
   width: 59%;
   border-radius: 4px;
 }
-</style>
\ No newline at end of file
+</style>

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -58,7 +58,6 @@
             v-loading="loadingLeft"
             tooltip-effect="dark"
             style="width: 100%"
-            max-height="676px"
             :row-key="(row) => row.id"
             @selection-change="handleSelectionChange"
             ref="leftTable"
@@ -212,7 +211,6 @@
             v-loading="loadingRight"
             tooltip-effect="dark"
             style="width: 100%"
-            max-height="676px"
             :row-key="(row) => row.id"
             @selection-change="handleSelectionChangeRight"
           >

sample-form-manager-ui/admin/src/pages/system/parameter/Parameter.vue

@@ -33,7 +33,6 @@
         border
         tooltip-effect="dark"
         style="width: 100%"
-        max-height="676px"
         :row-key="(row) => row.id"
         @selection-change="handleSelectionChange"
       >
@@ -255,4 +254,4 @@ export default {
   //   height: 550px;
   // }
 }
-</style>
\ No newline at end of file
+</style>

sample-form-manager-ui/admin/src/pages/system/systemlogs/SystemLogs.vue

@@ -26,7 +26,6 @@
         border
         tooltip-effect="dark"
         style="width: 100%"
-        max-height="676px"
         :row-key="(row) => row.id"
       >
         <el-table-column
@@ -166,4 +165,4 @@ export default {
   //   height: 550px;
   // }
 }
-</style>
\ No newline at end of file
+</style>

sample-form-manager-ui/admin/src/pages/system/task/TaskSet.vue

@@ -33,7 +33,6 @@
         border
         tooltip-effect="dark"
         style="width: 100%"
-        max-height="676px"
         :row-key="(row) => row.id"
         @selection-change="handleSelectionChange"
       >
@@ -275,4 +274,4 @@ export default {
   //   height: 550px;
   // }
 }
-</style>
\ No newline at end of file
+</style>