NEZ-954 feat: setting 2FA 增加提示信息

This commit is contained in:
@changcode
2021-08-31 10:08:14 +08:00
parent 2d1c87a302
commit 9d192b5546
4 changed files with 14 additions and 6 deletions

View File

@@ -1011,7 +1011,8 @@ const cn = {
scrapeTimeout: '指标抓取超时', scrapeTimeout: '指标抓取超时',
snmpTrapPort: 'SNMP trap端口', snmpTrapPort: 'SNMP trap端口',
logoTip: 'Logo支持格式为jpg、jpeg、png且大小小于2M的图片', logoTip: 'Logo支持格式为jpg、jpeg、png且大小小于2M的图片',
mfa: 'Mfa auth enable' mfa: '双因素身份认证',
TwoFactorAuthentication: '要求所有用户设置双因素身份验证'
}, },
monitor: { monitor: {
monitor: '监控', monitor: '监控',

View File

@@ -1004,7 +1004,8 @@ const en = {
scrapeTimeout: 'Scrape timeout', scrapeTimeout: 'Scrape timeout',
snmpTrapPort: 'SNMP trap port', snmpTrapPort: 'SNMP trap port',
logoTip: 'Logo format only can be jpg、jpeg、png,and less than 2M', logoTip: 'Logo format only can be jpg、jpeg、png,and less than 2M',
mfa: 'Mfa auth enable' mfa: 'Two-Factor Authentication',
TwoFactorAuthentication: 'Require all users to set up Two-factor authentication'
}, },
monitor: { monitor: {
monitor: 'Monitor', monitor: 'Monitor',

View File

@@ -82,7 +82,7 @@
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item> <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
<el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item> <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-if="!scope.row.buildIn"v-has="'alertRule_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item> <el-dropdown-item v-if="!scope.row.buildIn" v-has="'alertRule_edit'" :command="['copy', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertRule']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item> <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertRule']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>

View File

@@ -3,7 +3,7 @@
<el-tabs style="overflow: auto" type="border-card" @tab-click="selectTab" v-model="activeTab" class="system-tabs" :class="{'full-table':activeTab == 'notification'||activeTab == 'link'||activeTab == 'apiKey'}"> <el-tabs style="overflow: auto" type="border-card" @tab-click="selectTab" v-model="activeTab" class="system-tabs" :class="{'full-table':activeTab == 'notification'||activeTab == 'link'||activeTab == 'apiKey'}">
<el-tab-pane :label="$t('config.system.basic.basic')" name="basic"> <el-tab-pane :label="$t('config.system.basic.basic')" name="basic">
<div class="system-config-form basicForm" v-if="activeTab === 'basic'"> <div class="system-config-form basicForm" v-if="activeTab === 'basic'">
<el-form :model="basic" label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false"> <el-form :model="basic" label-width="260px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
<div class="system-title">{{$t('config.system.basic.title')}}</div> <div class="system-title">{{$t('config.system.basic.title')}}</div>
<!-- <el-form-item :label="$t('config.system.basic.sysLogo')" prop="system_logo">--> <!-- <el-form-item :label="$t('config.system.basic.sysLogo')" prop="system_logo">-->
<!-- <el-upload--> <!-- <el-upload-->
@@ -54,13 +54,14 @@
<el-form-item :label="$t('config.system.basic.mfa')" prop="mfa_auth_enable"> <el-form-item :label="$t('config.system.basic.mfa')" prop="mfa_auth_enable">
<el-switch v-model="basic.mfa_auth_enable" active-color="rgb(238, 157, 63)" :active-value='"1"' :inactive-value='"0"' id="system-baisc-mfs_change"> <el-switch v-model="basic.mfa_auth_enable" active-color="rgb(238, 157, 63)" :active-value='"1"' :inactive-value='"0"' id="system-baisc-mfs_change">
</el-switch> </el-switch>
<div class="el-form-item__tip">{{$t('config.system.basic.TwoFactorAuthentication')}}</div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item class="el-form-item__btn">
<!-- <button--> <!-- <button-->
<!-- @click="resetForm('basicForm','basic')" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" type="button" id="system-basic-reset"--> <!-- @click="resetForm('basicForm','basic')" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" type="button" id="system-basic-reset"-->
<!-- :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}"--> <!-- :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}"-->
<!-- >{{$t('overall.reset')}}</button>--> <!-- >{{$t('overall.reset')}}</button>-->
<button id="system-basic-save" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" type="button" v-has="'system_basic_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">{{$t('overall.submit')}}</button> <button style="margin-top: 8px;" id="system-basic-save" @click="saveSetInfo('basic','basicForm')" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" type="button" v-has="'system_basic_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">{{$t('overall.submit')}}</button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div > </div >
@@ -1132,6 +1133,11 @@ export default {
.el-tabs__nav-scroll,.el-tabs__header,el-tabs__nav-wrap{ .el-tabs__nav-scroll,.el-tabs__header,el-tabs__nav-wrap{
border-bottom: 0; border-bottom: 0;
} }
.el-form-item.el-form-item__btn.el-form-item--small {
.el-form-item__content {
margin-left: 41px !important;
}
}
.el-form-item:last-of-type { .el-form-item:last-of-type {
.el-form-item__content { .el-form-item__content {