monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit e0370a1ab5197ecd0cddc8494fbeb3f9f18d916d 2 parents dfcdff48 3d725b9f

Merge branch 'master-v32-xwx' into 'master' 

杭州-资源视图-屏蔽采集不到的指标



See merge request !344
Inline Side-by-side
Showing 7 changed files with 33 additions and 21 deletions
... ... @@ -15,8 +15,9 @@ layui.define(['commonDetail','common'], function (exports) {
}
commonDetail.bindTips();
//基本信息
var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1,KPIE6A60DBD," +
"KPI67AC023C,KPI0990CD44,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4";
//2020-02-07 xwx屏蔽：Vcpu核数，频率 与李腾飞确认采集不到，屏蔽
var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI159D23D6,KPIEA270DAB,KPI1635BB9B,KPID7BE5E90,KPIF6A66270,KPI4419E8A1," +
"KPI67AC023C,KPI1584BE1C,KPI191373C6,KPI29D42042,KPI9B34D90F,KPI81BAB2C4";
reload()
... ...
... ... @@ -22,13 +22,16 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
//基本信息
var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B';
// 关键信息
var zyxxKpiId = 'KPIA838A981,KPI1584BE1C,KPI4A216352';
//2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
var zyxxKpiId = 'KPIA838A981,KPI4A216352';
// 风扇信息
var haKpiIds = 'KPI28C9A37D,KPIF5D53796,KPI1A9360B6';
// 硬盘信息
var diskKpiIds = 'KPI9D22EAB6,KPI7E96CACC,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
//2020-02-07 xwx屏蔽：硬盘温度 与李腾飞确认采集不到，屏蔽
var diskKpiIds = 'KPI9D22EAB6,KPI29D42042,KPI1988842F,KPI50331084,KPI2C8A6D17';
// 虚拟服务信息
var vsKpiIds = 'KPIFABFD741,KPIFB844B8B,KPI9B417789,KPI2DC9105C,KPI39C76443';
//2020-02-07 xwx屏蔽：启动状态，IP地址,端口号 与李腾飞确认采集不到，屏蔽
var vsKpiIds = 'KPIFABFD741';
reload()
... ...
... ... @@ -19,7 +19,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
//基本信息
var jbxxKpiId = 'KPI9F694F60,KPIBB1082BE,KPIDAC7AC64,KPICA591C11';
//接口信息kpiids
var interfaceinfoKpis = 'KPI49ACAAFD,KPI1A03F672,KPIB6D0352E,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIBD006E36,KPIE4B51D5C,KPI7E81DFB5,KPIA3A74798';
//2020-02-07 xwx屏蔽：MTU，工作模式，管理状态，接口IP 与李腾飞确认采集不到，屏蔽
var interfaceinfoKpis = 'KPI49ACAAFD,KPIACCFFE79,KPI59BE184A,KPIF00B5E20,KPIE4B51D5C,KPI7E81DFB5';
reload()
... ...
... ... @@ -80,17 +80,18 @@
<h5 class="lay-row-title">网络流出速率</h5>
<div id="huawei_cloud_physics_out_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">磁盘IO写入</h5>
<div id="huawei_cloud_physics_disk_write_linechart" class="detail_line_chart"></div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">磁盘IO读出</h5>
<div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>
</div>
</div>
<!-- 2022-01-07 xwx注 与李腾飞确认屏蔽-->
<!-- <div class="lay-row">-->
<!-- <div class="lay-row-item">-->
<!-- <h5 class="lay-row-title">磁盘IO读出</h5>-->
<!-- <div id="huawei_cloud_physics_disk_read_linechart" class="detail_line_chart"></div>-->
<!-- </div>-->
<!-- </div>-->
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
... ...
... ... @@ -45,14 +45,15 @@
</ul>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">风扇信息
<span id="loadbalancing_fanDownload" class="layui-table-link" style="margin-left: 10px;">下载</span>
<span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>
<div id="loadbalancing_fan"></div>
</div>
</div>
<!-- 2022-01-07 xwx注 与李腾飞确认屏蔽-->
<!-- <div class="lay-row">-->
<!-- <div class="lay-row-item">-->
<!-- <h5 class="lay-row-title">风扇信息-->
<!-- <span id="loadbalancing_fanDownload" class="layui-table-link" style="margin-left: 10px;">下载</span>-->
<!-- <span id="loadbalancing_fanMore" class="layui-table-link">更多</span></h5>-->
<!-- <div id="loadbalancing_fan"></div>-->
<!-- </div>-->
<!-- </div>-->
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">硬盘信息
... ...
... ... @@ -20,7 +20,8 @@ layui.define(['commonDetail','common'], function (exports) {
}
commonDetail.bindTips();
//基本信息
var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI4419E8A1,KPIA47DE8B4,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E, KPI14E5F9B4, KPIC70A1E3D";
//2020-02-07 xwx屏蔽：设备序列号，IPV6地址 与李腾飞确认采集不到，屏蔽
var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPIFABFD741,KPIB718ADEC,KPI5858832B,KPI2DC9105C,KPI7E81DFB5,KPI6F17667E, KPIF21A9F60, KPI81BAB2C4, KPI5364695E, KPI14E5F9B4, KPIC70A1E3D";
reload()
... ...
... ... @@ -60,6 +60,8 @@ export default {
//点击标签进行搜索
const changeTag = (status) => {
currentPage.value=1;
pageSize.value=10;
checkedId.value = status;
keyword.value=status;
getDataList();
... ... @@ -133,6 +135,8 @@ export default {
}
// 点击按钮搜索
let onBtnSearch = () => {
currentPage.value=1;
pageSize.value=10;
getDataList();
}
//获取缓存数据
... ...