monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 354e6130db26a0dc23125c3cf1747706b5bae579 2 parents b6586615 5c191221

Merge branch 'master-V32-XuHaoJie' into 'master' 

杭州-资源视图-华为云详情页最新优化



See merge request !169
Inline Side-by-side
Showing 2 changed files with 13 additions and 29 deletions
... ... @@ -17,7 +17,7 @@ layui.define(['commonDetail','common'], function (exports) {
}
commonDetail.bindTips();
//基本信息
var jbxxKpi = "KPIE13DD9A3,KPI9E5E1B3E,KPIF74D9D2B";
var jbxxKpi = "KPIE13DD9A3,KPI9E5E1B3E,KPIF74D9D2B,KPI1584BE1C,KPI5B7998C9";
reload()
... ... @@ -27,14 +27,14 @@ layui.define(['commonDetail','common'], function (exports) {
commonDetail.renderResHealth("huawei_cloud_plat_state",resId);
//基本信息
commonDetail.renderText("huawei_cloud_plat_baseinfo",resId,jbxxKpi);
// CPU分配率
commonDetail.renderGauge("huawei_cloud_plat_cpu_rate",resId,"KPIBFA3F5CD");
// 内存分配率
commonDetail.renderGauge("huawei_cloud_plat_mem_rate",resId,"KPIC40A80AC");
//存储空间使用率走势（12小时）
commonDetail.renderLineCharat("huawei_cloud_plat_storage_linechart",resId,"KPI5E148DBE","存储空间使用率","storage");
// CPU使用率走势(12小时)
commonDetail.renderLineCharat("huawei_cloud_plat_cpu_linechart",resId,"KPI7054BC34","CPU使用率","cpu");
// 内存使用率走势(12小时)
commonDetail.renderLineCharat("huawei_cloud_plat_memeryuse_linechart",resId,"KPI31CB8D97","内存使用率","mem");
// 存储分配率走势(12小时)
commonDetail.renderLineCharat("huawei_cloud_plat_allot_linechart",resId,"KPI46BAA9BE","存储分配率","");
// CPU分配率走势(12小时)
commonDetail.renderLineCharat("huawei_cloud_plat_cpuset_linechart",resId,"KPIBFA3F5CD","CPU分配率","");
// 内存分配率走势(12小时)
... ...
... ... @@ -13,29 +13,15 @@
<h5 class="lay-row-title">基本信息<i data-id="huawei_cloud_plat_baseinfo" class="iconfont detail_base_info">&#xe61e;</i></h5>
<ul class="info-table" id="huawei_cloud_plat_baseinfo"></ul>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">CPU分配率</h5>
<ul id="huawei_cloud_plat_cpu_rate" class="pie-wrap dasboard">
<li data-degree="0" class="pie-half pie-half-border-color-3">
<div class="pie-half-text">
<b>0%</b>
<span></span>
</div>
</li>
</ul>
<div class="lay-row-item lay-row-item--auto-width">
<div class="lay-row-item">
<h5 class="lay-row-title">存储使用率走势(12小时)</h5>
<div id="huawei_cloud_plat_storage_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">内存分配率</h5>
<ul id="huawei_cloud_plat_mem_rate" class="pie-wrap dasboard">
<li data-degree="0" class="pie-half pie-half-border-color-3">
<div class="pie-half-text">
<b>0%</b>
<span></span>
</div>
</li>
</ul>
<div class="lay-row-item lay-row-item--auto-width">
<h5 class="lay-row-title">存储分配率走势(12小时)</h5>
<div id="huawei_cloud_plat_allot_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
... ... @@ -47,8 +33,6 @@
<h5 class="lay-row-title">内存使用率走势(12小时)</h5>
<div id="huawei_cloud_plat_memeryuse_linechart" class="detail_line_chart"></div>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">CPU分配率走势(12小时)</h5>
<div id="huawei_cloud_plat_cpuset_linechart" class="detail_line_chart"></div>
... ...