ops / monitor-ui · Commits

Go to a project

Authored by fanzelei
Commit 078814855cbe78bcaf8e34aac423a49ae7e594e7 2 parents e36f6749 ff162402

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

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
... ... @@ -87,7 +87,6 @@
</div>
<!-- /.modal -->
</div>
<div id="testDiv"></div>
</div>
</body>
<script src="<%=basePath %>script/common/genarate_left_panel.js"></script>
... ... @@ -140,7 +139,8 @@
var cccc=obj.paramMonitor.split(";");
awsIp=awsIp+"<br/>"+cccc[1]+"<br/>"+cccc[2]+'</button>';
} else if (obj.isFailed == 0) {
awsIp += '<button class="btn_java_api btn btn-lg btn-default btn-danger" style="margin-top:5px;margin-left:5px;width: 165px;text-align:left;font-size: 12px;">' + obj.nodeTo + '</button>';
awsIp += '<button class="btn_java_api btn btn-lg btn-default btn-danger" style="margin-top:5px;margin-left:5px;width: 165px;text-align:left;font-size: 12px;">' + obj.nodeTo;
awsIp=awsIp+"<br/>"+obj.paramMonitor+ '</button>';
}
} else if (obj.nodeTo.indexOf("10") == 0) {
qcloudAcount = qcloudAcount + 1;
... ... @@ -149,7 +149,8 @@
var cccc=obj.paramMonitor.split(";");
qcoloudIp=qcoloudIp+"<br/>"+cccc[1]+"<br/>"+cccc[2]+'</button>';
} else if (obj.isFailed == 0) {
qcoloudIp += '<button class="btn_java_api btn btn-lg btn-default btn-danger" style="margin-top:5px;margin-left:5px;width: 165px;text-align:left;font-size: 12px;">' + obj.nodeTo + '</button>';
qcoloudIp += '<button class="btn_java_api btn btn-lg btn-default btn-danger" style="margin-top:5px;margin-left:5px;width: 165px;text-align:left;font-size: 12px;">' + obj.nodeTo;
qcoloudIp=qcoloudIp+"<br/>"+obj.paramMonitor+ '</button>';
}
}
return true;
... ...