diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 80c1aca2c..09621e172 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -1,6 +1,6 @@ /*列表table通用样式*/ .list-page { - height: 100%; + height: calc(100%); width: 100%; box-sizing: border-box; background-color: #f6f6f6; @@ -365,7 +365,10 @@ } .profile { .main-list { - height: calc(100% - 14px); + height: calc(100% + 7ncpx); + } + .top-tools { + padding: 0 20px 14px 20px; } } .operation-dropdown-text { diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index 6f46265ea..e4398c0d6 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index e49ce5577..8e1ea6270 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index e63d9c8ed..1b3977150 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index b2694c711..79c9e1409 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('./font/iconfont.woff2?t=1629166963964') format('woff2'), - url('./font/iconfont.woff?t=1629166963964') format('woff'), - url('./font/iconfont.ttf?t=1629166963964') format('truetype'); + src: url('./font/iconfont.woff2?t=1629339873183') format('woff2'), + url('./font/iconfont.woff?t=1629339873183') format('woff'), + url('./font/iconfont.ttf?t=1629339873183') format('truetype'); } .nz-icon { diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index a1d1057ad..e29bcdcf8 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1751,6 +1751,7 @@ const cn = { profile: { profile: '个人中心', close: '关闭', + enable: '启用', update: '更新', operationRecord: '操作记录', changePassword: '修改密码', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 94d796f85..3b7791e47 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1632,6 +1632,7 @@ const en = { profile: { profile: 'Profile', close: 'Close', + enable: 'Enable', update: 'Update', operationRecord: 'Operation record', changePassword: 'Change password', diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index e5c69932c..fbc7fa391 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -120,6 +120,7 @@ diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index ebb35cc94..098e5ebfd 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -213,7 +213,7 @@ export default { i18n: 'profile.profile', icon: '', id: 2, - name: 'profile', + name: 'Personal center', orderNum: 1, parentId: 1, perms: '', diff --git a/nezha-fronted/src/components/page/config/operationRecord.vue b/nezha-fronted/src/components/page/config/operationRecord.vue index e19e63c99..77bccf339 100644 --- a/nezha-fronted/src/components/page/config/operationRecord.vue +++ b/nezha-fronted/src/components/page/config/operationRecord.vue @@ -126,10 +126,10 @@ export default { position: relative; .profile-right__tabs-active { margin-right: 40px; - margin-top: 26px; margin-left: -2px; - height: 35px; + padding-top: 25px; font-size: 14px; + height: 30px; color: #666666; letter-spacing: 0; font-weight: 400; @@ -148,10 +148,10 @@ export default { } .profile-hr { position: absolute; - top: 75px; + top: 55px; width: calc(100% - 40px); height: 2px; - background-color: #E7EAED; + background-color: #eceef0; } } diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue index 8bdb11282..79e2d0683 100644 --- a/nezha-fronted/src/components/page/config/profile.vue +++ b/nezha-fronted/src/components/page/config/profile.vue @@ -7,14 +7,15 @@
{{userList.username}}2FA
-
{{userList.name}}
+
@{{userList.name}}
{{item.label}}
-
{{item.prop}}
+
{{item.prop}}
+
-
@@ -24,10 +25,22 @@
- + + + + + + + + + + + {{$t('profile.enable')}} + + {{$t('profile.close')}} - + {{$t('profile.update')}}
@@ -49,6 +62,7 @@