Authored by skinny.wu

Merge branch 'dev-sk'

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