diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index e8fb5f4fe..66ede2f66 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -135,3 +135,30 @@ .data-column__span:first-letter,.el-tabs__item:first-letter,.header__title:first-letter,.operation-dropdown-text:first-letter{ text-transform: capitalize; } +.personal-dropdown { + border-bottom: 1px solid #E7EAED; + padding: 0 20px; + .personal-dropdown__username { + max-width: 109px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + vertical-align: middle; + font-family: Roboto-Regular; + font-size: 15px; + color: #333333; + font-weight: 400; + } + .personal-dropdown__name { + max-width: 109px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + vertical-align: middle; + font-family: Roboto-Regular; + font-size: 14px; + color: #999999; + font-weight: 400; + padding-bottom: 10px; + } +} diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index c381ad648..97d38dd2d 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -365,14 +365,14 @@ } .profile { .main-list { - height: calc(100% + 7px); + height: calc(100% + 13px); } .top-tools { padding: 0 20px 14px 20px; } .list-page .nz-table2 .el-table:not(.chart-table) .gutter { position: fixed; - right: 21px; + right: 31px; height: 42px; border-bottom: 1px solid #E7EAED; background-color: white; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 886643e1f..1061714a6 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1766,7 +1766,7 @@ const cn = { email: 'Email', mobile: '手机', source: '来源', - twoFactorAuthentication: '双重身份验证' + twoFactorAuthentication: '双因子认证' }, ...zhLocale } diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 60a12e8ee..a4e8ddd76 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -167,6 +167,15 @@ export default { // 登录成功,记录用户名、token和lang this.authToken = res.data.authToken sessionStorage.setItem('nz-token', res.data.authToken) + this.$get('/sys/user/profile').then(response => { + if (response.code === 200) { + const userList = response.user + console.log(userList) + // 保存当前用户的 userId + localStorage.setItem('nz-user-id', userList.id) + localStorage.setItem('nz-user-name', userList.name) + } + }) if (res.data.authFlag === 1) { if (res.data.authBind === 0) { this.verifyShow = true diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index 755d754e6..0fe532552 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -44,13 +44,17 @@ -
{{username}} 
- +
{{username.substr(0, 1)}} 
+ +
+
{{username}}
+
@{{name}}
+
-
{{$t('overall.personalCenter')}}
+
{{$t('overall.personalCenter')}}
-
{{$t('overall.signOut')}}
+
{{$t('overall.signOut')}}
@@ -74,8 +78,8 @@ export default { data () { return { username: sessionStorage.getItem('nz-username'), + name: localStorage.getItem('nz-user-name'), language: localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en', - // 顶部菜单相关 createMenu: [ // 新增按钮内容 { @@ -260,7 +264,22 @@ export default { .header { display: flex; height: 50px; - + .personal-avatar { + span { + width: 32px; + height: 32px; + display: inline-block; + line-height: 32px; + background: rgba(60,146,241,0.10); + font-family: PingFangSC-Medium; + font-size: 14px; + color: #3C92F1; + letter-spacing: 0; + font-weight: 500; + text-transform: capitalize; + border-radius: 100%; + } + } .header-menu { display: flex; justify-content: flex-end; diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue index c44b174a8..f0834edc9 100644 --- a/nezha-fronted/src/components/page/config/operationRecord.vue +++ b/nezha-fronted/src/components/page/config/operationRecord.vue @@ -8,7 +8,7 @@ @search="search" :search-msg="searchMsg">