diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 97d38dd2d..47f03e92b 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -364,12 +364,12 @@ } } .profile { - .main-list { - height: calc(100% + 13px); - } .top-tools { padding: 0 20px 14px 20px; } + .main-container { + padding: 0; + } .list-page .nz-table2 .el-table:not(.chart-table) .gutter { position: fixed; right: 31px; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 7a61b06ed..4dd84d0c1 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1648,7 +1648,7 @@ const en = { oldPassword: 'Old password', newPassword: 'New password', confirmPassword: 'Confirm password', - lastLoginIp: 'Last login Ip', + lastLoginIp: 'Last login IP', lastLoginTime: 'Last login time', role: 'Role', email: 'Email', diff --git a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue index ef473213a..c1a22c3c7 100644 --- a/nezha-fronted/src/components/common/table/settings/operationLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/operationLogTable.vue @@ -63,27 +63,32 @@ export default { }, { label: this.$t('config.operationlog.username'), prop: 'username', - show: true + show: true, + minWidth: 80 }, { label: this.$t('config.operationlog.ip'), prop: 'ip', - show: true + show: true, + minWidth: 80 }, { label: this.$t('config.operationlog.operation'), prop: 'operation', - show: true + show: true, + minWidth: 140 }, { label: this.$t('config.operationlog.type'), prop: 'type', - show: true + show: true, + minWidth: 80 }, { label: this.$t('config.operationlog.state'), prop: 'state', - show: true + show: true, + minWidth: 80 }, // { // label: this.$t('config.operationlog.userId'), @@ -93,29 +98,34 @@ export default { { label: this.$t('config.operationlog.operaId'), prop: 'operaId', - show: false + show: false, + minWidth: 140 }, { label: this.$t('config.operationlog.createDate'), prop: 'createDate', - show: true + show: true, + minWidth: 80 }, { label: this.$t('config.operationlog.time'), prop: 'time', - show: false + show: false, + minWidth: 80 }, { label: this.$t('config.operationlog.params'), prop: 'params', show: false, - ShowOverflowTooltip: true + ShowOverflowTooltip: true, + minWidth: 80 }, { label: this.$t('config.operationlog.response'), prop: 'response', show: false, - ShowOverflowTooltip: true + ShowOverflowTooltip: true, + minWidth: 140 } ] } diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue index c89c255d5..d36bb72b2 100644 --- a/nezha-fronted/src/components/page/config/operationRecord.vue +++ b/nezha-fronted/src/components/page/config/operationRecord.vue @@ -30,7 +30,7 @@ @selectionChange="selectionChange" @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"> diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue index f8a7f5d8c..cd11d9b96 100644 --- a/nezha-fronted/src/components/page/config/profile.vue +++ b/nezha-fronted/src/components/page/config/profile.vue @@ -67,9 +67,7 @@ -
- -
+ @@ -335,13 +333,13 @@ export default {