Authored by skinny.wu

Merge branch 'dev-sk'

@@ -42,8 +42,9 @@ function loadRedisMonitorData() { @@ -42,8 +42,9 @@ function loadRedisMonitorData() {
42 var cccc=obj.paramMonitor.split(";"); 42 var cccc=obj.paramMonitor.split(";");
43 43
44 awsIp += "<div class='clearfix mt20'>"; 44 awsIp += "<div class='clearfix mt20'>";
45 - awsIp += "<div class='pull-left'><h5 class='md-title nomargin'>总连接数</h5><h4 class='nomargin'>" + cccc[1].split(":")[1] + "</h4></div>";  
46 - awsIp += "<div class='pull-left' style='margin-left: 135px'><h5 class='md-title nomargin'>当前连接数</h5><h4 class='nomargin' style='margin-left: 20px'>" + cccc[2].split(":")[1] + "</h4></div>"; 45 + awsIp += "<div class='pull-left'><h5 class='md-title nomargin'>当前连接数</h5><h4 class='nomargin'>" + cccc[2].split(":")[1] + "</h4></div>";
  46 + awsIp += "<div class='pull-left' style='margin-left: 135px'><h5 class='md-title nomargin'>caps</h5><h4 class='nomargin' style='margin-left: 20px'>" + parseInt(Number(cccc[4].split(":")[1])) + "</h4></div>";
  47 + awsIp += "<div class='pull-right'><h5 class='md-title nomargin'>挂起时间</h5><h4 class='nomargin' style='margin-left: 20px'>" + parseInt(Number(cccc[3].split(":")[1])/(24 * 60 * 60)) + " 天前</h4></div>";
47 48
48 awsIp += "</div></div></div></div>"; 49 awsIp += "</div></div></div></div>";
49 } else if (obj.isFailed == 0) { 50 } else if (obj.isFailed == 0) {