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 @@ -1877,7 +1877,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
1877 * @param kpiId 指标ID 1877 * @param kpiId 指标ID
1878 * 返回报文：{"code":0,"msg":"","count":0,"data":null,"map":{"unit":"%","name":"内存使用率","id":"KPI31CB8D97","value":"33","status":null},"success":false,"obj":null} 1878 * 返回报文：{"code":0,"msg":"","count":0,"data":null,"map":{"unit":"%","name":"内存使用率","id":"KPI31CB8D97","value":"33","status":null},"success":false,"obj":null}
1879 */ 1879 */
1880 - renderTemperature: function (targetId, resId, kpiId) { 1880 + renderTemperature: function (targetId, resId, kpiId,changeColor) {
1881 var url = "/api-web/detail/real/temperature?resId=" + resId + "&kpiId=" + kpiId; 1881 var url = "/api-web/detail/real/temperature?resId=" + resId + "&kpiId=" + kpiId;
1882 admin.req({ 1882 admin.req({
1883 url: common.domainName + url 1883 url: common.domainName + url
@@ -1896,10 +1896,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -1896,10 +1896,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
1896 dataValue = '未采集'; 1896 dataValue = '未采集';
1897 } 1897 }
1898 $("#" + targetId).find(".biz-tpr").find("p").html("<b>" + dataValue + "</b><span>" + dataUnit + "</span><br>" + dataName); 1898 $("#" + targetId).find(".biz-tpr").find("p").html("<b>" + dataValue + "</b><span>" + dataUnit + "</span><br>" + dataName);
  1899 + var $groupDom = $("#" + targetId);
1899 setTimeout(function () { 1900 setTimeout(function () {
1900 var target = $('#' + targetId + ' [data-biz-degree]'); 1901 var target = $('#' + targetId + ' [data-biz-degree]');
1901 var degree = Number(target.data('biz-degree')) || 0; 1902 var degree = Number(target.data('biz-degree')) || 0;
1902 target.css('height', degree / 100 * 80 + '%'); 1903 target.css('height', degree / 100 * 80 + '%');
  1904 + //joke add 20230228
  1905 + if (changeColor){
  1906 + $groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-green');
  1907 + $groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-orange');
  1908 + $groupDom.find('.biz-tpr-target').removeClass('biz-tpr-target-red');
  1909 + if (degree < 50){
  1910 + $groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-green');
  1911 + }else if (degree < 80){
  1912 + $groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-orange');
  1913 + }else{
  1914 + $groupDom.find('.biz-tpr-target').addClass('biz-tpr-target-red');
  1915 + }
  1916 + }
1903 }, 100); 1917 }, 100);
1904 }); 1918 });
1905 }, 1919 },
@@ -29,7 +29,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { @@ -29,7 +29,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
29 //CPU信息 29 //CPU信息
30 var cpukpi = "KPI3597AB6F,KPI6232CA8F,KPI237487B8,KPIB3DBF4F3,KPIBDB60856,KPICCC3188A,KPIFB844B8B,KPI15358CE3"; 30 var cpukpi = "KPI3597AB6F,KPI6232CA8F,KPI237487B8,KPIB3DBF4F3,KPIBDB60856,KPICCC3188A,KPIFB844B8B,KPI15358CE3";
31 //磁盘信息 31 //磁盘信息
32 - var diskkpi = "KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1,KPI9D22EAB6"; 32 + var diskkpi = "KPI9D22EAB6,KPI3597AB6F,KPI29D42042,KPI4E700C08,KPI32A0A858,KPI4419E8A1";
33 //逻辑磁盘信息 33 //逻辑磁盘信息
34 var logicDiskkpi = "KPI2ED5EAD6,KPICCC3188A,KPIFB844B8B,KPIC98EA1B0,KPI29D42042"; 34 var logicDiskkpi = "KPI2ED5EAD6,KPICCC3188A,KPIFB844B8B,KPIC98EA1B0,KPI29D42042";
35 35
@@ -40,7 +40,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) { @@ -40,7 +40,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
40 //渲染页面 40 //渲染页面
41 function renderPageInfo() { 41 function renderPageInfo() {
42 //基本信息 42 //基本信息
43 - commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"true"); 43 + commonDetail.renderText("host_bmc_greatwall_baseinfo",resId,jbxxKpi,null,null,null,"false");
44 //BMCCPU使用率走势(12小时) 44 //BMCCPU使用率走势(12小时)
45 commonDetail.renderLineCharat("host_bmc_greatwall_cpu_linechart", resId, "KPI24B752B5", "BMCCPU使用率", "cpu"); 45 commonDetail.renderLineCharat("host_bmc_greatwall_cpu_linechart", resId, "KPI24B752B5", "BMCCPU使用率", "cpu");
46 //BMC内存使用率走势(12小时) 46 //BMC内存使用率走势(12小时)
@@ -20,7 +20,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function @@ -20,7 +20,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
20 } 20 }
21 commonDetail.bindTips(); 21 commonDetail.bindTips();
22 //基本信息 22 //基本信息
23 - var jbxxKpiId = 'KPIBB1082BE,KPI72E7FB4B,KPIE13DD9A3,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIF74D9D2B,KPI9F694F60,KPIDAC7AC64'; 23 + var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI9F694F60,KPIDAC7AC64,KPICA591C11,KPIBB1082BE,KPI72E7FB4B';
24 // 关键信息 24 // 关键信息
25 //2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽 25 //2020-02-07 xwx屏蔽：内存大小 与李腾飞确认采集不到，屏蔽
26 var zyxxKpiId = 'KPIA838A981,KPI4A216352,KPI1584BE1C'; 26 var zyxxKpiId = 'KPIA838A981,KPI4A216352,KPI1584BE1C';
@@ -38,7 +38,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function @@ -38,7 +38,7 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
38 //渲染页面 38 //渲染页面
39 function reload() { 39 function reload() {
40 //基本信息 40 //基本信息
41 - commonDetail.renderText('loadbalancing_jbxx', resId, jbxxKpiId,null,null,null,"true"); 41 + commonDetail.renderText('loadbalancing_jbxx', resId, jbxxKpiId,null,null,null,"false");
42 // 关键信息 42 // 关键信息
43 commonDetail.renderText('loadbalancing_zyxx', resId, zyxxKpiId); 43 commonDetail.renderText('loadbalancing_zyxx', resId, zyxxKpiId);
44 // cpu使用率 44 // cpu使用率
@@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
17 commonDetail.bindTips(); 17 commonDetail.bindTips();
18 18
19 //基本信息 19 //基本信息
20 - var jbxxKpiId = 'KPI02F41E23,KPI9F694F60,KPI35BFAE04,KPI961872D9'; 20 + var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI02F41E23,KPI9F694F60,KPI35BFAE04';
21 //重要信息 21 //重要信息
22 var zyKpiId = 'KPI8C8CDA73'; 22 var zyKpiId = 'KPI8C8CDA73';
23 //接口信息kpiids 23 //接口信息kpiids
@@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
29 function reload() { 29 function reload() {
30 //基本信息 30 //基本信息
31 commonDetail.renderText('netsafe_ads_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false"); 31 commonDetail.renderText('netsafe_ads_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
32 - //重要信息  
33 - commonDetail.renderText('netsafe_ads_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false"); 32 + //温度表
  33 + commonDetail.renderTemperature("netsafe_ads_nsfocus_wsd", resId, zyKpiId,true);
34 //CPU使用率性能曲线 34 //CPU使用率性能曲线
35 commonDetail.renderLineCharat("netsafe_ads_nsfocus_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu'); 35 commonDetail.renderLineCharat("netsafe_ads_nsfocus_cpu_linechart",resId,"KPI7054BC34","CPU使用率",'cpu');
36 //内存使用率性能曲线 36 //内存使用率性能曲线
@@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -17,7 +17,7 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
17 commonDetail.bindTips(); 17 commonDetail.bindTips();
18 18
19 //基本信息 19 //基本信息
20 - var jbxxKpiId = 'KPI02F41E23,KPI54DC5912,KPI2D507904,KPI9F694F60,KPI35BFAE04,KPI961872D9'; 20 + var jbxxKpiId = 'KPIE13DD9A3,KPIF74D9D2B,KPI02F41E23,KPI54DC5912,KPI2D507904,KPI9F694F60,KPI35BFAE04,KPI961872D9';
21 //重要信息 21 //重要信息
22 var zyKpiId = 'KPI8C8CDA73'; 22 var zyKpiId = 'KPI8C8CDA73';
23 //接口信息kpiids 23 //接口信息kpiids
@@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) { @@ -29,8 +29,8 @@ layui.define(['laypage', 'commonDetail','common'], function (exports) {
29 function reload() { 29 function reload() {
30 //基本信息 30 //基本信息
31 commonDetail.renderText('netsafe_ips_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false"); 31 commonDetail.renderText('netsafe_ips_nsfocus_jbxx',resId,jbxxKpiId,null,null,null,"false");
32 - //重要信息  
33 - commonDetail.renderText('netsafe_ips_nsfocus_zyxx',resId,zyKpiId,null,null,null,"false"); 32 + //温度表
  33 + commonDetail.renderTemperature("netsafe_ips_nsfocus_wsd", resId, zyKpiId,true);
34 //TCP每秒会话数 34 //TCP每秒会话数
35 commonDetail.renderLineCharat("netsafe_ips_nsfocus_link_linechart",resId,"KPI72FBD484","TCP每秒会话数",'session'); 35 commonDetail.renderLineCharat("netsafe_ips_nsfocus_link_linechart",resId,"KPI72FBD484","TCP每秒会话数",'session');
36 //CPU使用率性能曲线 36 //CPU使用率性能曲线
@@ -8140,3 +8140,20 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -8140,3 +8140,20 @@ form[lay-filter="activewarning-form"] .layui-inline {
8140 height: 100%; 8140 height: 100%;
8141 padding: 0 20px; 8141 padding: 0 20px;
8142 } 8142 }
  8143 +
  8144 +/* 温度计红色 joke add 20230228*/
  8145 +.biz-tpr-target-red .biz-tpr-fill:after {
  8146 + background: #D81E06;
  8147 +}
  8148 +.biz-tpr-target-red .biz-tpr-val {
  8149 + background: #D81E06;
  8150 +}
  8151 +.biz-tpr-target-red ul li:before {
  8152 + background-color: #D81E06;
  8153 +}
  8154 +.biz-tpr-target-red:before {
  8155 + border: 5px solid #D81E06;
  8156 +}
  8157 +.biz-tpr-target-red:after {
  8158 + border: 5px solid #D81E06;
  8159 +}
@@ -10,8 +10,28 @@ @@ -10,8 +10,28 @@
10 <ul class="info-table" id="netsafe_ads_nsfocus_jbxx"></ul> 10 <ul class="info-table" id="netsafe_ads_nsfocus_jbxx"></ul>
11 </div> 11 </div>
12 <div class="lay-row-item"> 12 <div class="lay-row-item">
13 - <h5 class="lay-row-title">重要信息</h5>  
14 - <ul class="info-table" id="netsafe_ads_nsfocus_zyxx"></ul> 13 + <h5 class="lay-row-title">CPU温度</h5>
  14 + <div class="detail_circular_chart" id="netsafe_ads_nsfocus_wsd">
  15 + <div class="biz-tpr">
  16 + <div class="biz-tpr-target">
  17 + <i class="biz-tpr-fill"></i>
  18 + <i class="biz-tpr-val"></i>
  19 + <ul>
  20 + <li>100</li>
  21 + <li>90</li>
  22 + <li>80</li>
  23 + <li>70</li>
  24 + <li>60</li>
  25 + <li>50</li>
  26 + <li>40</li>
  27 + <li>30</li>
  28 + <li>20</li>
  29 + <li>10</li>
  30 + </ul>
  31 + </div>
  32 + <p></p>
  33 + </div>
  34 + </div>
15 </div> 35 </div>
16 <div class="lay-row-item layui-hide secLink"> 36 <div class="lay-row-item layui-hide secLink">
17 <h5 class="lay-row-title">每秒新建连接数</h5> 37 <h5 class="lay-row-title">每秒新建连接数</h5>
@@ -10,8 +10,28 @@ @@ -10,8 +10,28 @@
10 <ul class="info-table" id="netsafe_ips_nsfocus_jbxx"></ul> 10 <ul class="info-table" id="netsafe_ips_nsfocus_jbxx"></ul>
11 </div> 11 </div>
12 <div class="lay-row-item"> 12 <div class="lay-row-item">
13 - <h5 class="lay-row-title">重要信息</h5>  
14 - <ul class="info-table" id="netsafe_ips_nsfocus_zyxx"></ul> 13 + <h5 class="lay-row-title">CPU温度</h5>
  14 + <div class="detail_circular_chart" id="netsafe_ips_nsfocus_wsd">
  15 + <div class="biz-tpr">
  16 + <div class="biz-tpr-target">
  17 + <i class="biz-tpr-fill"></i>
  18 + <i class="biz-tpr-val"></i>
  19 + <ul>
  20 + <li>100</li>
  21 + <li>90</li>
  22 + <li>80</li>
  23 + <li>70</li>
  24 + <li>60</li>
  25 + <li>50</li>
  26 + <li>40</li>
  27 + <li>30</li>
  28 + <li>20</li>
  29 + <li>10</li>
  30 + </ul>
  31 + </div>
  32 + <p></p>
  33 + </div>
  34 + </div>
15 </div> 35 </div>
16 <div class="lay-row-item"> 36 <div class="lay-row-item">
17 <h5 class="lay-row-title">TCP每秒会话数</h5> 37 <h5 class="lay-row-title">TCP每秒会话数</h5>