monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit 1ab28eddfd86eec3a08330f8220248a41d9e4445 1 parent f0f89488

chore:天津分支山石服务器、绿盟ads及绿盟ips详情页优化

Inline Side-by-side
Showing 8 changed files with 86 additions and 15 deletions
... ... @@ -1877,7 +1877,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
* @param kpiId 指标ID
* 返回报文：{"code":0,"msg":"","count":0,"data":null,"map":{"unit":"%","name":"内存使用率","id":"KPI31CB8D97","value":"33","status":null},"success":false,"obj":null}
*/
renderTemperature: function (targetId, resId, kpiId) {
renderTemperature: function (targetId, resId, kpiId,changeColor) {
var url = "/api-web/detail/real/temperature?resId=" + resId + "&kpiId=" + kpiId;
admin.req({
url: common.domainName + url
... ... @@ -1896,10 +1896,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
dataValue = '未采集';
}
$("#" + targetId).find(".biz-tpr").find("p").html("<b>" + dataValue + "</b><span>" + dataUnit + "</span><br>" + dataName);
var $groupDom = $("#" + targetId);
setTimeout(function () {
var target = $('#' + targetId + ' [data-biz-degree]');
var degree = Number(target.data('biz-degree')) || 0;
target.css('height', degree / 100 * 80 + '%');
//joke add 20230228
if (changeColor){
$groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-green');
$groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-orange');
$groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-red');
if (degree < 50){
$groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-green');
}else if (degree < 80){
$groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-orange');
}else{
$groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-red');
}
}
}, 100);
});
},
... ...
... ... @@ -29,7 +29,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
//CPU信息
var cpukpi = "KPI3597AB6F,KPI6232CA8F,KPI237487B8,KPIB3DBF4F3,KPIBDB60856,KPICCC3188A,KPIFB844B8B,KPI15358CE3";
//磁盘信息
var diskkpi = "KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1,KPI9D22EAB6";
var diskkpi = "KPI9D22EAB6,KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1";
//逻辑磁盘信息
var logicDiskkpi = "KPI2ED5EAD6,KPICCC3188A,KPIFB844B8B,KPIC98EA1B0,KPI29D42042";
... ... @@ -40,7 +40,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
//渲染页面
function renderPageInfo() {
//基本信息
commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"true");
commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"false");
//BMCCPU使用率走势(12小时)
commonDetail.renderLineCharat("host_bmc_greatwall_cpu_linechart", resId, "KPI24B752B5", "BMCCPU使用率", "cpu");
//BMC内存使用率走势(12小时)
... ...
... ... @@ -20,7 +20,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
}
commonDetail.bindTips();
//基本信息
var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B,KPI9F694F60,KPIDAC7AC64';
var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIBB1082BE,KPI72E7FB4B';
// 关键信息
//2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
var zyxxKpiId = 'KPIA838A981,KPI4A216352,KPI1584BE1C';
... ... @@ -38,7 +38,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
//渲染页面
function reload() {
//基本信息
commonDetail.renderText('loadbalancing_jbxx', resId, jbxxKpiId,null,null,null,"true");
commonDetail.renderText('loadbalancing_jbxx', resId, jbxxKpiId,null,null,null,"false");
// 关键信息
commonDetail.renderText('loadbalancing_zyxx', resId, zyxxKpiId);
// cpu使用率
... ...
... ... @@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
commonDetail.bindTips();
//基本信息
var jbxxKpiId = 'KPI02F41E23,KPI9F694F60,KPI35BFAE04,KPI961872D9';
var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI02F41E23,KPI9F694F60,KPI35BFAE04';
//重要信息
var zyKpiId = 'KPI8C8CDA73';
//接口信息kpiids
... ... @@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
function reload() {
//基本信息
commonDetail.renderText('netsafe_ads_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
//重要信息
commonDetail.renderText('netsafe_ads_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false");
//温度表
commonDetail.renderTemperature("netsafe_ads_nsfocus_wsd", resId, zyKpiId,true);
//CPU使用率性能曲线
commonDetail.renderLineCharat("netsafe_ads_nsfocus_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
//内存使用率性能曲线
... ...
... ... @@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
commonDetail.bindTips();
//基本信息
var jbxxKpiId = 'KPI02F41E23,KPI54DC5912,KPI2D507904,KPI9F694F60,KPI35BFAE04,KPI961872D9';
var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI02F41E23,KPI54DC5912,KPI2D507904,KPI9F694F60,KPI35BFAE04,KPI961872D9';
//重要信息
var zyKpiId = 'KPI8C8CDA73';
//接口信息kpiids
... ... @@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
function reload() {
//基本信息
commonDetail.renderText('netsafe_ips_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
//重要信息
commonDetail.renderText('netsafe_ips_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false");
//温度表
commonDetail.renderTemperature("netsafe_ips_nsfocus_wsd", resId, zyKpiId,true);
//TCP每秒会话数
commonDetail.renderLineCharat("netsafe_ips_nsfocus_link_linechart",resId,"KPI72FBD484","TCP每秒会话数",'session');
//CPU使用率性能曲线
... ...
... ... @@ -8140,3 +8140,20 @@ form[lay-filter="activewarning-form"] .layui-inline {
height: 100%;
padding: 0 20px;
}
/* 温度计红色 joke add 20230228*/
.biz-tpr-target-red .biz-tpr-fill:after {
background: #D81E06;
}
.biz-tpr-target-red .biz-tpr-val {
background: #D81E06;
}
.biz-tpr-target-red ul li:before {
background-color: #D81E06;
}
.biz-tpr-target-red:before {
border: 5px solid #D81E06;
}
.biz-tpr-target-red:after {
border: 5px solid #D81E06;
}
... ...
... ... @@ -10,8 +10,28 @@
<ul class="info-table" id="netsafe_ads_nsfocus_jbxx"></ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">重要信息</h5>
<ul class="info-table" id="netsafe_ads_nsfocus_zyxx"></ul>
<h5 class="lay-row-title">CPU温度</h5>
<div class="detail_circular_chart" id="netsafe_ads_nsfocus_wsd">
<div class="biz-tpr">
<div class="biz-tpr-target">
<i class="biz-tpr-fill"></i>
<i class="biz-tpr-val"></i>
<ul>
<li>100</li>
<li>90</li>
<li>80</li>
<li>70</li>
<li>60</li>
<li>50</li>
<li>40</li>
<li>30</li>
<li>20</li>
<li>10</li>
</ul>
</div>
<p></p>
</div>
</div>
</div>
<div class="lay-row-item layui-hide secLink">
<h5 class="lay-row-title">每秒新建连接数</h5>
... ...
... ... @@ -10,8 +10,28 @@
<ul class="info-table" id="netsafe_ips_nsfocus_jbxx"></ul>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">重要信息</h5>
<ul class="info-table" id="netsafe_ips_nsfocus_zyxx"></ul>
<h5 class="lay-row-title">CPU温度</h5>
<div class="detail_circular_chart" id="netsafe_ips_nsfocus_wsd">
<div class="biz-tpr">
<div class="biz-tpr-target">
<i class="biz-tpr-fill"></i>
<i class="biz-tpr-val"></i>
<ul>
<li>100</li>
<li>90</li>
<li>80</li>
<li>70</li>
<li>60</li>
<li>50</li>
<li>40</li>
<li>30</li>
<li>20</li>
<li>10</li>
</ul>
</div>
<p></p>
</div>
</div>
</div>
<div class="lay-row-item">
<h5 class="lay-row-title">TCP每秒会话数</h5>
... ...