monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 57ee12b5ad674ac411f5013e1bd4d0ac336cb39f 2 parents 5b8163b9 b80e918e

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 10 changed files with 125 additions and 48 deletions
  1 +# 代码包路径
  2 +````
  3 +【前端】hg-monitor-web-base\src\main\resources\static\src\views\reportView
  4 +````
  5 +
  6 +### 说明
  7 +````
  8 +集成积木报表
  9 +````
  10 +
  11 +### 菜单配置说明
  12 +````
  13 +菜单URL:reportView/index/reportCode=dddd
  14 +dddd = 展示的报表编号
  15 +````
@@ -334,7 +334,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -334,7 +334,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
334 field: 'resName', title: '资源名称', minWidth: 250, sort: true, 334 field: 'resName', title: '资源名称', minWidth: 250, sort: true,
335 templet: '#resindex_resName' 335 templet: '#resindex_resName'
336 }, 336 },
337 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 337 + {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
  338 + {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
  339 + {field: 'storageSetRate', title: '存储分配率', align: 'center', minWidth: 120, templet: '#storageSetRateTpl'},
338 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 340 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
339 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 341 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
340 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 342 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -349,7 +351,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -349,7 +351,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
349 field: 'resName', title: '资源名称', minWidth: 250, sort: true, 351 field: 'resName', title: '资源名称', minWidth: 250, sort: true,
350 templet: '#resindex_resName' 352 templet: '#resindex_resName'
351 }, 353 },
352 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 354 + {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
  355 + {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
353 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 356 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
354 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 357 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
355 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 358 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -365,6 +368,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -365,6 +368,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
365 templet: '#resindex_resName' 368 templet: '#resindex_resName'
366 }, 369 },
367 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 370 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  371 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  372 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
368 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 373 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
369 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 374 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
370 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 375 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -380,6 +385,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -380,6 +385,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
380 templet: '#resindex_resName' 385 templet: '#resindex_resName'
381 }, 386 },
382 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 387 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  388 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  389 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
383 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 390 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
384 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 391 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
385 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 392 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -395,6 +402,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -395,6 +402,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
395 templet: '#resindex_resName' 402 templet: '#resindex_resName'
396 }, 403 },
397 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 404 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  405 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  406 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
398 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 407 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
399 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 408 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
400 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 409 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -410,6 +419,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -410,6 +419,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
410 templet: '#resindex_resName' 419 templet: '#resindex_resName'
411 }, 420 },
412 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 421 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  422 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  423 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
413 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 424 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
414 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 425 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
415 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 426 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -425,6 +436,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -425,6 +436,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
425 templet: '#resindex_resName' 436 templet: '#resindex_resName'
426 }, 437 },
427 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 438 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  439 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  440 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
428 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 441 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
429 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 442 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
430 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 443 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -440,6 +453,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -440,6 +453,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
440 templet: '#resindex_resName' 453 templet: '#resindex_resName'
441 }, 454 },
442 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 455 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  456 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  457 + {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
  458 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
  459 + {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
443 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 460 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
444 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 461 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
445 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 462 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -455,6 +472,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -455,6 +472,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
455 templet: '#resindex_resName' 472 templet: '#resindex_resName'
456 }, 473 },
457 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 474 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  475 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  476 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
458 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 477 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
459 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 478 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
460 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 479 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -46,6 +46,8 @@ layui.define(['admin', 'table', 'common','sessions','commonDetail'], function (e @@ -46,6 +46,8 @@ layui.define(['admin', 'table', 'common','sessions','commonDetail'], function (e
46 $("#hostminicomputer_jbxx").html(li); 46 $("#hostminicomputer_jbxx").html(li);
47 } 47 }
48 }); 48 });
  49 + //活动告警
  50 + commonDetail.renderActiveAlarms('hostminicomputer_alarmlist',resId);
