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

fix:account 配置秘钥由文件改为文本类型 & 导入导出下载模板补充提交

Browse Source
This commit is contained in:
bsdbc
2020-02-27 09:23:37 +08:00
parent d5f41c9ad0
commit 058eddd575
7 changed files with 111 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,7 +330,7 @@ const en = {
host: 'Host',//'Host'
assetState: 'State',//'状态'
assetPing: 'Ping',
modules: 'Module',//'组件'
modules: 'Endpoint',//'组件'
alerts: 'Alert message',//'告警信息'
dataCenter: 'DC',//DC
cabinet: 'Cabinet',//'机柜'

217
nezha-fronted/src/components/common/rightBox/assetBox.vue
View File

@@ -301,7 +301,8 @@
<!------------------------------------------IDC---------------------------------------------->
<el-form-item :label="this.$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
<template v-if="!tabView">
<el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" class="right-box-row-with-btn" placeholder="">
<!-- <el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" class="right-box-row-with-btn" placeholder="">-->
<el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" placeholder="">
<el-option
:id="'asset-edit-idc-op-'+item.id"
v-for="item in IDCOptionData"
@@ -310,21 +311,21 @@
:value="item.id"
>
<span class="config-dropdown-label-txt">{{ item.name }}</span>
<div class="config-dropdown-label-icons">
<span class="config-dropdown-btn config-dropdown-btn-delete"
@click.stop="deleteData('idc',item.id)" :id="'asset-edit-idc-op-del-'+item.id"><i
class="el-icon-delete"></i></span>
<idc-config-box :post-idc="popIdcData" placement="left" @after="getIDCOptionData" :button-class="'config-dropdown-btn'">
<template v-slot:optionZone>
<i class="nz-icon nz-icon-edit" @click="getSingleIDCData(item.id,'edit', item)"></i>
</template>
</idc-config-box>
</div>
<!-- <div class="config-dropdown-label-icons">-->
<!-- <span class="config-dropdown-btn config-dropdown-btn-delete"-->
<!-- @click.stop="deleteData('idc',item.id)" :id="'asset-edit-idc-op-del-'+item.id"><i-->
<!-- class="el-icon-delete"></i></span>-->
<!-- <idc-config-box :post-idc="popIdcData" placement="left" @after="getIDCOptionData" :button-class="'config-dropdown-btn'">-->
<!-- <template v-slot:optionZone>-->
<!-- <i class="nz-icon nz-icon-edit" @click="getSingleIDCData(item.id,'edit', item)"></i>-->
<!-- </template>-->
<!-- </idc-config-box>-->
<!-- </div>-->
</el-option>
</el-select>
<div class="right-box-row-btn right-box-row-btn-small">
<idc-config-box placement="left" @after="getIDCOptionData"></idc-config-box>
</div>
<!-- <div class="right-box-row-btn right-box-row-btn-small">-->
<!-- <idc-config-box placement="left" @after="getIDCOptionData"></idc-config-box>-->
<!-- </div>-->
</template>
<span v-if="tabView">{{assetViewData.idcName}}</span>
</el-form-item>
@@ -343,7 +344,8 @@
<!------------------------------------------cabinet---------------------------------------------->
<el-form-item :label="$t('asset.createAssetTab.cabinet')" class="right-box-form-content">
<template v-if="!tabView">
<el-select clearable v-model="assetData.cabinetId" clearable class="right-box-row-with-btn" popper-class="asset-dropdown"
<!-- <el-select clearable v-model="assetData.cabinetId" clearable class="right-box-row-with-btn" popper-class="asset-dropdown"-->
<el-select clearable v-model="assetData.cabinetId" clearable popper-class="asset-dropdown"
:disabled="assetData.idcId==''?true:false" size="mini" placeholder=""
@change="getSingleCabinetData">
<el-option
@@ -354,21 +356,21 @@
:value="item.id"
>
<span class="config-dropdown-label-txt">{{ item.name }}</span>
<div class="config-dropdown-label-icons">
<span class="config-dropdown-btn config-dropdown-btn-delete"
@click.stop="deleteData('cabinet',item.id)" :id="'asset-edit-cabinet-op-del-'+item.id">
<i class="el-icon-delete"></i>
</span>
<cabinet-config-box placement="left" :post-cabinet="item" button-class="config-dropdown-btn" @after="getCabinetOptionData">
<i slot="optionZone" class="nz-icon nz-icon-edit"></i>
</cabinet-config-box>
</div>
<!-- <div class="config-dropdown-label-icons">-->
<!-- <span class="config-dropdown-btn config-dropdown-btn-delete"-->
<!-- @click.stop="deleteData('cabinet',item.id)" :id="'asset-edit-cabinet-op-del-'+item.id">-->
<!-- <i class="el-icon-delete"></i>-->
<!-- </span>-->
<!-- <cabinet-config-box placement="left" :post-cabinet="item" button-class="config-dropdown-btn" @after="getCabinetOptionData">-->
<!-- <i slot="optionZone" class="nz-icon nz-icon-edit"></i>-->
<!-- </cabinet-config-box>-->
<!-- </div>-->
</el-option>
</el-select>
<div class="right-box-row-btn right-box-row-btn-small">
<cabinet-config-box placement="left" :post-cabinet="addCabinetData" @after="getCabinetOptionData"></cabinet-config-box>
</div>
<!-- <div class="right-box-row-btn right-box-row-btn-small">-->
<!-- <cabinet-config-box placement="left" :post-cabinet="addCabinetData" @after="getCabinetOptionData"></cabinet-config-box>-->
<!-- </div>-->
</template>
<span v-if="tabView">{{assetViewData.cabinetName}}</span>
</el-form-item>
@@ -439,7 +441,6 @@
user: '',
pwd: '',
port: '',
uploadFile: null
}],
exporter: 0
},
@@ -597,7 +598,6 @@
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
]
},
uploadFileList:[],
formData:null,
module:{},
accountValideResult:true
@@ -638,7 +638,6 @@
pwd:"",
port:'',
privateKey:'',
uploadFile:''
});
}
}
@@ -740,7 +739,6 @@
user: '',
pwd: '',
port: '',
uploadFile: null
}]
};
}
@@ -822,15 +820,6 @@
}
})
},
changeLoginType:function(loginType){
this.assetData.accounts[0].authType = loginType;
if(loginType == 1){//密码登录
this.clearFile();
}
if(loginType == 2){//公钥登录
this.assetData.accounts[0].pwd='';
}
},
editData(data, item, mark) {
let obj = {
id: '',
@@ -846,35 +835,33 @@
tel: ''
}
if (data === 'asset') {
//this.assetData.modelId = this.assetData.modelId.join(',').split(',')[1];
let modelId = this.assetData.modelId.join(',').split(',')[1];
let form = new FormData();
form.append("id", this.pageObj.id);
form.append("sn", this.assetData.sn);
form.append("host", this.assetData.host);
form.append("state", this.assetData.state);
form.append("purchaseDate", !this.assetData.purchaseDate?'':this.assetData.purchaseDate);
form.append("idcId", this.assetData.idcId);
form.append("cabinetId", this.assetData.cabinetId);
form.append("modelId", modelId);
if (!this.accountSwitch) {
this.assetData.accounts = [];
}
for(let i in this.assetData.accounts){
let account=this.assetData.accounts[i];
if(account.user){
if (account.id) {
form.append("accounts["+i+"].id", account.id);
}
form.append("accounts["+i+"].authType",account.authType);
form.append("accounts["+i+"].user", account.user);
form.append("accounts["+i+"].port", account.port);
form.append("accounts["+i+"].pwd", account.pwd);
if(account.authType==2){
form.append('cert',account.uploadFile?account.uploadFile.raw:null);
}
}
}
this.assetData.modelId = this.assetData.modelId.join(',').split(',')[1];
// let modelId = this.assetData.modelId.join(',').split(',')[1];
// let form = new FormData();
// form.append("id", this.pageObj.id);
// form.append("sn", this.assetData.sn);
// form.append("host", this.assetData.host);
// form.append("state", this.assetData.state);
// form.append("purchaseDate", !this.assetData.purchaseDate?'':this.assetData.purchaseDate);
// form.append("idcId", this.assetData.idcId);
// form.append("cabinetId", this.assetData.cabinetId);
// form.append("modelId", modelId);
// if (!this.accountSwitch) {
// this.assetData.accounts = [];
// }
// for(let i in this.assetData.accounts){
// let account=this.assetData.accounts[i];
// if(account.user){
// if (account.id) {
// form.append("accounts["+i+"].id", account.id);
// }
// form.append("accounts["+i+"].authType",account.authType);
// form.append("accounts["+i+"].user", account.user);
// form.append("accounts["+i+"].port", account.port);
// form.append("accounts["+i+"].pwd", account.pwd);
// form.append("accounts["+i+"].privateKey", account.privateKey);
// }
// }
if(this.$refs.accountConfigBox&&this.$refs.accountConfigBox.length>0){
this.$refs.accountConfigBox[0].validateAccount();
@@ -882,11 +869,12 @@
this.$refs.assetEditForm.validate((valid) => {
if (valid&&this.accountValideResult) {
if (this.pageObj.id) {
this.$put('asset', form,{'Content-Type': 'multipart/form-data'}).then(res => {
this.assetData.id=this.pageObj.id;
console.log(JSON.stringify(this.assetData));
this.$put('asset', this.assetData).then(res => {
const h = this.$createElement;
if (res.code === 200) {
this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
this.clearFile();
this.pageObj.id = '';
this.$emit('refreshData', 'true');
this.sendStateData('close');
@@ -901,44 +889,41 @@
}
let modelId = ''
let authType = ''
if (this.assetData.modelId !== '') {
modelId = this.assetData.modelId.join(',').split(',')[1]
} else {
this.assetData.modelId = ''
}
// if (this.assetData.modelId !== '') {
// modelId = this.assetData.modelId.join(',').split(',')[1]
// } else {
// this.assetData.modelId = ''
// }
if (this.assetData.accounts[0].user === '') {
authType = ''
} else {
authType = this.assetData.accounts[0].authType
}
let form = new FormData();
form.append("sn", this.assetData.sn);
form.append("host", this.assetData.host);
form.append("state", this.assetData.state);
form.append("purchaseDate", !this.assetData.purchaseDate?'':this.assetData.purchaseDate);
form.append("idcId", this.assetData.idcId);
form.append("cabinetId", this.assetData.cabinetId);
form.append("modelId", modelId);
if(this.accountSwitch){
for(let i in this.assetData.accounts){
let account=this.assetData.accounts[i];
if(account.user){
form.append("accounts["+i+"].authType",account.authType);
form.append("accounts["+i+"].user", account.user);
form.append("accounts["+i+"].port", account.port);
form.append("accounts["+i+"].pwd", account.pwd);
if(account.authType==2){
form.append('cert',account.uploadFile?account.uploadFile.raw:null);
}
}
}
}
form.append("exporter",parseInt(this.assetData.exporter));
this.$post('asset', form,{'Content-Type': 'multipart/form-data'}).then(res => {
// let form = new FormData();
// form.append("sn", this.assetData.sn);
// form.append("host", this.assetData.host);
// form.append("state", this.assetData.state);
// form.append("purchaseDate", !this.assetData.purchaseDate?'':this.assetData.purchaseDate);
// form.append("idcId", this.assetData.idcId);
// form.append("cabinetId", this.assetData.cabinetId);
// form.append("modelId", modelId);
// if(this.accountSwitch){
// for(let i in this.assetData.accounts){
// let account=this.assetData.accounts[i];
// if(account.user){
// form.append("accounts["+i+"].authType",account.authType);
// form.append("accounts["+i+"].user", account.user);
// form.append("accounts["+i+"].port", account.port);
// form.append("accounts["+i+"].pwd", account.pwd);
// form.append("accounts["+i+"].privateKey", account.privateKey)
// }
// }
// }
// form.append("exporter",parseInt(this.assetData.exporter));
this.$post('asset', this.assetData).then(res => {
const h = this.$createElement;
if (res.code === 200) {
this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
this.clearFile();
this.$emit('refreshData', 'true');
this.sendStateData('close');
} else {
@@ -1098,13 +1083,6 @@
}
},
clearFile:function(){
if(this.$refs.upload){
this.$refs.upload.clearFiles();
}
this.uploadFileList=[];
this.assetData.accounts[0].privateKey='';
},
deleteData(data, item) {
this.$confirm(this.$t("tip.confirmDelete"), {
confirmButtonText: this.$t("tip.yes"),
@@ -1349,12 +1327,6 @@
this.tempData = ''
}
},
handleChange(file,fileList) {
if (fileList.length > 0) {
this.uploadFileList = [fileList[fileList.length - 1]]
}
this.assetData.accounts[0].file = this.uploadFileList[0];
},
editPopoverClose(data) {
if (data === 'type') {
this.modelCount = ''
@@ -1441,21 +1413,4 @@
margin-bottom: 18px;
background-color: #DCDFE6;
}
/*去除上传文件动画start*/
/*.upload-demo {*/
/* display: flex;*/
/*}*/
/deep/ .el-list-enter-active,
/deep/ .el-list-leave-active {
transition: none;
}
/deep/ .el-list-enter,
/deep/ .el-list-leave-active {
opacity: 0;
}
/deep/ .el-upload-list {
height: 40px;
}
/*去除上传文件动画end*/
</style>

39
nezha-fronted/src/components/page/asset/accountConfig.vue
View File

@@ -36,13 +36,7 @@
<div class="right-box-form-content-txt" v-if="!isEdit">{{account.port}}</div>
</el-form-item>
<el-form-item :label="this.$t('asset.createAssetTab.ssh')" v-show="account.authType==2" prop="file" v-if="isEdit">
<el-upload class="upload-demo" ref="upload" action="" :file-list="uploadFileList" :on-change="handleChange" :auto-upload="false">
<div slot="tip" class="el-upload__tip" v-if="account.privateKey" >{{$t('asset.createAssetTab.sshKeyWasConfig')}}</div>
<button type="button" class="nz-btn nz-btn-size-normal nz-btn-style-normal">
<span class="top-tool-btn-txt" v-if="account.privateKey">{{$t('asset.createAssetTab.clickToCover')}}</span>
<span class="top-tool-btn-txt" v-else>{{$t('asset.createAssetTab.clickToUpload')}}</span>
</button>
</el-upload>
<el-input rows="4" type="textarea" placeholder="" v-model="account.privateKey" size="small"></el-input>
</el-form-item>
</el-form>
</div>
@@ -59,14 +53,7 @@ export default {
created() {
},
data(){
let validateFile=(rule,value,callback) => {
if(!this.validateFile()){
callback(new Error(this.uploadTip))
}
callback();
}
return {
uploadFileList:[],
rules:{
user:[
{ required: true, message:this.$t('validate.required'),trigger: 'blur'}
@@ -75,9 +62,6 @@ export default {
{required:true,message:this.$t('validate.required'),trigger: 'blur'},
{ validator: port, trigger: 'blur'}
],
file:[
{ validator: validateFile, trigger: 'change'}
]
},
uploadTip:''
}
@@ -97,12 +81,15 @@ export default {
changeLoginType:function(loginType){
this.account.authType=loginType;
if(loginType == 1){//密码登录
this.clearFile();
this.clearPrivateKey();
}
if(loginType == 2){//公钥登录
this.account.pwd='';
}
},
clearPrivateKey:function(){
this.account.privateKey=null;
},
handleChange(file,fileList) {
if (fileList.length > 0) {
this.uploadFileList = [fileList[fileList.length - 1]]
@@ -110,28 +97,12 @@ export default {
this.account.uploadFile = this.uploadFileList[0];
this.validateFile();
},
clearFile:function() {
if (this.$refs.upload) {
this.$refs.upload.clearFiles();
}
this.uploadFileList = [];
},
validateAccount:function(){
this.validateResult=false;
this.$refs.accountForm.validate((valid) => {
this.$emit("setValidateResult",valid);
console.log(valid)
});
},
validateFile:function(){
let file=this.uploadFileList[0];
if(file&&file.size>500){
this.uploadTip=this.$t('validate.fileSize')
return false;
}else{
return true;
}
},
},
watch:{

20
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -37,7 +37,6 @@
export-file-name="asset"
export-url="/asset/export"
:params="searchLabel"
:template-key="templateKey"
@afterImport="getAssetData"
class="float-right">
<template slot="optionZone">
@@ -371,25 +370,6 @@
checkAllFlag: false,
checkAllHandler: false,
assetClick: false,
templateHeader:['*Sn','*Type','*Vendor','*Model','*Idc','Cabinet','*Host','State','PurchaseDate','AuthType','User','Pwd','PrivateKey','Port','Exporter'],
templateDate:[{
sn:'0001',
type:'server/net',
vendor:'huawei',
model:'rongyao',
idc:'beijing',
cabinet:'cab-01',
host:'192.168.1.1',
state:'1:在库 2:出库 默认:在库',
purchaseData:'2020-02-11 19:30:33',
authType:'认证类型，1：密码，2：私钥证书',
user:'root',
pwd:'111111',
privateKey:'xxxxxxxx',
port:'22',
exporter:'是否安装node_exporter,1:安装，0:不安装'
}],
templateKey:['sn','type','vendor','model','idc','cabinet','host','state','purchaseData','authType','user','pwd','privateKey','port','exporter']
}
},
computed: {

36
nezha-fronted/src/components/page/config/promServer.vue
View File

@@ -34,14 +34,14 @@
<el-table-column :resizable="false" v-for="(item, index) in tablelable" v-if="item.show" :width="item.width"
:key="`col-${index}`" :label="item.label">
<template slot-scope="scope" :column="item">
<idc-config-box v-if="item.prop == 'idc'" ref="idcConfigBox"
<!--<idc-config-box v-if="item.prop == 'idc'" ref="idcConfigBox"
:post-idc="JSON.parse(JSON.stringify(scope.row[item.prop]))" :is-edit="false"
placement="left" @after="getIdcData" :button-class="'checkbox-edit'">
<template v-slot:optionZone>
<span class="link" @click="closeAllPop">{{scope.row[item.prop].name}}</span>
</template>
</idc-config-box>
</idc-config-box>-->
<span v-if="item.prop == 'idc'" >{{scope.row[item.prop].name}}</span>
<span v-else-if="item.prop == 'type'">
{{scope.row[item.prop] == '1' ? 'Global' : ''}}
@@ -107,28 +107,30 @@
<!--DC start-->
<el-form-item label="DC" prop="idc.name">
<div class="right-box-form-content">
<el-select class="right-box-row-with-btn" value-key="id" popper-class="config-dropdown"
<!-- <el-select class="right-box-row-with-btn" value-key="id" popper-class="config-dropdown"-->
<!-- v-model="promServer.idc" placeholder="" v-if="rightBox.isEdit" size="small">-->
<el-select value-key="id" popper-class="config-dropdown"
v-model="promServer.idc" placeholder="" v-if="rightBox.isEdit" size="small">
<el-option @click.native="blurEditIdc()" v-for="item in idcData" :key="item.id" :label="item.name"
:value="item" :id="'prom-edit-idc-op-'+item.id">
<span class="config-dropdown-label-txt">{{item.name}}</span>
<div class="config-dropdown-label-icons">
<span class="config-dropdown-btn config-dropdown-btn-delete" @click.stop="toDelIdc(item)"
:id="'prom-edit-idc-op-del-'+item.id"><i class="el-icon-delete"></i></span>
<idc-config-box :post-idc="item" placement="left" @after="getIdcData"
:button-class="'config-dropdown-btn'">
<template v-slot:optionZone>
<i class="nz-icon nz-icon-edit"></i>
</template>
</idc-config-box>
</div>
<!-- <div class="config-dropdown-label-icons">-->
<!-- <span class="config-dropdown-btn config-dropdown-btn-delete" @click.stop="toDelIdc(item)"-->
<!-- :id="'prom-edit-idc-op-del-'+item.id"><i class="el-icon-delete"></i></span>-->
<!-- <idc-config-box :post-idc="item" placement="left" @after="getIdcData"-->
<!-- :button-class="'config-dropdown-btn'">-->
<!-- <template v-slot:optionZone>-->
<!-- <i class="nz-icon nz-icon-edit"></i>-->
<!-- </template>-->
<!-- </idc-config-box>-->
<!-- </div>-->
</el-option>
</el-select>
<div class="right-box-row-btn" v-if="rightBox.isEdit">
<idc-config-box placement="left" @after="getIdcData"></idc-config-box>
</div>
<!-- <div class="right-box-row-btn" v-if="rightBox.isEdit">-->
<!-- <idc-config-box placement="left" @after="getIdcData"></idc-config-box>-->
<!-- </div>-->
<div class="right-box-form-content-txt" v-if="!rightBox.isEdit">{{promServer.idc.name}}</div>
</div>
</el-form-item>

BIN
nezha-fronted/static/template/en/asset-template.xlsx Normal file
View File

Binary file not shown.

BIN
nezha-fronted/static/template/en/endpoint-template.xlsx Normal file
View File

Binary file not shown.