fix:1.alertMessage图表添加loading动画2.asset-telnet配置样式调整3.traffic修改协议不请求bug修复
This commit is contained in:
@@ -270,12 +270,22 @@
|
|||||||
auth:configs[0].auth,
|
auth:configs[0].auth,
|
||||||
configs:[],
|
configs:[],
|
||||||
}
|
}
|
||||||
|
if(settingItem.version == 2){
|
||||||
|
settingItem.auth={
|
||||||
|
username:'',
|
||||||
|
securityLevel:'',
|
||||||
|
securityLevel:'',
|
||||||
|
authProtocol:'',
|
||||||
|
privProtocol:'',
|
||||||
|
privPassword:'',
|
||||||
|
}
|
||||||
|
}
|
||||||
configs.forEach(item=>{
|
configs.forEach(item=>{
|
||||||
let config={
|
let config={
|
||||||
direction:item.direction&&item.direction!=''?item.direction.split(','):[],
|
direction:item.direction&&item.direction!=''?item.direction.split(','):[],
|
||||||
ifindex:item.ifindex+'',
|
ifindex:item.ifindex+'',
|
||||||
ifdescr:item.ifdescr,
|
ifdescr:item.ifdescr,
|
||||||
tags:item.tags,
|
tags:item.tags&&item.tags!=''?item.tags:{},
|
||||||
edit:false,
|
edit:false,
|
||||||
}
|
}
|
||||||
settingItem.configs.push(config);
|
settingItem.configs.push(config);
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
<el-row class="mib-browser-ad-search-item">
|
<el-row class="mib-browser-ad-search-item">
|
||||||
<el-col :span="6"><div class="mib-browser-ad-search-label">{{$t('project.module.version')}}</div></el-col>
|
<el-col :span="6"><div class="mib-browser-ad-search-label">{{$t('project.module.version')}}</div></el-col>
|
||||||
<el-col :span="17">
|
<el-col :span="17">
|
||||||
<el-radio-group v-model.number="assetSetting.version">
|
<el-radio-group v-model.number="assetSetting.version" >
|
||||||
<el-radio-button :label="2"></el-radio-button>
|
<el-radio-button :label="2"></el-radio-button>
|
||||||
<el-radio-button :label="3"></el-radio-button>
|
<el-radio-button :label="3"></el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
@@ -163,12 +163,14 @@
|
|||||||
</el-scrollbar>-->
|
</el-scrollbar>-->
|
||||||
<el-tooltip placement="top" effect="light" popper-class="tags-pop transparent-pop">
|
<el-tooltip placement="top" effect="light" popper-class="tags-pop transparent-pop">
|
||||||
<div slot="content">
|
<div slot="content">
|
||||||
<div class="tab-tags-item" v-for="(value, key, index) in scope.row[item.prop]">
|
<template v-if="scope.row[item.prop]">
|
||||||
<div class="tag-item-key">{{key}}</div>
|
<div class="tab-tags-item" v-for="(value, key, index) in scope.row[item.prop]">
|
||||||
<div class="tag-item-value">{{value}}</div>
|
<div class="tag-item-key">{{key}}</div>
|
||||||
</div>
|
<div class="tag-item-value">{{value}}</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-tags-item" v-if="Object.keys(scope.row[item.prop]).length>0">
|
<div class="tab-tags-item" v-if="scope.row[item.prop]&&Object.keys(scope.row[item.prop]).length>0">
|
||||||
<div class="tag-item-key">{{Object.keys(scope.row[item.prop])[0]}}</div>
|
<div class="tag-item-key">{{Object.keys(scope.row[item.prop])[0]}}</div>
|
||||||
<div class="tag-item-value">{{scope.row[item.prop][Object.keys(scope.row[item.prop])[0]]}}</div>
|
<div class="tag-item-value">{{scope.row[item.prop][Object.keys(scope.row[item.prop])[0]]}}</div>
|
||||||
<div class="tag-item-text" v-if="Object.keys(scope.row[item.prop]).length>1">+{{Object.keys(scope.row[item.prop]).length-1}}</div>
|
<div class="tag-item-text" v-if="Object.keys(scope.row[item.prop]).length>1">+{{Object.keys(scope.row[item.prop]).length-1}}</div>
|
||||||
@@ -419,7 +421,8 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
popHide() {
|
popHide() {
|
||||||
|
console.log(this.assetSetting)
|
||||||
|
this.queryInterfaceInfos(true);
|
||||||
},
|
},
|
||||||
showInput:function(){
|
showInput:function(){
|
||||||
this.showTagInput=true;
|
this.showTagInput=true;
|
||||||
|
|||||||
@@ -497,6 +497,7 @@
|
|||||||
}else{
|
}else{
|
||||||
step='30m';
|
step='30m';
|
||||||
}
|
}
|
||||||
|
this.$refs.messageChart.startLoading();
|
||||||
let axiosArr=[];
|
let axiosArr=[];
|
||||||
let paramStr = JSON.stringify(this.promQueryParamConvert(this.currentMsg));
|
let paramStr = JSON.stringify(this.promQueryParamConvert(this.currentMsg));
|
||||||
axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step));
|
axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step));
|
||||||
@@ -560,7 +561,6 @@
|
|||||||
this.graphShow = true;
|
this.graphShow = true;
|
||||||
this.currentMsg = obj;
|
this.currentMsg = obj;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.messageChart.startLoading();
|
|
||||||
this.queryChartDate();
|
this.queryChartDate();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<div class="telnet-option" v-show="isEdit && account.protocol=='TELNET'">
|
<div class="telnet-option" v-show="isEdit && account.protocol=='TELNET'">
|
||||||
<div class="telnet-option_title clickable" @click="isShowTelnetOption">login option<div class="telnet-option_spilt"></div><i style="font-size: 12px;" :class="{'el-icon-arrow-left':!showTelnetOption,'el-icon-arrow-down':showTelnetOption}"></i></div>
|
<div class="telnet-option_title clickable" @click="isShowTelnetOption"><div style="width: 100px;">login option</div><div class="telnet-option_spilt"></div><div style="width: 20px"><i style="font-size: 12px;" :class="{'el-icon-arrow-left':!showTelnetOption,'el-icon-arrow-down':showTelnetOption}"></i></div></div>
|
||||||
<div v-show="isEdit && account.protocol=='TELNET' && showTelnetOption" class="auto-login-tip">
|
<div v-show="isEdit && account.protocol=='TELNET' && showTelnetOption" class="auto-login-tip">
|
||||||
{{$t('asset.createAssetTab.userPwdIntroduce')}}
|
{{$t('asset.createAssetTab.userPwdIntroduce')}}
|
||||||
</div>
|
</div>
|
||||||
@@ -204,15 +204,15 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
.telnet-option_title .telnet-option_spilt{
|
.telnet-option_title .telnet-option_spilt{
|
||||||
display: inline-block;
|
width: calc(100% - 125px);
|
||||||
width: 79.9%;
|
|
||||||
height: 1px;
|
height: 1px;
|
||||||
background-color: lightgrey;
|
background-color: lightgrey;
|
||||||
vertical-align: middle;
|
margin:auto 0;
|
||||||
|
|
||||||
/*margin-bottom: 18px;*/
|
/*margin-bottom: 18px;*/
|
||||||
}
|
}
|
||||||
.telnet-option .telnet-option_title{
|
.telnet-option .telnet-option_title{
|
||||||
display: inline-block;
|
display: flex;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
margin-bottom: 18px;
|
margin-bottom: 18px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
Reference in New Issue
Block a user