monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a4ad5fc8f19fd33b72a89bb43f035275563d453d 2 parents 69cfd62a 8dc2539c

Merge branch 'master-yuanjinpeng' into 'master' 

虚拟内存flag统一从vmem为mem

虚拟内存flag统一从vmem为mem

See merge request !1067
Inline Side-by-side
Showing 5 changed files with 5 additions and 5 deletions
... ... @@ -76,7 +76,7 @@ layui.define(['commonDetail','common','sessions'], function (exports) {
//内存使用率走势（12小时）
commonDetail.renderLineCharat('hostminicomputerpartition_memoryrun',resId,memoryRunKpiId,'内存使用率','mem');
//虚拟内存使用率走势（12小时）
commonDetail.renderLineCharat('hostminicomputerpartition_vmemoryrun',resId,vmemoryRunKpiId,'虚拟内存使用率','vmem');
commonDetail.renderLineCharat('hostminicomputerpartition_vmemoryrun',resId,vmemoryRunKpiId,'虚拟内存使用率','mem');
//文件系统
commonDetail.renderTable('hostminicomputerpartition_sysfile',false,resId,sysfileKpiId,'文件系统','fs');
//网卡信息
... ...
... ... @@ -558,7 +558,7 @@
</script>
<!--虚拟内存使用率-->
<script type="text/html" id="vmmemoryRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="vmem" data-name="虚拟内存使用率"
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="mem" data-name="虚拟内存使用率"
data-warning="1" data-ident="1" data-trend="1">
<div class="layui-progress layui-progress-big" lay-showpercent="true">
<div class="layui-progress-bar layui-bg-green"
... ...
... ... @@ -588,7 +588,7 @@
</script>
<!--虚拟内存使用率-->
<script type="text/html" id="vmmemoryRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="vmem" data-name="虚拟内存使用率"
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="mem" data-name="虚拟内存使用率"
data-warning="1" data-ident="1" data-trend="1">
<div class="layui-progress layui-progress-big" lay-showpercent="true">
<div class="layui-progress-bar layui-bg-green {{ d.vmmemoryUseRate >= 95 ? 'layui-bg-red' : (d.vmmemoryUseRate >= 90 ? 'layui-bg-orange' : (d.vmmemoryUseRate >= 80 ? 'layui-bg-blue':''))}}"
... ...
... ... @@ -665,7 +665,7 @@
</script>
<!--虚拟内存使用率-->
<script type="text/html" id="vmmemoryRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="vmem" data-name="虚拟内存使用率"
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag=mem" data-name="虚拟内存使用率"
data-warning="1" data-ident="1" data-trend="1">
<div class="layui-progress layui-progress-big" lay-showpercent="true">
<div class="layui-progress-bar layui-bg-green {{ d.vmmemoryUseRate >= 95 ? 'layui-bg-red' : (d.vmmemoryUseRate >= 90 ? 'layui-bg-orange' : (d.vmmemoryUseRate >= 80 ? 'layui-bg-blue':''))}}"
... ...
... ... @@ -665,7 +665,7 @@
</script>
<!--虚拟内存使用率-->
<script type="text/html" id="vmmemoryRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="vmem" data-name="虚拟内存使用率"
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI20352505" data-flag="mem" data-name="虚拟内存使用率"
data-warning="1" data-ident="1" data-trend="1">
<div class="layui-progress layui-progress-big" lay-showpercent="true">
<div class="layui-progress-bar layui-bg-green {{ d.vmmemoryUseRate >= 95 ? 'layui-bg-red' : (d.vmmemoryUseRate >= 90 ? 'layui-bg-orange' : (d.vmmemoryUseRate >= 80 ? 'layui-bg-blue':''))}}"
... ...