Merge branch 'dev_20241202_xukangle' into develop

@@ -890,106 +890,112 @@ const formInfo = ref<any>({
 </template>
 </template>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-.table_tool_wrap {
+.container_wrap {
   width: 100%;
   width: 100%;
-  height: 50px !important;
-  padding: 0 8px;
+  height: 100%;
+  overflow-y: auto;
 
 
-  .tools_btns {
-    padding: 0px 0 0;
+  .table_tool_wrap {
+    width: 100%;
+    height: 50px !important;
+    padding: 0 8px;
+
+    .tools_btns {
+      padding: 0px 0 0;
+    }
   }
   }
-}
 
 
-.table_panel_wrap {
-  width: 100%;
-  height: calc(100% - 270px);
-  padding: 0px 8px 0;
-}
+  .table_panel_wrap {
+    width: 100%;
+    height: calc(100% - 230px);
+    padding: 0px 8px 0;
+  }
 
 
-.list-content {
-  display: flex;
-  justify-content: flex-start;
-  flex-wrap: wrap;
-  margin-bottom: 8px;
-  padding: 0 8px;
-
-  .card-content {
-    width: 300px;
-    padding: 16px;
-    box-shadow: 0 0 0 1px #d9d9d9;
-    margin-right: 12px;
-
-    .header {
-      display: flex;
-      margin-bottom: 16px;
-
-      img {
-        width: 80px;
-        margin-right: 16px;
-      }
+  .list-content {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    margin-bottom: 8px;
+    padding: 0 8px;
 
 
-      .title {
-        font-size: 16px;
-        color: #212121;
-        font-weight: 600;
-        margin-bottom: 8px;
-      }
+    .card-content {
+      width: 300px;
+      padding: 16px;
+      box-shadow: 0 0 0 1px #d9d9d9;
+      margin-right: 12px;
 
 
-      .right-main {
-        width: calc(100% - 96px);
+      .header {
         display: flex;
         display: flex;
-        flex-direction: column;
-        justify-content: space-between;
+        margin-bottom: 16px;
 
 
-        .count-group {
+        img {
+          width: 80px;
+          margin-right: 16px;
+        }
+
+        .title {
+          font-size: 16px;
+          color: #212121;
+          font-weight: 600;
+          margin-bottom: 8px;
+        }
+
+        .right-main {
+          width: calc(100% - 96px);
           display: flex;
           display: flex;
+          flex-direction: column;
           justify-content: space-between;
           justify-content: space-between;
 
 
-          .item-num {
-            font-size: 20px;
-            font-weight: 600;
-            color: #212121;
-            margin-top: 8px;
+          .count-group {
+            display: flex;
+            justify-content: space-between;
+
+            .item-num {
+              font-size: 20px;
+              font-weight: 600;
+              color: #212121;
+              margin-top: 8px;
+            }
           }
           }
         }
         }
       }
       }
-    }
 
 
-    .operator-btn {
-      display: flex;
-      // justify-content: space-between;
-      justify-content: center;
-      align-items: center;
-      box-shadow: 0 0 0 1px #d9d9d9;
-      position: relative;
-      width: 100%;
-      height: 40px;
-      line-height: 40px;
-      background: #4fa1a4;
-      color: #fff;
-      cursor: pointer;
-      // &::after {
-      //   content: '';
-      //   width: 0;
-      //   height: 100%;
-      //   border-left: 1px solid #d9d9d9;
-      //   position: absolute;
-      //   left: 50%;
-      //   transform: translateX(-50%);
-      // }
-
-      // >.left-btn {
-      //   width: 50%;
-      //   height: 40px;
-      //   line-height: 40px;
-      //   text-align: center;
-      //   cursor: pointer;
-
-      // &:hover {
-      //   color: #4fa1a4;
-      // }
-
-      // }
+      .operator-btn {
+        display: flex;
+        // justify-content: space-between;
+        justify-content: center;
+        align-items: center;
+        box-shadow: 0 0 0 1px #d9d9d9;
+        position: relative;
+        width: 100%;
+        height: 40px;
+        line-height: 40px;
+        background: #4fa1a4;
+        color: #fff;
+        cursor: pointer;
+        // &::after {
+        //   content: '';
+        //   width: 0;
+        //   height: 100%;
+        //   border-left: 1px solid #d9d9d9;
+        //   position: absolute;
+        //   left: 50%;
+        //   transform: translateX(-50%);
+        // }
+
+        // >.left-btn {
+        //   width: 50%;
+        //   height: 40px;
+        //   line-height: 40px;
+        //   text-align: center;
+        //   cursor: pointer;
+
+        // &:hover {
+        //   color: #4fa1a4;
+        // }
+
+        // }
+      }
     }
     }
   }
   }
 }
 }

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

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