gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source 
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
This commit is contained in:
zhangyu
2022-06-23 16:51:51 +08:00
parent acbd5016a9 8d8654a13a
commit 6403b570f5
15 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -638,7 +638,7 @@
</div>
</div>
<div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.login.name") }}</div>
<div class="alert-label-title">{{ $t("profile.username") }}</div>
<div class="alert-label-value">
{{ alertLabelData && alertLabelData.username ? alertLabelData.username : "--" }}
</div>
@@ -656,13 +656,13 @@
</div>
</div>
<div class="alert-label-box">
<div class="alert-label-title">{{ $t("overall.soure") }}</div>
<div class="alert-label-title">{{ $t("profile.source") }}</div>
<div class="alert-label-value">
{{ alertLabelData && alertLabelData.source ? alertLabelData.source : "--" }}
</div>
</div>
<div class="alert-label-box">
<div class="alert-label-title">{{ $t("config.operationlog.state") }}</div>
<div class="alert-label-title">{{ $t("overall.state") }}</div>
<div class="alert-label-value">
<div
v-if="alertLabelData"