Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -570,24 +570,25 @@ const rejectDialogBtnClick = (btn, info) => {
 <style scoped lang="scss">
 <style scoped lang="scss">
 .container_wrap {
 .container_wrap {
   padding: 0 16px;
   padding: 0 16px;
+  overflow: hidden auto;
 
 
   .table_tool_wrap {
   .table_tool_wrap {
     height: 44px;
     height: 44px;
     margin-bottom: 4px;
     margin-bottom: 4px;
   }
   }
 
 
+  .content_main_wrap {
+    height: calc(100% - 48px);
+    display: flex;
+    flex-direction: column;
+  }
+
   .table_panel_wrap {
   .table_panel_wrap {
     flex: 1;
     flex: 1;
+    height: auto;
   }
   }
 }
 }
 
 
-.content_main_wrap {
-  display: flex;
-  flex-direction: column;
-  height: calc(100% - 48px);
-
-}
-
 .table_panel {
 .table_panel {
   height: calc(100% - 44px) !important;
   height: calc(100% - 44px) !important;
 }
 }
@@ -724,15 +725,18 @@ const rejectDialogBtnClick = (btn, info) => {
 .list-content {
 .list-content {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
-  margin-bottom: 8px;
 
 
   .card-content {
   .card-content {
     width: calc(33.33% - 6px);
     width: calc(33.33% - 6px);
     padding: 16px;
     padding: 16px;
     box-shadow: 0 0 0 1px #d9d9d9;
     box-shadow: 0 0 0 1px #d9d9d9;
-    margin-right: 8px;
+    margin-bottom: 8px;
     max-width: 400px;
     max-width: 400px;
 
 
+    +.card-content {
+      margin-left: 8px;
+    }
+
     &.active {
     &.active {
       box-shadow: 0 0 0 1px var(--el-color-primary);
       box-shadow: 0 0 0 1px var(--el-color-primary);
     }
     }