Authored by 王涛

Merge branch 'master-v32-lushangqing' into 'master'

网卡上行速率/网卡下行速率折线图点击后的title出现null,500-dev迁移过来



See merge request !710
... ... @@ -1389,17 +1389,93 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
linechart.setOption(option);
// 折线图的点击事件
linechart.off("click");
linechart.on('click', function (v) {
var params = {
resId: resId,
kpiId: kpiId.split(',').length==0?kpiId:kpiId.split(',')[v.componentIndex], //当kpiId为多个时,点击时获取对应kpiId
flag: data.series[v.componentIndex].flag,
warning: false,
ident: true,
trend: true,
name: (kpiNames&&kpiNames.length>0)?kpiNames[v.componentIndex]:kpiName + ' ' + data.series[v.componentIndex].name //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
};
common.openLineChart(kpiName + ' ' + data.series[v.componentIndex].name, params);
//lsq 网卡上行速率/网卡下行速率折线图点击后的title出现null,500-dev迁移过来 2022-06-30
linechart.on('click', function (i) {
let array = [];
var arrayList;
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 {
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 {
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);
}
});
});
},
... ...