monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 625e3e1c5c47bb59403d056f5b3155f8ba4d8099 2 parents ffb67374 9cfa97ff

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

详情页折线图指标flag选择优化



See merge request !462
Inline Side-by-side
Showing 1 changed file with 69 additions and 22 deletions
... ... @@ -1308,42 +1308,89 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
linechart.on('click', function (i) {
let array = [];
var arrayList;
if (data){
$.each(data.series, function (i, v) {
if (v.flag!=null && v.flag!=undefined){
array.push(`<span id="selectFlag" class="layui-badge layui-bg-blue" style="margin:2px;z-index:99999">${v.flag}</span>`+"");
if(kpiName=='网卡上行速率'||kpiName=='网卡下行速率'){
if (data){
$.each(data.series, function (i, v) {
if (v.flag!=null && v.flag!=undefined){
array.push(`<span id="selectFlag" class="layui-badge layui-bg-blue" style="margin:2px;z-index:99999">${v.flag}</span>`+"");
}else {
array.push('<div style="position:absolute;top:50%;left:50%;">无指标</div>')
}
});
arrayList= array.join(" ");
if (data.series.length>1){
let flagSelect =layer.open({
title: ['指标flag选择'],
type: 1,
area: ['30%', '15%'],
shadeClose: true,//开启遮罩层
id: 'flag_select_div',
// content: laytpl(res.body).render(JSON.stringify(params)),
content: '<div style="padding: 15px 18px">'+arrayList+'</div>',
});
$(document).on('click','#selectFlag',function(v) {
layer.close(flagSelect);
var seriesName= data.series[i.componentIndex].name;
if (seriesName == null ||seriesName == undefined) {
seriesName = '';
}
var seriesFlag= data.series[i.componentIndex].flag;
if (seriesFlag == null ||seriesFlag == undefined) {
seriesFlag = '';
}
var params = {
resId: resId,
kpiId: kpiId,
flag: seriesFlag,
warning: false,
ident: true,
trend: true,
name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
};
common.openLineChart(kpiName + ' ' + seriesName, params);
});
}else {
array.push('<div style="position:absolute;top:50%;left:50%;">无指标</div>')
var seriesName= data.series[i.componentIndex].name;
if (seriesName == null ||seriesName == undefined) {
seriesName = '';
}
var seriesFlag= data.series[i.componentIndex].flag;
if (seriesFlag == null ||seriesFlag == undefined) {
seriesFlag = '';
}
var params = {
resId: resId,
kpiId: kpiId,
flag: seriesFlag,
warning: false,
ident: true,
trend: true,
name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
};
common.openLineChart(kpiName + ' ' + seriesName, params);
}
});
arrayList= array.join(" ");
}
let flagSelect =layer.open({
title: ['指标flag选择'],
type: 1,
area: ['30%', '15%'],
shadeClose: true,//开启遮罩层
id: 'flag_select_div',
// content: laytpl(res.body).render(JSON.stringify(params)),
content: '<div style="padding: 15px 18px">'+arrayList+'</div>',
});
$(document).on('click','#selectFlag',function(v) {
layer.close(flagSelect);
}
}else {
var seriesName= data.series[i.componentIndex].name;
if (data.series[i.componentIndex].name == null ||data.series[i.componentIndex].name == undefined){
if (seriesName == null ||seriesName == undefined) {
seriesName = '';
}
var seriesFlag= data.series[i.componentIndex].flag;
if (seriesFlag == null ||seriesFlag == undefined) {
seriesFlag = '';
}
var params = {
resId: resId,
kpiId: kpiId,
flag: v.currentTarget.innerHTML,
flag: seriesFlag,
warning: false,
ident: true,
trend: true,
name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
};
common.openLineChart(kpiName + ' ' + seriesName, params);
});
}
});
});
},
... ...