ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 6ccbabb1949e81efffb4d4ea615082ddacda0484 1 parent 942fc72b

监控去掉aws

Inline Side-by-side
Showing 3 changed files with 27 additions and 20 deletions
... ... @@ -35,20 +35,27 @@
</div>
<div class="widget-content nopadding">
<div class="widget-title" style="height: 400px;">
<div class="col-sm-5 control-label" role="form" id="chartterDiv"
<%--<div class="col-sm-5 control-label" role="form" id="chartterDiv"
style=" margin-top: 12px;margin-left: 10px;">
<div id="costAwsCharts" class="input-group" style="height: 380px;width: 760px">
</div>
</div>
</div>--%>
<div class="col-sm-5 control-label" role="form" id="chartterDiv1"
style=" margin-top: 12px;margin-left: 25px;float: left;">
<div id="costQcloudCharts" class="input-group"
style="height: 380px;width: 760px;margin-left: 100px">
</div>
</div>
<div class="col-sm-5 control-label" role="form" id="chartterDiv4"
style=" margin-top: 12px;margin-left: 25px;float: left;">
<div id="timesQcloudCharts" class="input-group"
style="height: 380px;width: 760px;margin-left: 100px">
</div>
</div>
</div>
<div class="widget-title" style="height: 400px;">
<%--<div class="widget-title" style="height: 400px;">
<div class="col-sm-5 control-label" role="form" id="chartterDiv3"
style=" margin-top: 12px;margin-left: 10px;">
<div id="timesAwsCharts" class="input-group" style="height: 380px;width: 760px">
... ... @@ -60,7 +67,7 @@
style="height: 380px;width: 760px;margin-left: 100px">
</div>
</div>
</div>
</div>--%>
</div>
</div>
... ... @@ -252,9 +259,9 @@
$(function () {
//更新曲线图
getLineDate(1, 1);
//getLineDate(1, 1);
getLineDate(1, 2);
getLineDate(2, 1);
//getLineDate(2, 1);
getLineDate(2, 2);
// $("#searchApiName").select({
... ...
... ... @@ -35,18 +35,28 @@
</div>
<div class="widget-content nopadding">
<div class="widget-title" style="height: 400px;">
<%--
<div class="col-sm-5 control-label" role="form" id="chartterDiv"
style=" margin-top: 12px;margin-left: 10px;">
<div id="costAwsCharts" class="input-group" style="height: 380px;width: 760px">
</div>
</div>
--%>
<div class="col-sm-5 control-label" role="form" id="chartterDiv1"
style=" margin-top: 12px;margin-left: 25px;float: left;">
<div id="costQcloudCharts" class="input-group"
style="height: 380px;width: 760px;margin-left: 100px">
</div>
</div>
<div class="col-sm-5 control-label" role="form" id="chartterDiv4"
style=" margin-top: 12px;margin-left: 25px;float: left;">
<div id="timesQcloudCharts" class="input-group"
style="height: 380px;width: 760px;margin-left: 100px">
</div>
</div>
</div>
<%--
<div class="widget-title" style="height: 400px;">
<div class="col-sm-5 control-label" role="form" id="chartterDiv3"
... ... @@ -61,6 +71,7 @@
</div>
</div>
</div>
--%>
</div>
</div>
... ... @@ -234,10 +245,10 @@
json2.series = qcData;
if (type == 1) {
$('#costAwsCharts').highcharts(json1);
//$('#costAwsCharts').highcharts(json1);
$('#costQcloudCharts').highcharts(json2);
} else {
$('#timesAwsCharts').highcharts(json1);
//$('#timesAwsCharts').highcharts(json1);
$('#timesQcloudCharts').highcharts(json2);
}
}
... ...
... ... @@ -79,17 +79,6 @@
</div>
<div class="widget-content">
<div class="row api_info_container">
<%--<div class="api_info_item col-xs-3 ">--%>
<%--<div class="panel panel-default">--%>
<%--<div class="panel-heading">gateway</div>--%>
<%--<div class="panel-body">--%>
<%--<h3><span class="label label-default">AWS状态</span>--%>
<%--<span class="label label-default">Gcloud状态</span>--%>
<%--</h3>--%>
<%--<span>更新时间</span>--%>
<%--</div>--%>
<%--</div>--%>
<%--</div>--%>
</div>
</div>
</div>
... ... @@ -133,7 +122,7 @@
var api_info_item_panel = $(' <div class="panel panel-default">');
var api_info_item_panel_title = $('<div class="item_java_api_title panel-heading">' + val.typeName + '<span style="font-size: medium;float: right;padding-top: 15px"><span id="span_time_' + val.typeId + '"></span></span></div>');
var api_info_item_panel_body = $('<div class="panel-body">');
api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_1_1_' + val.typeId + '">AWS &nbsp;<span class="badge"></span></button>');
//api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_1_1_' + val.typeId + '">AWS &nbsp;<span class="badge"></span></button>');
api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_2_21_' + val.typeId + '">QCloud &nbsp;<span class="badge"></span></button>');
api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_2_22_' + val.typeId + '">QCloudaz2 &nbsp;<span class="badge"></span></button>');
api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_0_0_' + val.typeId + '">Custom &nbsp;<span class="badge"></span></button>');
... ...