ops / monitor-ui · Commits

Go to a project

Authored by lingmin
Commit 14552ab10933b42a7f7f24362deed04bd6756b4c 1 parent 33b5d4d6

update

Inline Side-by-side
Showing 2 changed files with 9 additions and 11 deletions
@@ -459,10 +459,10 @@ @@ -459,10 +459,10 @@
459 var end = paramObj.endTime.split(" "); 459 var end = paramObj.endTime.split(" ");
460 460
461 var div = $("<div>"); 461 var div = $("<div>");
462 - var editBtn = $("<button>").addClass("btn btn-xs btn-success").html(rowData.apiName).appendTo(div); 462 + var editBtn = $("<button>").addClass("btn btn-xs btn-success").css("height","35px").html(rowData.apiName).appendTo(div);
463 editBtn.click(function () { 463 editBtn.click(function () {
464 var dialog = $("<div>").appendTo($("body")); 464 var dialog = $("<div>").appendTo($("body"));
465 - var url = contextPath + "/javaApiMonitor/toJavaIpInfoList?serviceName="+serviceName+"&apiName="+rowData.apiName+"&serviceType="+serviceType+"&cloudType="+$("#cloudType").val() 465 + var url = contextPath + "/javaApiMonitor/toJavaIpInfoList?serviceName="+rowData.serviceName+"&apiName="+rowData.apiName+"&cloudType="+$("#cloudType").val()
466 +"&startTime1="+start[0]+"&startTime2="+start[1]+"&endTime1="+end[0]+"&endTime2="+end[1]; 466 +"&startTime1="+start[0]+"&startTime2="+start[1]+"&endTime1="+end[0]+"&endTime2="+end[1];
467 dialog.dialog({ 467 dialog.dialog({
468 backdrop: "static", 468 backdrop: "static",
@@ -598,10 +598,10 @@ @@ -598,10 +598,10 @@
598 var end = paramObj.endTime.split(" "); 598 var end = paramObj.endTime.split(" ");
599 599
600 var div = $("<div>"); 600 var div = $("<div>");
601 - var editBtn = $("<button>").addClass("btn btn-xs btn-success").html(rowData.apiName).appendTo(div); 601 + var editBtn = $("<button>").addClass("btn btn-xs btn-success").css("height","35px").html(rowData.apiName).appendTo(div);
602 editBtn.click(function () { 602 editBtn.click(function () {
603 var dialog = $("<div>").appendTo($("body")); 603 var dialog = $("<div>").appendTo($("body"));
604 - var url = contextPath + "/javaApiMonitor/toJavaIpInfoList?serviceName="+serviceName+"&apiName="+rowData.apiName+"&serviceType="+serviceType+"&cloudType="+$("#cloudType").val() 604 + var url = contextPath + "/javaApiMonitor/toJavaIpInfoList?serviceName="+rowData.serviceName+"&apiName="+rowData.apiName+"&cloudType="+$("#cloudType").val()
605 +"&startTime1="+start[0]+"&startTime2="+start[1]+"&endTime1="+end[0]+"&endTime2="+end[1]; 605 +"&startTime1="+start[0]+"&startTime2="+start[1]+"&endTime1="+end[0]+"&endTime2="+end[1];
606 dialog.dialog({ 606 dialog.dialog({
607 backdrop: "static", 607 backdrop: "static",
@@ -537,8 +537,7 @@ @@ -537,8 +537,7 @@
537 } 537 }
538 return serviceNames; 538 return serviceNames;
539 } 539 }
540 - }, {  
541 - }, { 540 + },{
542 title: "总请求次数", 541 title: "总请求次数",
543 field: "totalCount", 542 field: "totalCount",
544 width: "10%", 543 width: "10%",
@@ -661,6 +660,10 @@ @@ -661,6 +660,10 @@
661 width: "10%", 660 width: "10%",
662 sortable:true 661 sortable:true
663 }, { 662 }, {
  663 + title: "网络归属",
  664 + field: "type",
  665 + width: "10%"
  666 + }, {
664 title: "服务名", 667 title: "服务名",
665 field: "serviceNames", 668 field: "serviceNames",
666 width: "10%", 669 width: "10%",
@@ -672,11 +675,6 @@ @@ -672,11 +675,6 @@
672 return serviceNames; 675 return serviceNames;
673 } 676 }
674 }, { 677 }, {
675 - },{  
676 - title: "网络归属",  
677 - field: "type",  
678 - width: "10%"  
679 - }, {  
680 title: "总请求次数", 678 title: "总请求次数",
681 field: "totalCount", 679 field: "totalCount",
682 width: "10%", 680 width: "10%",