ops / monitor-ui · Commits

Go to a project

Authored by simba
Commit 7e898ccc22272da3414b946ec6240bb53a6450d2 2 parents 3731537b 5c8af09c

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

Inline Side-by-side
Showing 2 changed files with 9 additions and 7 deletions
@@ -55,13 +55,13 @@ @@ -55,13 +55,13 @@
55 var initDashBoard = function (data) { 55 var initDashBoard = function (data) {
56 var div_dash = $(".api_info_container"); 56 var div_dash = $(".api_info_container");
57 $.each(data, function (idx, val) { 57 $.each(data, function (idx, val) {
58 - var api_info_item = $('<div class="api_info_item col-xs-4 ">'); 58 + var api_info_item = $('<div class="api_info_item col-xs-3 ">');
59 var api_info_item_panel = $(' <div class="panel panel-default">'); 59 var api_info_item_panel = $(' <div class="panel panel-default">');
60 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>'); 60 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>');
61 var api_info_item_panel_body = $('<div class="panel-body">'); 61 var api_info_item_panel_body = $('<div class="panel-body">');
62 api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_1_' + val.typeId + '">AWS &nbsp;<span class="badge"></span></button>'); 62 api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_1_' + val.typeId + '">AWS &nbsp;<span class="badge"></span></button>');
63 api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_2_' + val.typeId + '">QCloud &nbsp;<span class="badge"></span></button>'); 63 api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_2_' + val.typeId + '">QCloud &nbsp;<span class="badge"></span></button>');
64 - api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_3_' + val.typeId + '">其他 &nbsp;<span class="badge"></span></button>'); 64 +// api_info_item_panel_body.append('<button class="btn_java_api btn btn-lg btn-default" id="btn_3_' + val.typeId + '">其他 &nbsp;<span class="badge"></span></button>');
65 // api_info_item_panel_body.append('<h5 >更新时间:<span id="span_time_'+val.typeId+'"></span></h5>'); 65 // api_info_item_panel_body.append('<h5 >更新时间:<span id="span_time_'+val.typeId+'"></span></h5>');
66 api_info_item_panel.append(api_info_item_panel_title) 66 api_info_item_panel.append(api_info_item_panel_title)
67 .append(api_info_item_panel_body); 67 .append(api_info_item_panel_body);
@@ -112,6 +112,8 @@ @@ -112,6 +112,8 @@
112 112
113 $.each(data.data, function (idx, val) { 113 $.each(data.data, function (idx, val) {
114 console.log($("#btn_" + val.cloudType + "_" + val.serviceType)); 114 console.log($("#btn_" + val.cloudType + "_" + val.serviceType));
  115 + if(val.cloudType!=1&&val.cloudType!=2)//目前只有腾讯aws
  116 + return;
115 var btn = $("#btn_" + val.cloudType + "_" + val.serviceType); 117 var btn = $("#btn_" + val.cloudType + "_" + val.serviceType);
116 if (val.updateTime != undefined && val.updateTime != "") { 118 if (val.updateTime != undefined && val.updateTime != "") {
117 119
@@ -149,12 +149,12 @@ @@ -149,12 +149,12 @@
149 $.each(apps, function (idx, val) { 149 $.each(apps, function (idx, val) {
150 var span; 150 var span;
151 if (toggle == 1) { 151 if (toggle == 1) {
152 - span = $("<button class='btn btn-success btn-xs tag_javaapp has-popover' >").attr("id", "span_" + serviceId + "_" + val.moId).html(val.moHostIp); 152 + span = $("<button class='btn btn-default btn-xs tag_javaapp has-popover' >").attr("id", "span_" + serviceId + "_" + val.moId).html(val.moHostIp);
153 span.attr("data-toggle", "popover"); 153 span.attr("data-toggle", "popover");
154 span.attr("data-placement", "bottom"); 154 span.attr("data-placement", "bottom");
155 span.attr("data-html", "true"); 155 span.attr("data-html", "true");
156 // span.attr("title", "message"); 156 // span.attr("title", "message");
157 - // span.attr("data-content", "message"); 157 + span.attr("data-content", "unkown");
158 } else { 158 } else {
159 span = $("<button class='btn btn-inverse btn-xs tag_javaapp' >").attr("id", "span_no_" + serviceId + "_" + val.moId).html(val.moHostIp); 159 span = $("<button class='btn btn-inverse btn-xs tag_javaapp' >").attr("id", "span_no_" + serviceId + "_" + val.moId).html(val.moHostIp);
160 } 160 }
@@ -173,16 +173,16 @@ @@ -173,16 +173,16 @@
173 var content = "start: " + statusObj.startTime + " "; 173 var content = "start: " + statusObj.startTime + " ";
174 content += "end: " + statusObj.endTime + " "; 174 content += "end: " + statusObj.endTime + " ";
175 content += "cost: " + statusObj.costTime + "ms<br>"; 175 content += "cost: " + statusObj.costTime + "ms<br>";
176 - 176 + $("#" + id).removeClass('btn-default');
177 if (statusObj.status == 0) { 177 if (statusObj.status == 0) {
178 content += "exception: " + statusObj.exception; 178 content += "exception: " + statusObj.exception;
179 - if ($("#" + id).hasClass('btn-success')) { 179 + if (!$("#" + id).hasClass('btn-danger')) {
180 $("#" + id).removeClass('btn-success'); 180 $("#" + id).removeClass('btn-success');
181 $("#" + id).addClass('btn-danger'); 181 $("#" + id).addClass('btn-danger');
182 } 182 }
183 } 183 }
184 else { 184 else {
185 - if ($("#" + id).hasClass('btn-danger')) { 185 + if (!$("#" + id).hasClass('btn-success')) {
186 $("#" + id).removeClass('btn-danger'); 186 $("#" + id).removeClass('btn-danger');
187 $("#" + id).addClass('btn-success'); 187 $("#" + id).addClass('btn-success');
188 } 188 }