Merge branch 'dev_20241202_xukangle' into develop

@@ -890,7 +890,12 @@ const formInfo = ref<any>({
 </template>
 
 <style scoped lang="scss">
-.table_tool_wrap {
+.container_wrap {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+
+  .table_tool_wrap {
     width: 100%;
     height: 50px !important;
     padding: 0 8px;
@@ -898,15 +903,15 @@ const formInfo = ref<any>({
     .tools_btns {
       padding: 0px 0 0;
     }
-}
+  }
 
-.table_panel_wrap {
+  .table_panel_wrap {
     width: 100%;
-  height: calc(100% - 270px);
+    height: calc(100% - 230px);
     padding: 0px 8px 0;
-}
+  }
 
-.list-content {
+  .list-content {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
@@ -992,5 +997,6 @@ const formInfo = ref<any>({
         // }
       }
     }
+  }
 }
 </style>

@@ -421,7 +421,7 @@ const formInfo = ref<any>({
       visible: true,
       col: 'mr8',
       style: {
-        width: 'calc(33.33% - 20px)!important'
+        width: 'calc(33.33% - 16px)!important'
       },
     },
     {

@@ -262,7 +262,7 @@ const classSearchItemList = ref<any>([
     label: '',
     field: 'damName',
     default: '',
-    placeholder: '请输入产品类型',
+    placeholder: '请输入产品名称',
     clearable: true,
     visible: true
   },
@@ -368,9 +368,10 @@ const getTableData = () => {
       .table_panel_wrap {
         margin-top: 12px;
         width: 100%;
-        height: calc(100% - 105px);
+        height: calc(100% - 65px);
         min-height: 210px;
         overflow: visible;
+
       }
     }
   }