monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 383a01c5d6cd40812b6be36d9e59ca519e93b06a 2 parents 05becadf 2e192251

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
@@ -392,11 +392,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -392,11 +392,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
392 ar.kpiName = ar.kpiName + tips; 392 ar.kpiName = ar.kpiName + tips;
393 menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'"; 393 menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
394 } 394 }
  395 + let unit='';
  396 + if(ar.kpiValue.indexOf('从不过期') == -1){
  397 + unit=ar.unit;
  398 + }
395 var $html = addIconByValue(valueStr); 399 var $html = addIconByValue(valueStr);
396 var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.kpiId); 400 var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.kpiId);
397 span += ' <span ' + menuId + ' style="text-align:left;width:40%">' + ar.kpiName + '</span>' + 401 span += ' <span ' + menuId + ' style="text-align:left;width:40%">' + ar.kpiName + '</span>' +
398 '<span title="' + titleStr + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">' 402 '<span title="' + titleStr + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
399 - + $html + valueStr +(ar.unit?ar.unit:'')+ '</span>'; 403 + + $html + valueStr +unit+ '</span>';
400 //补充空白区域 404 //补充空白区域
401 if (v.length < cols) { 405 if (v.length < cols) {
402 var l = cols - v.length; 406 var l = cols - v.length;