diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 09621e172..c381ad648 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -365,11 +365,20 @@ } .profile { .main-list { - height: calc(100% + 7ncpx); + height: calc(100% + 7px); } .top-tools { padding: 0 20px 14px 20px; } + .list-page .nz-table2 .el-table:not(.chart-table) .gutter { + position: fixed; + right: 21px; + height: 42px; + border-bottom: 1px solid #E7EAED; + background-color: white; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } } .operation-dropdown-text { display: inline-block; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 3b7791e47..79d7a3407 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -153,7 +153,7 @@ const en = { quickSilent: 'Quick silent', configEndpoint: 'Config', generate: 'Generate', - personalCenter: 'Personal center', + personalCenter: 'Profile', operationRecord: 'Operation record', changePassword: 'Change password' }, @@ -1634,7 +1634,7 @@ const en = { close: 'Close', enable: 'Enable', update: 'Update', - operationRecord: 'Operation record', + operationRecord: 'Operation log', changePassword: 'Change password', oldPassword: 'Old password', newPassword: 'New password', @@ -1645,7 +1645,7 @@ const en = { email: 'Email', mobile: 'Mobile', source: 'Source', - towFactorAuthentication: 'Tow-Factor Authentication' + twoFactorAuthentication: 'Two-Factor Authentication' }, ...enLocale } diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 789e5f4e3..2734e8376 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -237,7 +237,9 @@ - +
+ +
-
+
@@ -310,7 +312,6 @@ export default { showAllTalonOption: false, showAddressOption: true, talonShowTow: true, - talonShow: true, editAsset: {}, url: 'asset/asset', rightBox: { model: { show: false } }, diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue index d91bd6e0c..1aca53bf9 100644 --- a/nezha-fronted/src/components/page/config/operationRecord.vue +++ b/nezha-fronted/src/components/page/config/operationRecord.vue @@ -58,6 +58,7 @@ export default { url: 'sys/log', tableId: 'operationLogTable', // 需要分页的table的id,用于记录每页数量, mainTableHeight: this.$tableHeight.profileNormal, + username: sessionStorage.getItem('nz-username'), layout: [], searchMsg: { // 给搜索框子组件传递的信息 searchLabelList: [ @@ -67,12 +68,6 @@ export default { type: 'input', label: 'type', disabled: false - }, { - id: 12, - name: this.$t('config.operationlog.userId'), - type: 'input', - label: 'userId', - disabled: false }, { id: 13, name: this.$t('config.operationlog.operation'), @@ -114,7 +109,29 @@ export default { tabsActiveTow () { this.profileShow = false this.layout = [] - } + }, + getTableData (params) { + this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) + this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) + this.$set(this.searchLabel, 'userId', localStorage.getItem('nz-user-id')) + this.tools.loading = true + this.$get(this.url, { ...this.searchLabel }).then(response => { + this.tools.loading = false + if (response.code === 200) { + for (let i = 0; i < response.data.list.length; i++) { + response.data.list[i].status = response.data.list[i].status + '' + } + this.tableData = response.data.list + this.pageObj.total = response.data.total + if (!this.scrollbarWrap) { + this.$nextTick(() => { + this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper + this.toTopBtnHandler(this.scrollbarWrap) + }) + } + } + }) + }, } } diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue index 79e2d0683..c7170e96f 100644 --- a/nezha-fronted/src/components/page/config/profile.vue +++ b/nezha-fronted/src/components/page/config/profile.vue @@ -21,7 +21,7 @@
-
{{$t('profile.towFactorAuthentication')}}
+
{{$t('profile.twoFactorAuthentication')}}
@@ -127,8 +127,8 @@ export default { this.tableProfile[0].prop = this.userList.roles[0].i18n this.tableProfile[1].prop = this.userList.email this.tableProfile[2].prop = this.userList.mobile - console.log(this.tableProfile[2].prop) this.tableProfile[3].prop = this.userList.source + localStorage.setItem('nz-user-id', this.userList.id) } resolve() }) @@ -215,6 +215,10 @@ export default { height: 80px; padding-left: 15px; text-align: left; + width: 200px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; div:nth-of-type(1) { font-family: Roboto-Medium; font-size: 18px; @@ -237,6 +241,7 @@ export default { text-align: center; width: 42px; height: 24px; + line-height: 25px; margin-left: 10px; background-color: #ecf5ff; border-color: #d9ecff;