49 51
50 // 小型机分区信息 52 // 小型机分区信息
51 table.render({ 53 table.render({
@@ -66,7 +66,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -66,7 +66,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
66 {title: '序号', align: "center", type: 'numbers',width: '3%'} 66 {title: '序号', align: "center", type: 'numbers',width: '3%'}
67 , {field: 'type', title: '通知类型', align: 'center', sort: true, width:130, 67 , {field: 'type', title: '通知类型', align: 'center', sort: true, width:130,
68 templet: function (d){ 68 templet: function (d){
69 - switch (d.type){ 69 + if(d.type) {
  70 + switch (d.type) {
70 case 10: 71 case 10:
71 return '告警通知' 72 return '告警通知'
72 break; 73 break;
@@ -82,7 +83,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -82,7 +83,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
82 case 99: 83 case 99:
83 return '测试通知' 84 return '测试通知'
84 break; 85 break;
  86 + default:
  87 + return '告警通知'
  88 + break;
85 } 89 }
  90 + }else {
  91 + return '告警通知'
  92 + }
86 }} 93 }}
87 , {field: 'way', title: '通知方式', align: 'center', sort: true, width:120, 94 , {field: 'way', title: '通知方式', align: 'center', sort: true, width:120,
88 templet: function (d){ 95 templet: function (d){
@@ -96,10 +103,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -96,10 +103,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
96 case 'message': 103 case 'message':
97 return '<div class="small-icon small-icon-msg"></div>' 104 return '<div class="small-icon small-icon-msg"></div>'
98 break; 105 break;
  106 + default:
  107 + return '<div class="small-icon small-icon-wechat"></div>'
  108 + break;
  109 +
99 } 110 }
100 }} 111 }}
101 // , {field: 'targetId', title: '通知对象', align: 'center', sort: true, width:180} 112 // , {field: 'targetId', title: '通知对象', align: 'center', sort: true, width:180}
102 - , {field: 'content', title: '通知内容', align: 'right', sort: true, minWidth: 300,} 113 + , {field: 'content', title: '通知内容', align: 'left', sort: true, minWidth: 300,}
103 , {field: 'nickname', title: '通知用户', align: 'center', sort: true, width:200} 114 , {field: 'nickname', title: '通知用户', align: 'center', sort: true, width:200}
104 , {field: 'noticeTime', title: '通知时间', align: 'center', sort: true, width:180} 115 , {field: 'noticeTime', title: '通知时间', align: 'center', sort: true, width:180}
105 // , {field: 'createTime',title: '入库时间',align: 'center', sort: true,width:180} 116 // , {field: 'createTime',title: '入库时间',align: 'center', sort: true,width:180}
@@ -1261,8 +1261,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1261,8 +1261,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1261 }) 1261 })
1262 } 1262 }
1263 if(subflag && !resTypeSelectExclude.includes(resType)){ 1263 if(subflag && !resTypeSelectExclude.includes(resType)){
  1264 + if(/ALI_CLOUD_/.test(resType) || /HUAWEI_CLOUD_/.test(resType)) {
  1265 + return
  1266 + }
1264 $("#res_sub_restype").parent().parent().removeClass("hide"); 1267 $("#res_sub_restype").parent().parent().removeClass("hide");
1265 $(".top-head-info").removeClass("hide"); 1268 $(".top-head-info").removeClass("hide");
  1269 +
1266 var url = `${common.domainName}/api-web/bResource/finsResTypeListByParentId?resType=${resType}` 1270 var url = `${common.domainName}/api-web/bResource/finsResTypeListByParentId?resType=${resType}`
1267 admin.req({ 1271 admin.req({
1268 url: url 1272 url: url
  1 +<title>报表</title>
  2 +<script type="text/html" template>
  3 + {{#
  4 + var viewURL = sessionStorage.getItem('jimuReport') + '/page/reportCode?access_token='+localStorage.getItem('access_token');
  5 + layui.use(['sessions','common','admin'], function () {
  6 + var $ = layui.$;
  7 + var common = layui.common;
  8 + var admin = layui.admin;
  9 + var arr = [];
  10 + window.location.hash.split('/').forEach(function (v, i) {
  11 + if (v.indexOf('=') != -1 && v.indexOf('reportCode') != -1) {
  12 + viewURL = viewURL.replaceAll('reportCode',v.split('=')[1])
  13 + }
  14 + });
  15 +
  16 + $('#actionListIframe').attr('src',viewURL);
  17 + });
  18 + }}
  19 + <iframe id="actionListIframe" src="{{viewURL}}" frameborder="0" class="layadmin-iframe"></iframe>
  20 +</script>
@@ -23,6 +23,12 @@ @@ -23,6 +23,12 @@
23 <div id="hostminicomputerpartitionlist"></div> 23 <div id="hostminicomputerpartitionlist"></div>
24 </div> 24 </div>
25 </div> 25 </div>
  26 + <div class="lay-row">
  27 + <div class="lay-row-item">
  28 + <h5 class="lay-row-title">实时告警动态</h5>
  29 + <div id="hostminicomputer_alarmlist"></div>
  30 + </div>
  31 + </div>
26 </div> 32 </div>
27 </div> 33 </div>
28 </div> 34 </div>
@@ -564,9 +564,9 @@ @@ -564,9 +564,9 @@
564 <a class="layui-icon layui-icon-rate-solid" data-favid="{{d.favId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a> 564 <a class="layui-icon layui-icon-rate-solid" data-favid="{{d.favId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a>
565 {{# } }} 565 {{# } }}
566 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 566 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>
567 - {{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }} 567 + <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
568 <a class="layui-icon reslist-assets-details hide" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-ip="{{ d.ip }}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a> 568 <a class="layui-icon reslist-assets-details hide" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-ip="{{ d.ip }}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>
569 - {{# } }} 569 + {{# } }}-->
570 </div> 570 </div>
571 </script> 571 </script>
572 572
@@ -287,29 +287,29 @@ export default { @@ -287,29 +287,29 @@ export default {
287 return {resId: v.resId, kpiId: v.kpiId, kpiFlg: v.flag} 287 return {resId: v.resId, kpiId: v.kpiId, kpiFlg: v.flag}
288 }); 288 });
289 289
290 - // let p = {  
291 - // timeScope: timeScope,  
292 - // frequency: form.value.scene.frequency,  
293 - // resource: resList,  
294 - // type : 'avg'  
295 - // }  
296 let p = { 290 let p = {
297 - "timeScope": timeScope,  
298 - "frequency": form.value.scene.frequency,  
299 - "resource": [  
300 - {  
301 - "resId": "F6F24DADC01ADE5DD9583144BE6E8E15",  
302 - "kpiId": "KPI20352505",  
303 - "kpiFlg": "mem"  
304 - },  
305 - {  
306 - "resId": "C5DC239D719ACAB61231ACED7CE68CD1",  
307 - "kpiId": "KPI7054BC34",  
308 - "kpiFlg": "cpu"  
309 - }  
310 - ],  
311 - "type": "avg" 291 + timeScope: timeScope,
  292 + frequency: form.value.scene.frequency,
  293 + resource: resList,
  294 + type : 'avg'
312 } 295 }
  296 + // let p = {
  297 + // "timeScope": timeScope,
  298 + // "frequency": form.value.scene.frequency,
  299 + // "resource": [
  300 + // {
  301 + // "resId": "F6F24DADC01ADE5DD9583144BE6E8E15",
  302 + // "kpiId": "KPI20352505",
  303 + // "kpiFlg": "mem"
  304 + // },
  305 + // {
  306 + // "resId": "C5DC239D719ACAB61231ACED7CE68CD1",
  307 + // "kpiId": "KPI7054BC34",
  308 + // "kpiFlg": "cpu"
  309 + // }
  310 + // ],
  311 + // "type": "avg"
  312 + // }
313 313
314 proxy.$http.post(`/api-web/ContrastAnalysis/getLineData`, p, function (res) { 314 proxy.$http.post(`/api-web/ContrastAnalysis/getLineData`, p, function (res) {
315 if (res && res.map) { 315 if (res && res.map) {
@@ -59,31 +59,31 @@ export default { @@ -59,31 +59,31 @@ export default {
59 return {resId: v.resId, kpiId: v.kpiId, kpiFlg: v.flag} 59 return {resId: v.resId, kpiId: v.kpiId, kpiFlg: v.flag}
60 }); 60 });
61 61
62 - // let p = {  
63 - // "timeScope": v.node.timeScope,  
64 - // "frequency": v.node.frequency,  
65 - // "resource": resList,  
66 - // "type": "avg"  
67 - // }  
68 -  
69 let p = { 62 let p = {
70 - "timeScope": 'DAY',  
71 - "frequency": '15',  
72 - "resource": [  
73 - {  
74 - "resId": "F6F24DADC01ADE5DD9583144BE6E8E15",  
75 - "kpiId": "KPI20352505",  
76 - "kpiFlg": "mem"  
77 - },  
78 - {  
79 - "resId": "C5DC239D719ACAB61231ACED7CE68CD1",  
80 - "kpiId": "KPI7054BC34",  
81 - "kpiFlg": "cpu"  
82 - }  
83 - ], 63 + "timeScope": v.node.timeScope,
  64 + "frequency": v.node.frequency,
  65 + "resource": resList,
84 "type": "avg" 66 "type": "avg"
85 } 67 }
86 68
  69 + // let p = {
  70 + // "timeScope": 'DAY',
  71 + // "frequency": '15',
  72 + // "resource": [
  73 + // {
  74 + // "resId": "F6F24DADC01ADE5DD9583144BE6E8E15",
  75 + // "kpiId": "KPI20352505",
  76 + // "kpiFlg": "mem"
  77 + // },
  78 + // {
  79 + // "resId": "C5DC239D719ACAB61231ACED7CE68CD1",
  80 + // "kpiId": "KPI7054BC34",
  81 + // "kpiFlg": "cpu"
  82 + // }
  83 + // ],
  84 + // "type": "avg"
  85 + // }
  86 +
87 proxy.$http.post(`/api-web/ContrastAnalysis/getLineData`, p, function (res) { 87 proxy.$http.post(`/api-web/ContrastAnalysis/getLineData`, p, function (res) {
88 if (res && res.map) { 88 if (res && res.map) {
89 let map = res.map; 89 let map = res.map;