From de06b7c6f15c2d41e65cb953c7c746f52f738d64 Mon Sep 17 00:00:00 2001 From: likexuan Date: Mon, 20 Jun 2022 15:24:01 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1945=20feat=20:=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=B8=8B=20=E5=A2=9E=E5=8A=A0=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8F=90=E7=A4=BA=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/alert/alertLabel.scss | 6 + .../components/common/alert/alertLabel.vue | 407 +++++++++++------- .../common/mixin/alertLabelMixin.js | 1 + .../common/table/settings/userTable.vue | 30 +- .../src/components/page/config/user.vue | 25 ++ 5 files changed, 315 insertions(+), 154 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss index 6e8ebcc2d..af257817c 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss @@ -17,6 +17,12 @@ border-bottom: 1px solid $--border-color-light; //line-height: 23px; font-weight: 600; + .alert-label-fa{ + font-weight: normal; + height: 12px; + line-height: 12px; + border-radius: 10px; + } .alert-label-header-circle { height: 24px; width: 24px; diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index 3198fd10c..775e7e0dd 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -5,6 +5,24 @@ class="alert-label__border" ref="alertLabels" > + + +
+ + +
+
+
ID
+
+ {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }} +
+
+
+
{{$t('overall.name')}}
+
+ {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }} +
+
+
+
{{ $t("overall.login.name") }}
+
+ {{ alertLabelData && alertLabelData.username ? alertLabelData.username : "--" }} +
+
+
+
{{ $t("profile.role") }}
+
+ {{ alertLabelData && alertLabelData.roles ? alertLabelData.roles[0].name : "--" }} +
+
+
+
{{ $t("profile.email") }}
+
+ {{ alertLabelData && alertLabelData.email ? alertLabelData.email : "--" }} +
+
+
+
{{ $t("overall.soure") }}
+
+ {{ alertLabelData && alertLabelData.source ? alertLabelData.source : "--" }} +
+
+
+
{{ $t("config.operationlog.state") }}
+
+
+ {{ alertLabelData && alertLabelData.status === "1" ? $t("overall.enabled") : "--" }} +
+
+
+
{{ $t("config.user.language") }}
+
+ {{alertLabelData.lang === "en" ? $t("overall.english") : $t("overall.chinese") }} +
+
+ {{"--" }} +
+
+
+
{{ $t("profile.lastLoginIp") }}
+
+ {{ alertLabelData && alertLabelData.lastLoginIp ? alertLabelData.lastLoginIp : "--" }} +
+
+
+
{{ $t("profile.lastLoginTime") }}
+
+ {{ alertLabelData && alertLabelData.lastLoginTime ? alertLabelData.lastLoginTime : "--" }} +
+
+
diff --git a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js index 383fa272f..33a1da814 100644 --- a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js +++ b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js @@ -48,6 +48,7 @@ export default { case 'endpoint': case 'project': case 'dc': + case 'user': return false default: return true } diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue index 59abdb306..b52ad5baf 100644 --- a/nezha-fronted/src/components/common/table/settings/userTable.vue +++ b/nezha-fronted/src/components/common/table/settings/userTable.vue @@ -1,4 +1,5 @@