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

NEZ-592 fix: 数据中心细节问题修复

Browse Source
This commit is contained in:
@changcode
2021-04-30 12:59:36 +08:00
parent 3f348e3624
commit d5e7761695
12 changed files with 254 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/bottomBox/bottomBox.vue
View File

@@ -171,12 +171,12 @@ export default {
},
dc: {
cabinet: [
{ prop: 'asset', name: this.$t('asset.assets'), active: false },
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: true }
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: true },
{ prop: 'asset', name: this.$t('asset.assets'), active: false }
],
asset: [
{ prop: 'asset', name: this.$t('asset.assets'), active: true },
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false }
{ prop: 'cabinet', name: this.$t('config.dc.cabinets'), active: false },
{ prop: 'asset', name: this.$t('asset.assets'), active: true }
]
}

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -691,7 +691,7 @@ const en = {
area: 'Area',
dcName: 'Data center name',
selectArea: 'Select area',
cabinetNum: 'Cabinet number',
cabinetNum: 'Cabinet',
assets: 'Assets',
remark: 'Remark',
cabinets: 'Cabinets',

3
nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue
View File

@@ -170,7 +170,6 @@ export default {
this.$refs.assetTypeForm.validate((valid) => {
if (valid) {
if (this.editAssetType.id) {
console.log(this.editAssetType);
this.$put(this.url, this.editAssetType).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
@@ -198,7 +197,6 @@ export default {
})
},
selectWalk (walk) {
console.log(walk);
if (this.editModule.walk.indexOf(walk) != -1) {
this.editModule.walk.splice(this.editModule.walk.indexOf(walk), 1)
} else {
@@ -208,7 +206,6 @@ export default {
assetType(){
this.$get('asset/typeConf').then(res => {
this.assetTypeList = res.data.list
console.log(this.assetTypeList);
})
}
}

3
nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
View File

@@ -125,7 +125,6 @@ export default {
this.$refs.modelForm.validate((valid) => {
if (valid) {
if (this.editModel.id) {
console.log(this.editModel)
this.$put(this.url, this.editModel).then(res => {
this.prevent_opt.save = false
if (res.code === 200) {
@@ -170,7 +169,6 @@ export default {
}
},
selectWalk (walk) {
console.log(walk)
if (this.editModule.walk.indexOf(walk) != -1) {
this.editModule.walk.splice(this.editModule.walk.indexOf(walk), 1)
} else {
@@ -191,7 +189,6 @@ export default {
/* 获取chart列表数据 */
ChartTemplateList () {
this.$get('visual/panel/chart', { pageSize: -1, varType: 1, panelId: 0 }).then(res => {
console.log(res)
this.chartlList = res.data.list
})
}

40
nezha-fronted/src/components/common/rightBox/agentBox.vue
View File

@@ -1,23 +1,17 @@
<template>
<div v-clickoutside="{obj:editPromServer,func:clickOutside}" class="right-box right-box-prom">
<!-- begin--顶部按钮-->
<div class="right-box-top-btns right-box-form-delete">
<button v-if="editPromServer.id" id="promServer-edit-del" v-has="'prom_delete'" class="nz-btn nz-btn-size-normal nz-btn-size-alien"
type="button"
@click="del">
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
<span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
</button>
</div>
<!-- end--顶部按钮-->
<!-- begin--标题-->
<div class="right-box__header">
<div class="right-box__header">{{editPromServer.id ? ($t("config.promServer.editProm") + " ID：" + editPromServer.id) : $t("config.promServer.createProm")}}</div>
<div class="header__operation">
<span v-cancel="{obj: editPromServer, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div>
</div>
<!-- end--标题-->
<!-- begin--表单-->
<div class="right-box__container">
<el-form ref="promServerForm" :model="editPromServer" :rules="rules" class="right-box-form right-box-form-left" label-position = "top" label-width="120px">
<div class="container__form">
<el-form ref="promServerForm" :model="editPromServer" :rules="rules" label-position = "top" label-width="120px">
<!--DC-->
<el-form-item :label="$t('config.dc.dc')" prop="dc.name">
<div class="right-box-form-content">
@@ -39,15 +33,15 @@
</el-form-item>
<!--type-->
<el-form-item :label="$t('config.promServer.type')" prop="type">
<!-- <el-cascader-->
<!-- id="prom-box-input-type"-->
<!-- style="width: 100%"-->
<!-- v-model="editPromServer.type"-->
<!-- placeholder=""-->
<!-- size="small"-->
<!-- :options="$CONSTANTS.promServer.theData"-->
<!-- :props="{ multiple: false, checkStrictly: false ,emitPath:false}"-->
<!-- clearable></el-cascader>-->
<!-- <el-cascader-->
<!-- id="prom-box-input-type"-->
<!-- style="width: 100%"-->
<!-- v-model="editPromServer.type"-->
<!-- placeholder=""-->
<!-- size="small"-->
<!-- :options="$CONSTANTS.promServer.theData"-->
<!-- :props="{ multiple: false, checkStrictly: false ,emitPath:false}"-->
<!-- clearable></el-cascader>-->
<el-select v-model="editPromServer.type" :disabled="editPromServer.id != null&& editPromServer.id != ''" placeholder="" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" size="small" value-key="value">
<el-option v-for="item in agent2.theData" :key="item.value" :label="item.label" :value="item.value" :disabled="federationEnabled && item.value == 2">
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
@@ -61,6 +55,8 @@
</el-form-item>
</el-form>
</div>
</div>
<!-- end--表单-->
<!--底部按钮-->
<div class="right-box-bottom-btns">

21
nezha-fronted/src/components/common/rightBox/dcBox.vue
View File

@@ -1,21 +1,16 @@
<template>
<div class="right-box right-box-dc" v-clickoutside="{obj:editDc,func:clickOutside}">
<!-- begin--顶部按钮-->
<div class="right-box-top-btns right-box-form-delete">
<button @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien" id="dc-del" type="button" v-has="'dc_delete'" v-if="editDc.id">
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
<span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
</button>
</div>
<!-- end--顶部按钮-->
<!-- begin--标题-->
<div class="right-box__header">
<div class="right-box__header">{{editDc.id ? ($t("config.dc.editDc") + " ID：" + editDc.id) : $t("config.dc.createDc")}}</div>
<!-- end--标题-->
<div class="header__operation">
<span v-cancel="{obj: editDc, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div>
</div>
<!-- begin--表单-->
<div class="right-box__container">
<el-form class="right-box-form right-box-form-left" label-width="120px" size="small" :model="editDc" label-position = "top" :rules="rules" ref="dcForm">
<div class="container__form">
<el-form label-width="120px" size="small" :model="editDc" label-position = "top" :rules="rules" ref="dcForm">
<el-form-item :label='$t("overall.name")' prop="name">
<el-input placeholder="" maxlength="64" show-word-limit v-model="editDc.name" size="small" id="dc-box-input-name"></el-input>
</el-form-item>
@@ -52,9 +47,9 @@
>
</el-switch>
</el-form-item>
</el-form>
</div>
</div>
<!--底部按钮-->
<div class="right-box-bottom-btns">

24
nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
View File

@@ -1,25 +1,18 @@
<template>
<div v-clickoutside="{obj:editExprTemp,func:clickOutside}" class="right-box right-box-alert-config">
<!-- begin--顶部按钮-->
<div class="right-box-top-btns right-box-form-delete">
<button v-if="editExprTemp.id" id="alert-box-del" v-has="'alert_silence_delete'" class="nz-btn nz-btn-size-normal nz-btn-size-alien"
type="button" @click="del">
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
<span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
</button>
</div>
<!-- end--顶部按钮-->
<!-- begin--标题-->
<div class="right-box__header">
<div class="right-box__header">{{editExprTemp.id ? $t("config.exprTemp.edit") + " ID：" + editExprTemp.id :
$t("config.exprTemp.create")}}
</div>
<!-- end--标题-->
<div class="header__operation">
<span v-cancel="{obj: editExprTemp, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div>
</div>
<!-- begin--表单-->
<div class="right-box__container">
<el-form ref="ExprTempForm" :model="editExprTemp" :rules="rules"
class="right-box-form right-box-form-left" label-position="top" label-width="120px">
<div class="container__form">
<el-form ref="ExprTempForm" :model="editExprTemp" :rules="rules" label-position="top" label-width="120px">
<el-form-item :label="$t('config.exprTemp.name')" prop="name">
<el-input v-model="editExprTemp.name" :placeholder="$t('overall.placeHolder')" size="small"></el-input>
</el-form-item>
@@ -59,10 +52,9 @@
></el-input>
</el-form-item>
</el-form>
</div>
</div>
<!-- end--表单-->
<!--底部按钮-->
<div class="right-box-bottom-btns">
<button id="alert-box-esc" v-cancel="{obj:editExprTemp,func:esc}"

20
nezha-fronted/src/components/common/rightBox/mibBox.vue
View File

@@ -1,21 +1,16 @@
<template>
<div class="right-box right-box-mib" v-clickoutside="{obj:editMib,func:clickOutside}" >
<!-- begin--顶部按钮-->
<div class="right-box-top-btns right-box-form-delete">
<button @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien" id="mib-del" type="button" v-has="'snmp_file_delete'" v-if="editMib.id">
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
<span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
</button>
</div>
<!-- end--顶部按钮-->
<!-- begin--标题-->
<div class="right-box__header">
<div class="right-box__header">{{editMib.id ? ($t("config.mib.editMib") + " ID：" + editMib.id) : $t("config.mib.createMib")}}</div>
<!-- end--标题-->
<div class="header__operation">
<span v-cancel="{obj: editMib, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div>
</div>
<!-- begin--表单-->
<div class="right-box__container">
<el-form class="right-box-form right-box-form-left" :model="editMib" label-position = "top" label-width="120px" :rules="rules" ref="mibForm">
<div class="container__form">
<el-form :model="editMib" label-position = "top" label-width="120px" :rules="rules" ref="mibForm">
<el-form-item :label='$t("config.mib.models")' prop="models" :rules="[{validator:checkModels,trigger:'change'}]" >
<el-cascader
id="mib-input-selected-models"
@@ -47,6 +42,7 @@
</el-form-item>
</el-form>
</div>
</div>
<!--底部按钮-->
<div class="right-box-bottom-btns">

20
nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
View File

@@ -1,21 +1,16 @@
<template>
<div class="right-box right-box-credential" v-clickoutside="{obj:editCredential,func:clickOutside}">
<!-- begin--顶部按钮-->
<div class="right-box-top-btns right-box-form-delete">
<button @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien" id="credential-del" type="button" v-has="'credential_delete'" v-if="editCredential.id">
<span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
<span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
</button>
</div>
<!-- end--顶部按钮-->
<!-- begin--标题-->
<div class="right-box__header">
<div class="right-box__header">{{editCredential.id ? ($t("config.mib.credential.edit") + " ID：" + editCredential.id) : $t("config.mib.credential.create")}}</div>
<!-- end--标题-->
<div class="header__operation">
<span v-cancel="{obj: editCredential, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
</div>
</div>
<!-- begin--表单-->
<div class="right-box__container">
<el-form class="right-box-form right-box-form-left" label-width="120px" size="small" :model="editCredential" label-position = "top" :rules="rules" ref="credentialForm">
<div class="container__form">
<el-form label-width="120px" size="small" :model="editCredential" label-position = "top" :rules="rules" ref="credentialForm">
<el-form-item :label='$t("overall.name")' prop="name">
<el-input placeholder="" maxlength="64" show-word-limit v-model="editCredential.name" size="small" id="credential-box-input-name"></el-input>
</el-form-item>
@@ -74,6 +69,7 @@
</el-form-item>
</el-form>
</div>
</div>
<!--底部按钮-->
<div class="right-box-bottom-btns">
<button v-cancel="{obj:editCredential,func:esc}" id="credential-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">

4
nezha-fronted/src/components/common/table/settings/dcTable.vue
View File

@@ -61,7 +61,7 @@
</template>
<template v-else-if="item.prop === 'assetNum'">
<span class="endpoint-num" @click="showBottomBox('asset', scope.row)">
<i class="nz-icon nz-icon-asset" :class="scope.row[item.prop]>0?'color23BF9A':'color23BF9A'"/>
<i class="nz-icon nz-icon-overview-project" :class="scope.row[item.prop]>0?'color23BF9A':'color23BF9A'"/>
{{scope.row[item.prop]}}
</span>
</template>
@@ -74,7 +74,7 @@
<template v-else-if="item.prop === 'cabinetNum'">
<span class="alert-num" @click="showBottomBox('cabinet', scope.row)">
<i class="nz-icon nz-icon-Cabinet" :class="scope.row[item.prop]>0?'color23BF9A':'colorEF7458'"/>
<i class="nz-icon nz-icon-cabinet" :class="scope.row[item.prop]>0?'color23BF9A':'colorEF7458'"/>
{{scope.row[item.prop]}}
</span>
</template>

2
nezha-fronted/src/components/page/config/mib.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="height: 100%">
<nz-data-list
v-if="showTab === 'file'"
ref="dataList"

2
nezha-fronted/src/components/page/config/snmp.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="hight: 100%">
<mib-file :show-tab="showTab" v-if="showTab == 'file'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></mib-file>
<mib-browser :show-tab="showTab" v-if="showTab == 'browser'" @changeShowTab="changeShowTab" @toFileTab="changeTab(['mib','file'],'file')" @toCredentialTab="changeTab(['mib','credentials'],'credentials')"></mib-browser>
<credentials :show-tab="showTab" v-if="showTab == 'credentials'" @changeShowTab="changeShowTab" @toFileTab="changeTab(['mib','file'],'file')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></credentials>