From c5218d485a29f43b648aa94f034577cc0e8fe2b3 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Thu, 24 Apr 2025 09:33:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update:=E6=B7=BB=E5=8A=A0"=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=AD"=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=86=E9=A1=B5=E5=99=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/views/OtaManagement.vue | 65 +++++++++++++++++++-
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/main/manager-web/src/views/OtaManagement.vue b/main/manager-web/src/views/OtaManagement.vue
index 13ffacf9..6af7762f 100644
--- a/main/manager-web/src/views/OtaManagement.vue
+++ b/main/manager-web/src/views/OtaManagement.vue
@@ -15,8 +15,15 @@
             <div class="content-panel">
                 <div class="content-area">
                     <el-card class="params-card" shadow="never">
-                        <el-table ref="paramsTable" :data="paramsList" class="transparent-table"
-                            :header-cell-class-name="headerCellClassName">
+                            <el-table
+                                ref="paramsTable"
+                                :data="paramsList"
+                                class="transparent-table"
+                                v-loading="loading"
+                                element-loading-text="拼命加载中"
+                                element-loading-spinner="el-icon-loading"
+                                element-loading-background="rgba(255, 255, 255, 0.7)"
+                                :header-cell-class-name="headerCellClassName">
                             <el-table-column label="选择" align="center" width="120">
                                 <template slot-scope="scope">
                                     <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -107,6 +114,7 @@ export default {
     data() {
         return {
             searchName: "",
+            loading: false,
             paramsList: [],
             firmwareList: [],
             currentPage: 1,
@@ -158,6 +166,7 @@ export default {
             this.fetchFirmwareList();
         },
         fetchFirmwareList() {
+            this.loading = true;
             const params = {
                 pageNum: this.currentPage,
                 pageSize: this.pageSize,
@@ -166,6 +175,7 @@ export default {
                 order: "desc"
             };
             Api.ota.getOtaList(params, (res) => {
+                this.loading = false;
                 res = res.data
                 if (res.code === 0) {
                     this.firmwareList = res.data.list.map(item => ({
@@ -513,7 +523,7 @@ export default {
 .custom-pagination {
     display: flex;
     align-items: center;
-    gap: 10px;
+    gap: 5px;
 
     .el-select {
         margin-right: 8px;
@@ -580,6 +590,46 @@ export default {
 
 .page-size-select {
     width: 100px;
+    margin-right: 10px;
+
+    :deep(.el-input__inner) {
+        height: 32px;
+        line-height: 32px;
+        border-radius: 4px;
+        border: 1px solid #e4e7ed;
+        background: #dee7ff;
+        color: #606266;
+        font-size: 14px;
+    }
+
+    :deep(.el-input__suffix) {
+        right: 6px;
+        width: 15px;
+        height: 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        top: 6px;
+        border-radius: 4px;
+    }
+
+    :deep(.el-input__suffix-inner) {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+    }
+
+    :deep(.el-icon-arrow-up:before) {
+        content: "";
+        display: inline-block;
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-top: 9px solid #606266;
+        position: relative;
+        transform: rotate(0deg);
+        transition: transform 0.3s;
+    }
 }
 
 .custom-selection-header {
@@ -640,4 +690,13 @@ export default {
     background-color: #5f70f3 !important;
     border-color: #5f70f3 !important;
 }
+
+:deep(.el-loading-mask) {
+    background-color: rgba(255, 255, 255, 0.6) !important;
+    backdrop-filter: blur(2px);
+}
+
+:deep(.el-loading-spinner .path) {
+    stroke: #6b8cff;
+}
 </style>

From b4e9d778959670001e148ef0fa38a431a7e49931 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Thu, 24 Apr 2025 11:21:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E4=BA=86=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=9D=A1=E7=AD=89=EF=BC=8C=E4=BD=BF=E5=85=B6?=
 =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-web/src/views/OtaManagement.vue | 75 ++++++++++++++++----
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/main/manager-web/src/views/OtaManagement.vue b/main/manager-web/src/views/OtaManagement.vue
index 6af7762f..da584510 100644
--- a/main/manager-web/src/views/OtaManagement.vue
+++ b/main/manager-web/src/views/OtaManagement.vue
@@ -470,12 +470,20 @@ export default {
 
 .params-card {
     background: white;
-    border: none;
-    box-shadow: none;
+    flex: 1;
     display: flex;
     flex-direction: column;
-    flex: 1;
+    border: none;
+    box-shadow: none;
     overflow: hidden;
+
+    ::v-deep .el-card__body {
+        padding: 15px;
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+        overflow: hidden;
+    }
 }
 
 .table_bottom {
@@ -632,19 +640,25 @@ export default {
     }
 }
 
-.custom-selection-header {
-    text-align: center !important;
-}
-
 :deep(.transparent-table) {
-    background-color: transparent;
+    background: white;
+    flex: 1;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+
+    .el-table__body-wrapper {
+        flex: 1;
+        overflow-y: auto;
+        max-height: none !important;
+    }
 
     .el-table__header-wrapper {
         flex-shrink: 0;
     }
 
     .el-table__header th {
-        background-color: white !important;
+        background: white !important;
         color: black;
         font-weight: 600;
         height: 40px;
@@ -653,10 +667,12 @@ export default {
         border-bottom: 1px solid #e4e7ed;
     }
 
-    .el-table__body-wrapper {
+    .el-table__body tr {
+        background-color: white;
+
         td {
-            background-color: transparent;
-            border-bottom: 1px solid #e4e7ed;
+            border-top: 1px solid rgba(0, 0, 0, 0.04);
+            border-bottom: 1px solid rgba(0, 0, 0, 0.04);
             padding: 8px 0;
             height: 40px;
             color: #606266;
@@ -667,6 +683,10 @@ export default {
     .el-table__row:hover>td {
         background-color: #f5f7fa !important;
     }
+
+    &::before {
+        display: none;
+    }
 }
 
 :deep(.el-table .el-button--text) {
@@ -699,4 +719,35 @@ export default {
 :deep(.el-loading-spinner .path) {
     stroke: #6b8cff;
 }
+
+.el-table {
+    --table-max-height: calc(100vh - 40vh);
+    max-height: var(--table-max-height);
+
+    .el-table__body-wrapper {
+        max-height: calc(var(--table-max-height) - 40px);
+    }
+}
+
+@media (min-width: 1144px) {
+    .table_bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 40px;
+    }
+
+    :deep(.transparent-table) {
+        .el-table__body tr {
+            td {
+                padding-top: 16px;
+                padding-bottom: 16px;
+            }
+
+            &+tr {
+                margin-top: 10px;
+            }
+        }
+    }
+}
 </style>