ops / monitor-ui · Commits

Go to a project

Authored by lingmin
Commit 33b5d4d6310368a1f8007e17c4879866ed96391f 1 parent e59a72e4

update

Inline Side-by-side
Showing 3 changed files with 84 additions and 12 deletions
@@ -409,7 +409,14 @@ @@ -409,7 +409,14 @@
409 var content = ""; 409 var content = "";
410 if(rowData.timeoutInfo != null){ 410 if(rowData.timeoutInfo != null){
411 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 411 for(var i = 0;i<rowData.timeoutInfo.length;i++){
412 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 412 + var temp = new Array();
  413 + temp = rowData.timeoutInfo[i].split("+---");
  414 + if(temp != null && temp.length>0){
  415 + for(var j = 0;j<temp.length;j++){
  416 + content= content + temp[j] + "<br>";
  417 + }
  418 + }
  419 + content= content +"<br><br>";
413 } 420 }
414 } 421 }
415 editBtn.click(function () { 422 editBtn.click(function () {
@@ -541,7 +548,14 @@ @@ -541,7 +548,14 @@
541 var content = ""; 548 var content = "";
542 if(rowData.timeoutInfo != null){ 549 if(rowData.timeoutInfo != null){
543 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 550 for(var i = 0;i<rowData.timeoutInfo.length;i++){
544 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 551 + var temp = new Array();
  552 + temp = rowData.timeoutInfo[i].split("+---");
  553 + if(temp != null && temp.length>0){
  554 + for(var j = 0;j<temp.length;j++){
  555 + content= content + temp[j] + "<br>";
  556 + }
  557 + }
  558 + content= content +"<br><br>";
545 } 559 }
546 } 560 }
547 editBtn.click(function () { 561 editBtn.click(function () {
@@ -673,7 +687,14 @@ @@ -673,7 +687,14 @@
673 var content = ""; 687 var content = "";
674 if(rowData.timeoutInfo != null){ 688 if(rowData.timeoutInfo != null){
675 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 689 for(var i = 0;i<rowData.timeoutInfo.length;i++){
676 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 690 + var temp = new Array();
  691 + temp = rowData.timeoutInfo[i].split("+---");
  692 + if(temp != null && temp.length>0){
  693 + for(var j = 0;j<temp.length;j++){
  694 + content= content + temp[j] + "<br>";
  695 + }
  696 + }
  697 + content= content +"<br><br>";
677 } 698 }
678 } 699 }
679 editBtn.click(function () { 700 editBtn.click(function () {
@@ -168,7 +168,14 @@ @@ -168,7 +168,14 @@
168 var content = ""; 168 var content = "";
169 if(rowData.timeoutInfo != null){ 169 if(rowData.timeoutInfo != null){
170 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 170 for(var i = 0;i<rowData.timeoutInfo.length;i++){
171 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 171 + var temp = new Array();
  172 + temp = rowData.timeoutInfo[i].split("+---");
  173 + if(temp != null && temp.length>0){
  174 + for(var j = 0;j<temp.length;j++){
  175 + content= content + temp[j] + "<br>";
  176 + }
  177 + }
  178 + content= content +"<br><br>";
172 } 179 }
173 } 180 }
174 editBtn.click(function () { 181 editBtn.click(function () {
@@ -262,7 +269,14 @@ @@ -262,7 +269,14 @@
262 var content = ""; 269 var content = "";
263 if(rowData.timeoutInfo != null){ 270 if(rowData.timeoutInfo != null){
264 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 271 for(var i = 0;i<rowData.timeoutInfo.length;i++){
265 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 272 + var temp = new Array();
  273 + temp = rowData.timeoutInfo[i].split("+---");
  274 + if(temp != null && temp.length>0){
  275 + for(var j = 0;j<temp.length;j++){
  276 + content= content + temp[j] + "<br>";
  277 + }
  278 + }
  279 + content= content +"<br><br>";
266 } 280 }
267 } 281 }
268 editBtn.click(function () { 282 editBtn.click(function () {
@@ -458,7 +458,14 @@ @@ -458,7 +458,14 @@
458 var content = ""; 458 var content = "";
459 if(rowData.timeoutInfo != null){ 459 if(rowData.timeoutInfo != null){
460 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 460 for(var i = 0;i<rowData.timeoutInfo.length;i++){
461 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 461 + var temp = new Array();
  462 + temp = rowData.timeoutInfo[i].split("+---");
  463 + if(temp != null && temp.length>0){
  464 + for(var j = 0;j<temp.length;j++){
  465 + content= content + temp[j] + "<br>";
  466 + }
  467 + }
  468 + content= content +"<br><br>";
462 } 469 }
463 } 470 }
464 editBtn.click(function () { 471 editBtn.click(function () {
@@ -521,8 +528,16 @@ @@ -521,8 +528,16 @@
521 width: "10%" 528 width: "10%"
522 },{ 529 },{
523 title: "服务名", 530 title: "服务名",
524 - field: "serviceName",  
525 - width: "10%" 531 + field: "serviceNames",
  532 + width: "10%",
  533 + formatter:function(value, rowData, rowIndex){
  534 + var serviceNames = rowData.serviceNames;
  535 + if(serviceNames == null || serviceNames==""){
  536 + serviceNames = $("#searchApiName").select("getText");
  537 + }
  538 + return serviceNames;
  539 + }
  540 + }, {
526 }, { 541 }, {
527 title: "总请求次数", 542 title: "总请求次数",
528 field: "totalCount", 543 field: "totalCount",
@@ -578,7 +593,14 @@ @@ -578,7 +593,14 @@
578 var content = ""; 593 var content = "";
579 if(rowData.timeoutInfo != null){ 594 if(rowData.timeoutInfo != null){
580 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 595 for(var i = 0;i<rowData.timeoutInfo.length;i++){
581 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 596 + var temp = new Array();
  597 + temp = rowData.timeoutInfo[i].split("+---");
  598 + if(temp != null && temp.length>0){
  599 + for(var j = 0;j<temp.length;j++){
  600 + content= content + temp[j] + "<br>";
  601 + }
  602 + }
  603 + content= content +"<br><br>";
582 } 604 }
583 } 605 }
584 editBtn.click(function () { 606 editBtn.click(function () {
@@ -640,8 +662,16 @@ @@ -640,8 +662,16 @@
640 sortable:true 662 sortable:true
641 }, { 663 }, {
642 title: "服务名", 664 title: "服务名",
643 - field: "serviceName",  
644 - width: "10%" 665 + field: "serviceNames",
  666 + width: "10%",
  667 + formatter:function(value, rowData, rowIndex){
  668 + var serviceNames = rowData.serviceNames;
  669 + if(serviceNames == null || serviceNames==""){
  670 + serviceNames = $("#searchApiName").select("getText");
  671 + }
  672 + return serviceNames;
  673 + }
  674 + }, {
645 },{ 675 },{
646 title: "网络归属", 676 title: "网络归属",
647 field: "type", 677 field: "type",
@@ -702,7 +732,14 @@ @@ -702,7 +732,14 @@
702 var content = ""; 732 var content = "";
703 if(rowData.timeoutInfo != null){ 733 if(rowData.timeoutInfo != null){
704 for(var i = 0;i<rowData.timeoutInfo.length;i++){ 734 for(var i = 0;i<rowData.timeoutInfo.length;i++){
705 - content= content +rowData.timeoutInfo[i]+"<br><br>"; 735 + var temp = new Array();
  736 + temp = rowData.timeoutInfo[i].split("+---");
  737 + if(temp != null && temp.length>0){
  738 + for(var j = 0;j<temp.length;j++){
  739 + content= content + temp[j] + "<br>";
  740 + }
  741 + }
  742 + content= content +"<br><br>";
706 } 743 }
707 } 744 }
708 editBtn.click(function () { 745 editBtn.click(function () {