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

This commit is contained in:
likexuan
2022-07-04 14:46:16 +08:00
6 changed files with 13 additions and 6 deletions

View File

@@ -6,6 +6,9 @@
height: 100%;
width: auto;
}
.pdfDom{
padding-bottom: 20px;
}
.panel-chart {
border: 1px solid $--chart-box-border-color;
height: 100%;

View File

@@ -85,7 +85,9 @@ const newcn = {
},
overall: {
system: '系统',
back: '返回'
back: '返回',
enabled: '启用',
disabled: '已禁用'
},
...zhLocale
}

View File

@@ -93,7 +93,9 @@ const newen = {
},
overall: {
system: 'System',
back: 'Back'
back: 'Back',
enabled: 'Enabled',
disabled: 'Disabled'
},
...enLocale
}

View File

@@ -57,7 +57,7 @@
<template v-if="activeIndex === 5">
<div class="desc-text">{{$t('guide.alertTip')}}</div>
<div class="guide__btn-group">
<button :class="{'guide__btn--disabled': !hasButton('alertRule_add')}" class="guide__btn" type="button" @click="jumpAndOpen('alertRule')">{{$t('config.user.language')}}</button>
<button :class="{'guide__btn--disabled': !hasButton('alertRule_add')}" class="guide__btn" type="button" @click="jumpAndOpen('alertRule')">{{$t('overall.createAlertRule')}}</button>
</div>
</template>
</div>

View File

@@ -112,6 +112,7 @@
<button
v-if="plugins.indexOf('enable') > -1"
class="top-tool-btn"
:title="state?$t('overall.enabled'):$t('profile.close')"
@click="enableExpression"
>
<i v-if="state" class="nz-icon nz-icon-mimakejian" :title="$t('overall.visible')"></i>

File diff suppressed because one or more lines are too long