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

fix：修改建立 termail 是规则不对的问题

Browse Source
This commit is contained in:
zhangyu
2021-05-13 21:03:16 +08:00
parent 7e5f792e6e
commit ec3f10ab69
3 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
nezha-fronted/src/components/cli/webSSH.vue
View File

@@ -220,9 +220,9 @@
<el-dialog :modal-append-to-body='false' :show-close="true" :visible.sync="customShow" @close="closeAssetCustom" class="nz-dialog" width="620px"destroy-on-close >
<div slot="title">Connect</div>
<div >
<el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules="rulesCustom" ref="customConnect" v-loading="assetLoading" class="custom">
<el-form-item :label='$t("webshell.protocol")' prop="authProtocol" @change="protocolChange">
<el-select value-key="id" popper-class="config-dropdown" v-model="customConnect.authProtocol" placeholder="" size="small" id="webshell-box-input-protocol">
<el-form label-width="120px" size="small" :model="customConnect" label-position = "top" :rules=" customConnect.authProtocol ===2 ? rulesCustom2: rulesCustom" ref="customConnect" v-loading="assetLoading" class="custom">
<el-form-item :label='$t("webshell.protocol")' prop="authProtocol">
<el-select @change="protocolChange" value-key="id" popper-class="config-dropdown" v-model="customConnect.authProtocol" placeholder="" size="small" id="webshell-box-input-protocol">
<el-option v-for="item in authProtocol" :id="'dc-principal-op-'+item.value" :key="item.value" :label="item.name" :value="item.value"></el-option>
</el-select>
</el-form-item>
@@ -244,9 +244,6 @@
v-if="customConnect.authType === 2"
:label='$t("webshell.authPriKey")'
prop="authPriKey"
:rules="[
{ required: customConnect.authType ===2, message:$t('vali date.required'), trigger: 'change'},
]"
>
<el-input v-model="customConnect.authPriKey" size="small" autocomplete="new-password"/>
</el-form-item>
@@ -259,19 +256,13 @@
<el-form-item
v-if="customConnect.authProtocol === 2"
:label='$t("webshell.authUserTip")'
prop="authUserTip"
:rules="[
{ required: customConnect.authProtocol ===2, message:$t('validate.required'), trigger: 'change'},
]">
prop="authUserTip">
<el-input v-model="customConnect.authUserTip" size="small"/>
</el-form-item>
<el-form-item
v-if="customConnect.authProtocol === 2"
:label='$t("webshell.authPinTip")'
prop="authPinTip"
:rules="[
{ required: customConnect.authProtocol ===2, message:$t('validate.required'), trigger: 'change'},
]"
>
<el-input v-model="customConnect.authPinTip" size="small"/>
</el-form-item>
@@ -429,6 +420,37 @@ export default {
// { validator: this.authPriKeyValid, trigger: 'change' }
// ]
},
rulesCustom2: {
authProtocol: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
authType: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
host: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' },
{ validator: host, trigger: 'change' }
],
port: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' },
{ validator: port, trigger: 'change' }
],
authUsername: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
authPin: [
{ required: false, message: this.$t('validate.required'), trigger: 'change' }
],
authUserTip: [
{ required: false, message: this.$t('validate.required'), trigger: 'change' }
],
authPinTip: [
{ required: false, message: this.$t('validate.required'), trigger: 'change' }
],
authPriKey: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
]
},
assetData: [],
assetLoading: false
}
@@ -889,6 +911,9 @@ export default {
this.customConnect.authPriKey = ''
this.customConnect.port = 23
}
setTimeout(()=>{
this.$refs.customConnect.clearValidate()
})
},
authTypeChange () {
if (this.customConnect.authType === 1) {

2
nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue
View File

@@ -438,7 +438,7 @@ const tooltipPieOption = {
fontSize: 14
},
top: 8,
left: 8
right: 8
},
legend: {
data: [],

5
nezha-fronted/src/components/page/dashboard/overview/overview.vue
View File

@@ -635,10 +635,10 @@ export default {
endpointOption.series[0].data = [
{ name: vm.$t('dashboard.overview.asset.ok'), value: data.asset.ok ? data.asset.ok : 0 },
{ name: vm.$t('dashboard.overview.asset.alarm'), value: data.asset.alarm ? data.asset.alarm : 0 },
{ name: vm.$t('dashboard.overview.asset.total'), value: data.asset.total ? data.asset.total : 0 }
// { name: vm.$t('dashboard.overview.asset.total'), value: data.asset.total ? data.asset.total : 0 }
]
endpointOption.title.text = vm.$t('asset.asset')
endpointOption.legend.data = [vm.$t('dashboard.overview.asset.ok'), vm.$t('dashboard.overview.asset.alarm'), vm.$t('dashboard.overview.asset.total')]
endpointOption.legend.data = [vm.$t('dashboard.overview.asset.ok'), vm.$t('dashboard.overview.asset.alarm')]
prometheusOption.series[0].label.formatter = data.agent.up + ''
prometheusOption.series[0].data = [
{ name: vm.$t('config.agent.up'), value: data.agent.up ? data.agent.up : 0 },
@@ -1030,7 +1030,6 @@ export default {
<div class="legend-value legend-value-asset">
<div>${dcStat.asset.ok}</div>
<div>${dcStat.asset.alarm}</div>
<div>${dcStat.asset.total}</div>
</div>
<div class="legend-value legend-value-agent">
<div>${dcStat.agent.up}</div>