From 8667a9680e85d428d4653d31c1b45abb0e771db9 Mon Sep 17 00:00:00 2001 From: Ran_Chen <1908198662@qq.com> Date: Wed, 16 Apr 2025 10:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/manager-web/src/views/DeviceManagement.vue | 17 +++++++++++------ main/manager-web/src/views/ModelConfig.vue | 7 +++---- main/manager-web/src/views/ParamsManagement.vue | 10 +++++----- main/manager-web/src/views/UserManagement.vue | 10 +++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue index 3574e873..ae685dc5 100644 --- a/main/manager-web/src/views/DeviceManagement.vue +++ b/main/manager-web/src/views/DeviceManagement.vue @@ -115,8 +115,8 @@ export default { activeSearchKeyword: "", currentAgentId: this.$route.query.agentId || '', currentPage: 1, - pageSize: 5, - pageSizeOptions: [5, 10, 20, 50, 100], + pageSize: 10, + pageSizeOptions: [10, 20, 50, 100], deviceList: [], loading: false, userApi: null, @@ -283,13 +283,18 @@ export default { this.deviceList = data.data.map(device => { const bindDate = new Date(device.createDate); const formattedBindTime = `${bindDate.getFullYear()}-${(bindDate.getMonth() + 1).toString().padStart(2, '0')}-${bindDate.getDate().toString().padStart(2, '0')} ${bindDate.getHours().toString().padStart(2, '0')}:${bindDate.getMinutes().toString().padStart(2, '0')}:${bindDate.getSeconds().toString().padStart(2, '0')}`; + let formattedLastConversation = ''; + if (device.lastConnectedAt) { + const lastConvoDate = new Date(device.lastConnectedAt); + formattedLastConversation = `${lastConvoDate.getFullYear()}-${(lastConvoDate.getMonth() + 1).toString().padStart(2, '0')}-${lastConvoDate.getDate().toString().padStart(2, '0')} ${lastConvoDate.getHours().toString().padStart(2, '0')}:${lastConvoDate.getMinutes().toString().padStart(2, '0')}:${lastConvoDate.getSeconds().toString().padStart(2, '0')}`; + } return { device_id: device.id, model: device.board, firmwareVersion: device.appVersion, macAddress: device.macAddress, bindTime: formattedBindTime, - lastConversation: device.lastConnectedAt, + lastConversation: formattedLastConversation, remark: device.alias, isEdit: false, otaSwitch: device.autoUpdate === 1, @@ -331,7 +336,7 @@ export default { .main-wrapper { margin: 5px 22px; border-radius: 15px; - min-height: calc(100vh - 200px); + min-height: calc(100vh - 24vh); height: auto; max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); @@ -628,12 +633,12 @@ export default { flex: 1; display: flex; flex-direction: column; - max-height: calc(100vh - 330px); + max-height: calc(100vh - 40vh); } :deep(.el-table__body-wrapper) { flex: 1; - overflow: auto; + overflow-y: auto; max-height: none !important; } diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index c635f553..dbcd2b1f 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -152,7 +152,7 @@ export default { ttsDialogVisible: false, selectedTtsModelId: '', modelList: [], - pageSizeOptions: [5, 10, 20, 50, 100], + pageSizeOptions: [10, 20, 50, 100], currentPage: 1, pageSize: 10, total: 0, @@ -461,7 +461,7 @@ export default { .main-wrapper { margin: 5px 22px; border-radius: 15px; - min-height: calc(100vh - 235px); + min-height: calc(100vh - 24vh); height: auto; max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); @@ -656,7 +656,6 @@ export default { } .table-footer { - margin-top: 24px; display: flex; justify-content: space-between; align-items: center; @@ -904,7 +903,7 @@ export default { } .data-table { - --table-max-height: calc(100vh - 450px); + --table-max-height: calc(100vh - 45vh); max-height: var(--table-max-height); } diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue index 768ab815..63d511d5 100644 --- a/main/manager-web/src/views/ParamsManagement.vue +++ b/main/manager-web/src/views/ParamsManagement.vue @@ -92,8 +92,8 @@ export default { searchCode: "", paramsList: [], currentPage: 1, - pageSize: 5, - pageSizeOptions: [5, 10, 20, 50, 100], + pageSize: 10, + pageSizeOptions: [10, 20, 50, 100], total: 0, dialogVisible: false, dialogTitle: "新增参数", @@ -330,7 +330,7 @@ export default { .main-wrapper { margin: 5px 22px; border-radius: 15px; - min-height: calc(100vh - 350px); + min-height: calc(100vh - 24vh); height: auto; max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); @@ -516,7 +516,7 @@ export default { flex-direction: column; .el-table__body-wrapper { flex: 1; - overflow: auto; + overflow-y: auto; max-height: none !important; } @@ -649,7 +649,7 @@ export default { } .el-table { - --table-max-height: calc(100vh - 400px); + --table-max-height: calc(100vh - 40vh); max-height: var(--table-max-height); .el-table__body-wrapper { diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue index 6bd0fe04..988d42a6 100644 --- a/main/manager-web/src/views/UserManagement.vue +++ b/main/manager-web/src/views/UserManagement.vue @@ -99,9 +99,9 @@ export default { currentPassword: "", searchPhone: "", userList: [], - pageSizeOptions: [5, 10, 20, 50, 100], + pageSizeOptions: [10, 20, 50, 100], currentPage: 1, - pageSize: 5, + pageSize: 10, total: 0, isAllSelected: false }; @@ -355,7 +355,7 @@ export default { .main-wrapper { margin: 5px 22px; border-radius: 15px; - min-height: calc(100vh - 350px); + min-height: calc(100vh - 24vh); height: auto; max-height: 80vh; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); @@ -557,7 +557,7 @@ export default { flex-direction: column; .el-table__body-wrapper { flex: 1; - overflow: auto; + overflow-y: auto; max-height: none !important; } @@ -674,7 +674,7 @@ export default { } .el-table { - --table-max-height: calc(100vh - 400px); + --table-max-height: calc(100vh - 40vh); max-height: var(--table-max-height); .el-table__body-wrapper {