diff --git a/Bench4Q-Web/src/main/webapp/i18n/i18n.properties b/Bench4Q-Web/src/main/webapp/i18n/i18n.properties index 2bb0b224..7971976f 100644 --- a/Bench4Q-Web/src/main/webapp/i18n/i18n.properties +++ b/Bench4Q-Web/src/main/webapp/i18n/i18n.properties @@ -52,7 +52,7 @@ failed-connect-server=failed to connect server close-proxy-setting=clear the proxy setting custom-mode=custom mode target-mode=target mode -memoryUsedPercent=Memory(%) -processorTimePercent=Processor Time(%) -userTimePercent=User Time(%) -privilegedTimePercent=Privileged Time(%) \ No newline at end of file +MemoryUsedPercent=Memory(%) +ProcessorTimePercent=Processor Time(%) +UserTimePercent=User Time(%) +PrivilegedTimePercent=Privileged Time(%) \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties b/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties index 968a998e..884064cf 100644 --- a/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties +++ b/Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties @@ -48,7 +48,7 @@ failed-connect-server=\u8FDE\u63A5\u670D\u52A1\u5668\u5931\u8D25\uFF01 close-proxy-setting=\u8BF7\u5173\u95ED\u4EE3\u7406 custom-mode=\u5E38\u89C4\u6A21\u5F0F target-mode=\u76EE\u6807\u6A21\u5F0F -memoryUsedPercent=\u5185\u5B58% -processorTimePercent=\u5904\u7406\u673A\u65F6\u95F4% -userTimePercent=\u7528\u6237\u65F6\u95F4% -privilegedTimePercent=\u6743\u9650\u65F6\u95F4% \ No newline at end of file +MemoryUsedPercent=\u5185\u5B58% +ProcessorTimePercent=\u5904\u7406\u673A\u65F6\u95F4% +UserTimePercent=\u7528\u6237\u65F6\u95F4% +PrivilegedTimePercent=\u6743\u9650\u65F6\u95F4% \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/script/testResult/behaviorResult.js b/Bench4Q-Web/src/main/webapp/script/testResult/behaviorResult.js index 5c519094..ba07a8d3 100644 --- a/Bench4Q-Web/src/main/webapp/script/testResult/behaviorResult.js +++ b/Bench4Q-Web/src/main/webapp/script/testResult/behaviorResult.js @@ -73,10 +73,28 @@ function Behavior() { data.detailStatusList ]).draw().node(); var td = $(rowNode).find("td")[0]; $(td).addClass("details-control"); + var behavior = this; + $(td).click( + function() { + var tr = $(this).closest('tr'); + var row = behavior.table.row(tr); + if (row.child.isShown()) { + var td = $(this).closest('td'); + td.removeClass('shown'); + row.child.hide(); + } else { + var td = $(this).closest('td'); + td.addClass('shown'); + row.child( + behavior.createDetailTable( + row.data()[1], row.data()[5])) + .show(); + } + + }); } table.draw(); } - this.addEvent(); } this.createDetailTable = function(url, detailDatas) { @@ -126,26 +144,4 @@ function Behavior() { return tr; } - this.addEvent = function() { - var behavior = this; - var tbody = this.table.table().body(); - $("tbody td.details-control").click( - function() { - var tr = $(this).closest('tr'); - var row = behavior.table.row(tr); - if (row.child.isShown()) { - var td = $(this).closest('td'); - td.removeClass('shown'); - row.child.hide(); - } else { - var td = $(this).closest('td'); - td.addClass('shown'); - row.child( - behavior.createDetailTable(row.data()[1], row - .data()[5])).show(); - } - - }); - }; - }