monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 9cfa97ffcedee16a797003aa838c1222139fc5d0 1 parent ffb67374

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

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 @@ -1308,42 +1308,89 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
1308 linechart.on('click', function (i) { 1308 linechart.on('click', function (i) {
1309 let array = []; 1309 let array = [];
1310 var arrayList; 1310 var arrayList;
1311 - if (data){  
1312 - $.each(data.series, function (i, v) {  
1313 - if (v.flag!=null && v.flag!=undefined){  
1314 - array.push(`<span id="selectFlag" class="layui-badge layui-bg-blue" style="margin:2px;z-index:99999">${v.flag}</span>`+""); 1311 + if(kpiName=='网卡上行速率'||kpiName=='网卡下行速率'){
  1312 + if (data){
  1313 + $.each(data.series, function (i, v) {
  1314 + if (v.flag!=null && v.flag!=undefined){
  1315 + array.push(`<span id="selectFlag" class="layui-badge layui-bg-blue" style="margin:2px;z-index:99999">${v.flag}</span>`+"");
  1316 + }else {
  1317 + array.push('<div style="position:absolute;top:50%;left:50%;">无指标</div>')
  1318 + }
  1319 + });
  1320 + arrayList= array.join(" ");
  1321 + if (data.series.length>1){
  1322 + let flagSelect =layer.open({
  1323 + title: ['指标flag选择'],
  1324 + type: 1,
  1325 + area: ['30%', '15%'],
  1326 + shadeClose: true,//开启遮罩层
  1327 + id: 'flag_select_div',
  1328 + // content: laytpl(res.body).render(JSON.stringify(params)),
  1329 + content: '<div style="padding: 15px 18px">'+arrayList+'</div>',
  1330 + });
  1331 + $(document).on('click','#selectFlag',function(v) {
  1332 + layer.close(flagSelect);
  1333 + var seriesName= data.series[i.componentIndex].name;
  1334 + if (seriesName == null ||seriesName == undefined) {
  1335 + seriesName = '';
  1336 + }
  1337 + var seriesFlag= data.series[i.componentIndex].flag;
  1338 + if (seriesFlag == null ||seriesFlag == undefined) {
  1339 + seriesFlag = '';
  1340 + }
  1341 + var params = {
  1342 + resId: resId,
  1343 + kpiId: kpiId,
  1344 + flag: seriesFlag,
  1345 + warning: false,
  1346 + ident: true,
  1347 + trend: true,
  1348 + name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
  1349 + };
  1350 + common.openLineChart(kpiName + ' ' + seriesName, params);
  1351 + });
1315 }else { 1352 }else {
1316 - array.push('<div style="position:absolute;top:50%;left:50%;">无指标</div>') 1353 + var seriesName= data.series[i.componentIndex].name;
  1354 + if (seriesName == null ||seriesName == undefined) {
  1355 + seriesName = '';
  1356 + }
  1357 + var seriesFlag= data.series[i.componentIndex].flag;
  1358 + if (seriesFlag == null ||seriesFlag == undefined) {
  1359 + seriesFlag = '';
  1360 + }
  1361 + var params = {
  1362 + resId: resId,
  1363 + kpiId: kpiId,
  1364 + flag: seriesFlag,
  1365 + warning: false,
  1366 + ident: true,
  1367 + trend: true,
  1368 + name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
  1369 + };
  1370 + common.openLineChart(kpiName + ' ' + seriesName, params);
1317 } 1371 }
1318 - });  
1319 - arrayList= array.join(" ");  
1320 - }  
1321 - let flagSelect =layer.open({  
1322 - title: ['指标flag选择'],  
1323 - type: 1,  
1324 - area: ['30%', '15%'],  
1325 - shadeClose: true,//开启遮罩层  
1326 - id: 'flag_select_div',  
1327 - // content: laytpl(res.body).render(JSON.stringify(params)),  
1328 - content: '<div style="padding: 15px 18px">'+arrayList+'</div>',  
1329 - });  
1330 - $(document).on('click','#selectFlag',function(v) {  
1331 - layer.close(flagSelect); 1372 + }
  1373 +
  1374 + }else {
1332 var seriesName= data.series[i.componentIndex].name; 1375 var seriesName= data.series[i.componentIndex].name;
1333 - if (data.series[i.componentIndex].name == null ||data.series[i.componentIndex].name == undefined){ 1376 + if (seriesName == null ||seriesName == undefined) {
1334 seriesName = ''; 1377 seriesName = '';
1335 } 1378 }
  1379 + var seriesFlag= data.series[i.componentIndex].flag;
  1380 + if (seriesFlag == null ||seriesFlag == undefined) {
  1381 + seriesFlag = '';
  1382 + }
1336 var params = { 1383 var params = {
1337 resId: resId, 1384 resId: resId,
1338 kpiId: kpiId, 1385 kpiId: kpiId,
1339 - flag: v.currentTarget.innerHTML, 1386 + flag: seriesFlag,
1340 warning: false, 1387 warning: false,
1341 ident: true, 1388 ident: true,
1342 trend: true, 1389 trend: true,
1343 name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面 1390 name: (kpiNames&&kpiNames.length>0)?kpiNames[i.componentIndex]:kpiName + ' ' + seriesName //当传入多个kpiName,则将对应kpiId的kpiName获取传入的性能曲线页面
1344 }; 1391 };
1345 common.openLineChart(kpiName + ' ' + seriesName, params); 1392 common.openLineChart(kpiName + ' ' + seriesName, params);
1346 - }); 1393 + }
1347 }); 1394 });
1348 }); 1395 });
1349 }, 1396 },