ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 65ce7ea4c6b7fb5143df8e243ec38ed0d711473d 2 parents 4f1453d1 73253357

Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui into dev_gml

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
... ... @@ -62,18 +62,18 @@ function getColumns(){
}
var ips = "";
for(var index = 0;index < instances.length;index++){
var healthCss=' style="background-color: #337ab7;font-weight:normal;" ';
var runningStatusMessage = '&nbsp;&nbsp;<span class="badge" style="background-color: #5ba8de;font-weight:normal;">健康</span>';
var healthCss=' style="background-color: #5bc0de;font-weight:normal;" ';
var runningStatusMessage = '&nbsp;&nbsp;<span class="badge" style="background-color: #337ab7;font-weight:normal;">健康</span>';
if("Healthy"!=instances[index].runningStatus){
healthCss=' style="background-color: #DD514D;font-weight:normal;" ';
runningStatusMessage='&nbsp;&nbsp;<span class="badge" style="background-color: #5ba8de;font-weight:normal;">异常</span>';
runningStatusMessage='&nbsp;&nbsp;<span class="badge" style="background-color: #337ab7;font-weight:normal;">异常</span>';
}
/* var test=' <span class="badge" style="background-color: #DD514D;font-weight:normal;">异常</span>';*/
/*var test=' <span class="badge" style="background-color: #5bc0de;font-weight:normal;">异常</span>';*/
var protectedB = instances[index].protected;
var canScaleMessage='' ;
if(protectedB != null && protectedB != undefined){
if(protectedB){
canScaleMessage = '&nbsp;&nbsp;<a href="#" title="该主机免于缩减"><span class="badge" style="background-color:#337ab7;font-weight:normal;">免</span></a>';
canScaleMessage = '&nbsp;&nbsp;<a href="#" title="该主机免于缩减"><span class="badge" style="background-color:#5bc0de;font-weight:normal;">免</span></a>';
}else{
canScaleMessage = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
}
... ... @@ -173,7 +173,7 @@ function getColumns(){
+ rowData.desired + "\',\'"
+ rowData.min + "\',\'"
+ rowData.max + "\')\">").addClass(
"btn btn-xs btn-primary").html("扩充或缩减")
"btn btn-xs btn-info").html("扩充或缩减")
.appendTo(div);
return div;
},
... ...