From d5581c4236cf55138effe4c20420f49c87459166 Mon Sep 17 00:00:00 2001 From: Ran_Chen <1908198662@qq.com> Date: Tue, 15 Apr 2025 11:27:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E2=80=9C=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E2=80=9D=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/views/UserManagement.vue | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue index 28a0d906..fc67c96e 100644 --- a/main/manager-web/src/views/UserManagement.vue +++ b/main/manager-web/src/views/UserManagement.vue @@ -16,7 +16,7 @@
+ :header-cell-class-name="headerCellClassName"> @@ -101,7 +101,6 @@ export default { currentPage: 1, pageSize: 5, total: 0, - tableMaxHeight: 410, isAllSelected: false }; }, @@ -361,6 +360,7 @@ export default { background: linear-gradient(to bottom right, #dce8ff, #e4eeff, #e6cbfd) center; -webkit-background-size: cover; -o-background-size: cover; + overflow: hidden; } .main-wrapper { @@ -368,6 +368,7 @@ export default { border-radius: 15px; min-height: calc(100vh - 350px); height: auto; + max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); position: relative; background: rgba(237, 242, 255, 0.5); @@ -419,12 +420,18 @@ export default { min-width: 600px; overflow-x: auto; background-color: white; + display: flex; + flex-direction: column; } .user-card { background: white; border: none; box-shadow: none; + display: flex; + flex-direction: column; + flex: 1; + overflow: hidden; } .table_bottom { @@ -556,6 +563,19 @@ export default { :deep(.transparent-table) { background: white; + flex: 1; + width: 100%; + display: flex; + flex-direction: column; + .el-table__body-wrapper { + flex: 1; + overflow: auto; + max-height: none !important; + } + + .el-table__header-wrapper { + flex-shrink: 0; + } .el-table__header th { background: white !important; @@ -653,4 +673,14 @@ export default { } } +.el-table { + --table-max-height: calc(100vh - 400px); + max-height: var(--table-max-height); + + .el-table__body-wrapper { + max-height: calc(var(--table-max-height) - 40px); + } +} + + From eafd131a223ac3902c9acdadf806f17c18660f91 Mon Sep 17 00:00:00 2001 From: Ran_Chen <1908198662@qq.com> Date: Tue, 15 Apr 2025 16:25:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=9C=E6=A8=A1=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E2=80=9D=E5=93=8D=E5=BA=94=E9=80=82=E9=85=8D=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89=E5=9B=BE=E6=A0=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4bottom=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/views/ModelConfig.vue | 217 ++++++++++-------- .../src/views/ParamsManagement.vue | 32 ++- main/manager-web/src/views/UserManagement.vue | 55 +++-- 3 files changed, 193 insertions(+), 111 deletions(-) diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index fea419a0..f9d46d9d 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -43,49 +43,49 @@
- - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + +
{{ isAllSelected ? @@ -121,6 +121,7 @@ 共{{ total }}条记录
+
@@ -153,7 +154,7 @@ export default { modelList: [], pageSizeOptions: [5, 10, 20, 50, 100], currentPage: 1, - pageSize: 5, + pageSize: 10, total: 0, selectedModels: [], isAllSelected: false @@ -165,7 +166,6 @@ export default { }, computed: { - modelTypeText() { const map = { vad: '语言活动检测模型(VAD)', @@ -177,8 +177,6 @@ export default { } return map[this.activeTab] || '模型配置' }, - - pageCount() { return Math.ceil(this.total / this.pageSize); }, @@ -200,6 +198,11 @@ export default { }, methods: { + handlePageSizeChange(val) { + this.pageSize = val; + this.currentPage = 1; + this.loadData(); + }, openTtsDialog(row) { this.selectedTtsModelId = row.id; this.ttsDialogVisible = true; @@ -212,7 +215,8 @@ export default { }, handleMenuSelect(index) { this.activeTab = index; - this.currentPage = 1; + this.currentPage = 1; // 重置到第一页 + this.pageSize = 10; // 可选：重置每页条数 this.loadData(); }, handleSearch() { @@ -457,7 +461,9 @@ export default { .main-wrapper { margin: 5px 22px; border-radius: 15px; - min-height: 600px; + min-height: calc(100vh - 235px); + height: auto; + max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); position: relative; background: rgba(237, 242, 255, 0.5); @@ -475,12 +481,6 @@ export default { margin: 0; } -.right-operations { - display: flex; - gap: 10px; - margin-left: auto; -} - .content-panel { flex: 1; display: flex; @@ -553,17 +553,10 @@ export default { padding: 24px; height: 100%; min-width: 600px; - overflow-x: auto; + overflow: hidden; background-color: white; - -} - -.title-bar { display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 24px; - flex-wrap: nowrap; + flex-direction: column; } .action-group { @@ -594,6 +587,48 @@ export default { transition: border-color 0.2s; } +::v-deep .page-size-select{ + width: 100px; + margin-right: 8px; +} + +::v-deep .page-size-select .el-input__inner{ + height: 32px; + line-height: 32px; + border-radius: 4px; + border: 1px solid #e4e7ed; + background: #dee7ff; + color: #606266; + font-size: 14px; +} +::v-deep .page-size-select .el-input__suffix{ + right: 6px; + width: 15px; + height: 20px; + display: flex; + justify-content: center; + align-items: center; + top: 6px; + border-radius: 4px; +} + +::v-deep .page-size-select .el-input__suffix-inner{ + display: flex; + align-items: center; + justify-content: center; + width: 100%; +} +::v-deep .page-size-select .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; +} + ::v-deep .search-input .el-input__inner:focus { border-color: #6b8cff; outline: none; @@ -633,6 +668,9 @@ export default { align-items: center; padding: 16px 0; width: 100%; + flex-shrink: 0; + min-height: 60px; + background: white; } .batch-actions { @@ -640,12 +678,6 @@ export default { gap: 8px; } -.title-wrapper { - display: flex; - align-items: center; - gap: 8px; -} - .batch-actions .el-button { min-width: 72px; height: 32px; @@ -697,11 +729,6 @@ export default { background-color: transparent !important; } -.pagination-container { - display: flex; - justify-content: flex-end; -} - ::v-deep .el-table .custom-selection-header .cell .el-checkbox__inner { display: none !important; } @@ -802,7 +829,6 @@ export default { display: flex; align-items: center; gap: 8px; - margin-top: 15px; /* 导航按钮样式 (首页、上一页、下一页) */ .pagination-btn:first-child, @@ -865,23 +891,32 @@ export default { } } -.page-size-select { - width: 100px; - margin-right: 8px; +.model-card{ + background: white; + flex: 1; + display: flex; + flex-direction: column; + border: none; + box-shadow: none; + overflow: hidden; +} - :deep(.el-input__inner) { - height: 32px; - line-height: 32px; - border-radius: 4px; - border: 1px solid #e4e7ed; - background: #dee7ff; - color: #606266; - font-size: 14px; - } +.model-card ::v-deep .el-card__body{ + padding: 0; + display: flex; + flex-direction: column; + flex: 1; + overflow: hidden; +} - :deep(.el-input__suffix) { - line-height: 32px; - } +.data-table { + --table-max-height: calc(100vh - 450px); + max-height: var(--table-max-height); +} + +.data-table ::v-deep .el-table__body-wrapper { + max-height: calc(var(--table-max-height) - 80px); + overflow-y: auto; } diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue index 7759ad0d..f6cbdf25 100644 --- a/main/manager-web/src/views/ParamsManagement.vue +++ b/main/manager-web/src/views/ParamsManagement.vue @@ -426,8 +426,7 @@ export default { .custom-pagination { display: flex; align-items: center; - gap: 8px; - margin-top: 15px; + gap: 10px; .el-select { margin-right: 8px; @@ -597,7 +596,7 @@ export default { .page-size-select { width: 100px; - margin-right: 8px; + margin-right: 10px; :deep(.el-input__inner) { height: 32px; @@ -610,7 +609,32 @@ export default { } :deep(.el-input__suffix) { - line-height: 32px; + 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; } } diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue index fc67c96e..98724513 100644 --- a/main/manager-web/src/views/UserManagement.vue +++ b/main/manager-web/src/views/UserManagement.vue @@ -50,7 +50,6 @@ 删除
-