update result behavior
This commit is contained in:
parent
10a6e950d1
commit
8d7e9b14d8
|
|
@ -100,6 +100,7 @@ public class UserController extends BaseController {
|
|||
@ResponseBody
|
||||
public Map<String, Object> adminLogin(UserModel userModel, ModelMap modelMap) {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
System.out.println(userModel.getUserName());
|
||||
ValidateResponseModel validateResponseModel = this.getUserValidate()
|
||||
.validateUserLogin(userModel.getUserName(),
|
||||
userModel.getPassword());
|
||||
|
|
|
|||
|
|
@ -175,4 +175,5 @@ result-testStatus=Test Status
|
|||
result-vuser=VUs Active
|
||||
result-request=Requests
|
||||
result-loadingInfo=Please wait,loading result data...
|
||||
testPlan-view=View Result
|
||||
testPlan-view=View Result
|
||||
home-createScript=Create New Script
|
||||
|
|
@ -140,7 +140,7 @@ test_jsp_makeNewScript=\u65B0\u5EFA\u811A\u672C
|
|||
index_jsp_Bench4Q_as_a_Service=Bench4Q_as_a_Service \u662F\u57FA\u4E8EBench4Q\u9879\u76EE\u5B9E\u73B0\u7684\u3002\u6211\u4EEC\u91CD\u65B0\u5B9E\u73B0\u4E86Bench4Q\u5DE5\u5177\uFF0C\u4F7F\u5B83\u53EF\u4EE5\u4F5C\u4E3A\u4E00\u79CD\u670D\u52A1\u88AB\u90E8\u7F72\u5230\u5E94\u7528\u670D\u52A1\u5668\u4E0A\u3002Bench4Q\u652F\u6301\u4E91\u8BA1\u7B97\u6240\u63D0\u4F9B\u7684\u5F39\u6027\u548C\u591A\u79DF\u6237\u529F\u80FD\u3002
|
||||
index_jsp_Bench4Q=Bench4Q\u5728\u8FD0\u7528\u4E91\u8BA1\u7B97\u6280\u672F\u7684\u540C\u65F6\uFF0C\u589E\u5F3A\u4E86\u5BF9\u4E8E\u8D1F\u8F7D\u6CE8\u5165\u4EE3\u7406\u6C60\u7684\u63A7\u5236\u548C\u7BA1\u7406\uFF0C\u52A0\u4E4B\u4EE5\u8D1F\u8F7D\u6CE8\u5165\u4EE3\u7406\u7684\u63D2\u4EF6\u5316\u7075\u6D3B\u6269\u5C55\uFF0C\u4F7F\u5F97\u5927\u89C4\u6A21\u6027\u80FD\u6D4B\u8BD5\u6210\u4E3A\u4EF7\u683C\u66F4\u4E3A\u4F4E\u5EC9\u3001\u66F4\u4E3A\u5B9E\u60E0\u7684\u9700\u6C42\u3002
|
||||
index_jsp_FreeRegister=\u514D\u8D39\u6CE8\u518C\uFF0C\u8BA4\u8BC1\uFF0C\u4E0B\u8F7D\u6D4B\u8BD5\uFF0C\u5B9E\u65F6\u76D1\u63A7\uFF0C\u5206\u6790\u62A5\u544A\u4E0B\u8F7D\uFF0C\u67E5\u770B\u5386\u53F2\u6570\u636E...
|
||||
index_jsp_Title=Bench4Q\u2014\u2014\u57FA\u4E8E\u4E91\u7684\u6D4B\u8BD5\u4E0B\u8F7D\u5E73\u53F0
|
||||
index_jsp_Title=Bench4Q-\u57FA\u4E8E\u4E91\u7684\u8D1F\u8F7D\u6D4B\u8BD5\u5E73\u53F0
|
||||
register_jsp_Title=Bench4Q\u2014\u2014\u57FA\u4E8E\u4E91\u7684\u6D4B\u8BD5\u4E0B\u8F7D\u5E73\u53F0
|
||||
index_jsp_register=\u6CE8\u518C
|
||||
index_jsp_login=\u767B\u5F55
|
||||
|
|
@ -176,4 +176,6 @@ result-testStatus=\u6D4B\u8BD5\u72B6\u6001
|
|||
result-vuser=\u5E76\u53D1\u7528\u6237
|
||||
result-request=\u53D1\u9001\u8BF7\u6C42
|
||||
result-loadingInfo=\u8BF7\u7A0D\u7B49\uFF0C\u6B63\u5728\u52A0\u8F7D\u6570\u636E
|
||||
testPlan-view=\u67E5\u770B\u7ED3\u679C
|
||||
testPlan-view=\u67E5\u770B\u7ED3\u679C
|
||||
scriptmanagerment=\u811A\u672C\u7BA1\u7406
|
||||
home-createScript=\u65B0\u5EFA\u811A\u672C
|
||||
|
|
@ -70,7 +70,7 @@ body {
|
|||
<li><a href="script.jsp"><fmt:message
|
||||
key="scriptmanagement" /></a><span class="divider">/</span></li>
|
||||
<li><a href="plugin.jsp"><fmt:message
|
||||
key="script_jsp_makeScript" /></a></li>
|
||||
key="home-createScript" /></a></li>
|
||||
</ul>
|
||||
<div class="tab">
|
||||
<ul style="cursor: pointer" class="nav nav-tabs">
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
.bootcamp {
|
||||
margin: 0 0 20px;
|
||||
}
|
||||
.bootcamp h1 {
|
||||
color: #fff;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
background-color: #829aa8;
|
||||
border: 1px solid #677c89;
|
||||
border-bottom-color: #6b808d;
|
||||
border-radius: 3px 3px 0 0;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,0.4);
|
||||
margin: 0;
|
||||
padding: 8px 10px;
|
||||
position: relative;
|
||||
height:20px;
|
||||
}
|
||||
|
||||
.bootcamp .bootcamp-body {
|
||||
padding: 10px 1%;
|
||||
background-color: #e9f1f4;
|
||||
overflow: hidden;
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
border-color: #e9f1f4 #d8dee2 #d8dee2;
|
||||
border-radius: 0 0 3px 3px;
|
||||
}
|
||||
.bootcamp .create .image {
|
||||
background-image: url("/images/home/create.png");
|
||||
background-size: 130px 130px;
|
||||
}
|
||||
.bootcamp .script .image{
|
||||
background-image: url("/images/home/script.png");
|
||||
background-size: 130px 130px;
|
||||
}
|
||||
|
||||
.bootcamp .history .image{
|
||||
background-image: url("/images/home/history.png");
|
||||
background-size: 130px 130px;
|
||||
}
|
||||
.bootcamp .createScript .image{
|
||||
background-image: url("/images/home/newScript.png");
|
||||
background-size: 130px 130px;
|
||||
}
|
||||
.bootcamp .image {
|
||||
display: block;
|
||||
position: relative;
|
||||
height: 133px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center center;
|
||||
}
|
||||
.bootcamp .desc {
|
||||
padding: 10px 15px 20px;
|
||||
overflow: hidden;
|
||||
background-repeat: no-repeat;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
text-align: center;
|
||||
}
|
||||
.bootcamp .step-number {
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
top: 10px;
|
||||
font-size: 36px;
|
||||
color: #e4e1a8;
|
||||
font-weight: bold;
|
||||
opacity: .75;
|
||||
}
|
||||
ul, ol {
|
||||
padding: 0;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.bootcamp ul li {
|
||||
color: #666;
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
background-color: #f5f3b4;
|
||||
background-image: -moz-linear-gradient(#fffff5, #f5f3b4);
|
||||
background-image: -webkit-linear-gradient(#fffff5, #f5f3b4);
|
||||
background-image: linear-gradient(#fffff5, #f5f3b4);
|
||||
background-repeat: repeat-x;
|
||||
border: 1px solid #dfddb5;
|
||||
border-radius: 3px;
|
||||
display: block;
|
||||
width: 23%;
|
||||
height: 230px;
|
||||
float: left;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 1px 0 #fff;
|
||||
margin: 0 1% 0 0;
|
||||
}
|
||||
|
||||
.bootcamp ul li:hover {
|
||||
background-color: #f1eea3;
|
||||
background-image: -moz-linear-gradient(#fcfce9, #f1eea3);
|
||||
background-image: -webkit-linear-gradient(#fcfce9, #f1eea3);
|
||||
background-image: linear-gradient(#fcfce9, #f1eea3);
|
||||
background-repeat: repeat-x;
|
||||
border: 1px solid #d6d4ad;
|
||||
}
|
||||
.bootcamp ul li a {
|
||||
color: #666;
|
||||
text-decoration: none;
|
||||
}
|
||||
.bootcamp ul li a {
|
||||
color: #666;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
.loginDiv {
|
||||
margin: 20px auto;
|
||||
margin: 30px auto;
|
||||
width: 958px;
|
||||
height: 600px;
|
||||
background-color: #efefef;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
.registerContainer {
|
||||
margin-top:30px;
|
||||
background-color: #efefef;
|
||||
padding-top: 80px;
|
||||
padding-left: 20px;
|
||||
|
|
|
|||
|
|
@ -1,106 +1,117 @@
|
|||
|
||||
.app-container {
|
||||
padding:10px;
|
||||
margin-top:20px;
|
||||
margin-bottom:20px;
|
||||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
background: linear-gradient(to bottom, #fcfcfc, #f3f3f3);
|
||||
border-top: 3px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
clear:both;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.field-inline{
|
||||
.field-inline {
|
||||
float: right;
|
||||
margin-left:15px;
|
||||
}
|
||||
#add-graph-form-wrapper, #del-graph-form-wrapper {
|
||||
background-color: #eee;
|
||||
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#eeeeee');
|
||||
background: -webkit-gradient(linear,left top,left bottom,from(#fcfcfc),to(#eee));
|
||||
background: -moz-linear-gradient(top,#fcfcfc,#eee);
|
||||
background: -o-linear-gradient(top,#fcfcfc,#eee);
|
||||
background: linear-gradient(to bottom,#fcfcfc,#eee);
|
||||
padding: 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-moz-box-shadow: 0px 4px 12px #ddd;
|
||||
-webkit-box-shadow: 0px 4px 12px 0px #ddd;
|
||||
-o-box-shadow: 0px 4px 12px #ddd;
|
||||
box-shadow: 0px 4px 12px #ddd;
|
||||
|
||||
display: none;
|
||||
|
||||
right: 0;
|
||||
z-index: 100;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
#add-graph-form-wrapper label, #del-graph-form-wrapper label {
|
||||
font-weight: bold;
|
||||
margin-top: 5px;
|
||||
#add-graph-form-wrapper,#del-graph-form-wrapper {
|
||||
background-color: #eee;
|
||||
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc',
|
||||
endColorstr='#eeeeee');
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc),
|
||||
to(#eee));
|
||||
background: -moz-linear-gradient(top, #fcfcfc, #eee);
|
||||
background: -o-linear-gradient(top, #fcfcfc, #eee);
|
||||
background: linear-gradient(to bottom, #fcfcfc, #eee);
|
||||
padding: 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-moz-box-shadow: 0px 4px 12px #ddd;
|
||||
-webkit-box-shadow: 0px 4px 12px 0px #ddd;
|
||||
-o-box-shadow: 0px 4px 12px #ddd;
|
||||
box-shadow: 0px 4px 12px #ddd;
|
||||
display: none;
|
||||
right: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.table-bordered thead:first-child tr:first-child th{
|
||||
border-top: 3px solid #369bd7;
|
||||
border-bottom:1px solid #eee;
|
||||
#add-graph-form-wrapper label,#del-graph-form-wrapper label {
|
||||
font-weight: bold;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.table-bordered thead:first-child tr:first-child th {
|
||||
border-top: 3px solid #369bd7;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.table th {
|
||||
|
||||
font-weight:300;
|
||||
background-color: #fff;
|
||||
}
|
||||
.detail-picture{
|
||||
width:16 ,
|
||||
height:16,
|
||||
}
|
||||
.span-brief{
|
||||
font-weight:400;
|
||||
padding:10px;
|
||||
text-align:center;
|
||||
border-right:1px dotted #ccc;
|
||||
}
|
||||
.span-brief-last{
|
||||
font-weight:500;
|
||||
padding:10px;
|
||||
text-align:center
|
||||
font-weight: 300;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#test{
|
||||
margin-top:20px;
|
||||
margin-bottom:20px;
|
||||
.detail-picture {
|
||||
width: 16, height:16,
|
||||
}
|
||||
|
||||
.span-brief {
|
||||
font-weight: 400;
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
border-right: 1px dotted #ccc;
|
||||
}
|
||||
|
||||
.span-brief-last {
|
||||
font-weight: 500;
|
||||
padding: 10px;
|
||||
text-align: center
|
||||
}
|
||||
|
||||
#test {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
border-top: 3px solid #ccc;
|
||||
}
|
||||
.innerTable{
|
||||
margin:0;
|
||||
padding:0;
|
||||
|
||||
.innerTable {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ccc;
|
||||
width:130%;
|
||||
|
||||
width: 130%;
|
||||
}
|
||||
.innerTable thead:first-child tr:first-child th{
|
||||
border-top: 1px solid #ccc;
|
||||
border-bottom:1px solid #ccc;
|
||||
|
||||
.innerTable thead:first-child tr:first-child th {
|
||||
border-top: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
#loading{
|
||||
width:397px;
|
||||
height:49px;
|
||||
background:url(../images/bak.png) no-repeat;
|
||||
}
|
||||
#loading div{
|
||||
width:0px;
|
||||
height:48px;
|
||||
background:url(../images/pro.png) no-repeat;
|
||||
color:#fff;
|
||||
text-align:center;
|
||||
font-family:Tahoma;
|
||||
font-size:18px;
|
||||
line-height:48px;
|
||||
}
|
||||
|
||||
#loading {
|
||||
width: 397px;
|
||||
height: 49px;
|
||||
background: url(../images/bak.png) no-repeat;
|
||||
}
|
||||
|
||||
#loading div {
|
||||
width: 0px;
|
||||
height: 48px;
|
||||
background: url(../images/pro.png) no-repeat;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
font-family: Tahoma;
|
||||
font-size: 18px;
|
||||
line-height: 48px;
|
||||
}
|
||||
|
||||
td.details-control {
|
||||
background: url('../images/add.png') no-repeat center center;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
td.details-control.shown {
|
||||
background: url('../images/delete.png') no-repeat center
|
||||
center;
|
||||
}
|
||||
|
|
@ -19,7 +19,16 @@
|
|||
<link rel="shortcut icon" href="images/bench4q.png">
|
||||
<link href="lib/dataTable/css/jquery.dataTables.css" rel="stylesheet">
|
||||
<link href="css/bench4q.css" rel="stylesheet">
|
||||
<link href="css/home.css" rel="stylesheet">
|
||||
<style type="text/css">
|
||||
body {
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
|
||||
.sidebar-nav {
|
||||
padding: 9px 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,63 +39,49 @@
|
|||
|
||||
<div class="row-fluid">
|
||||
<div id="content" class="span10 center ">
|
||||
<!-- content starts -->
|
||||
<div class="sortable row-fluid ui-sortable">
|
||||
<a data-rel="tooltip" class="well span3 top-block" href="test.jsp"
|
||||
data-original-title=<fmt:message key="creattestplan" />> <span
|
||||
class="icon32 icon-red icon-plus"></span><br> <fmt:message
|
||||
key="creattestplan" />
|
||||
<div class="bootcamp">
|
||||
<div class="bootcamp-body">
|
||||
|
||||
</a> <a data-rel="tooltip" class="well span3 top-block"
|
||||
href="script.jsp"
|
||||
data-original-title=<fmt:message key="scriptmanagerment" />>
|
||||
<span class="icon32 icon-color icon-edit"></span><br> <fmt:message
|
||||
key="scriptmanagement" />
|
||||
<ul>
|
||||
<li class="create"><a href="test.jsp" target="_blank">
|
||||
<div class="image"></div>
|
||||
<div class="desc">
|
||||
<h2>
|
||||
<fmt:message key="creattestplan" />
|
||||
</h2>
|
||||
</div> <span class="step-number one">1</span>
|
||||
</a></li>
|
||||
<li class="createScript"><a href="createScript.jsp"
|
||||
target="_blank">
|
||||
<div class="image"></div>
|
||||
<div class="desc">
|
||||
<h2>
|
||||
<fmt:message key="home-createScript" />
|
||||
</h2>
|
||||
</div> <span class="step-number three">2</span>
|
||||
</a></li>
|
||||
<li class="script"><a href="script.jsp" target="_blank">
|
||||
<div class="image"></div>
|
||||
<div class="desc">
|
||||
<h2>
|
||||
<fmt:message key="scriptmanagerment" />
|
||||
</h2>
|
||||
</div> <span class="step-number two">3</span>
|
||||
</a></li>
|
||||
|
||||
</a> <a data-rel="tooltip" class="well span3 top-block"
|
||||
href="testPlanTask.jsp"
|
||||
data-original-title=<fmt:message key="testQueue" />> <span
|
||||
class="icon32 icon-green icon-envelope-closed"></span> <br>
|
||||
<fmt:message key="testQueue" />
|
||||
|
||||
</a> <a data-rel="tooltip" class="well span3 top-block"
|
||||
href="testplans.jsp"
|
||||
data-original-title=<fmt:message key="testhistory" />> <span
|
||||
class="icon32 icon-blue icon-star-on"></span><br> <fmt:message
|
||||
key="testhistory" />
|
||||
|
||||
</a>
|
||||
<li class="history"><a href="testPlans.jsp" target="_blank">
|
||||
<div class="image"></div>
|
||||
<div class="desc">
|
||||
<h2>
|
||||
<fmt:message key="testhistory" />
|
||||
</h2>
|
||||
</div> <span class="step-number four">4</span>
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row-fluid sortable">
|
||||
<div class="box span12">
|
||||
<div class="box-header well" data-original-title>
|
||||
<h2>
|
||||
<fmt:message key="script" />
|
||||
</h2>
|
||||
<div class="box-icon">
|
||||
<a href="#" class="btn btn-setting btn-round"><i
|
||||
class="icon-cog"></i></a> <a href="#"
|
||||
class="btn btn-minimize btn-round"><i
|
||||
class="icon-chevron-up"></i></a> <a href="#"
|
||||
class="btn btn-close btn-round"><i class="icon-remove"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-content">
|
||||
<table class="table table-condensed" id="scriptTab">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><fmt:message key="scriptname" /></th>
|
||||
<th>ID</th>
|
||||
<th><fmt:message key="datecreated" /></th>
|
||||
<th><fmt:message key="actions" /></th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<!-- content ends -->
|
||||
</div>
|
||||
<div class="row-fluid sortable">
|
||||
|
|
@ -143,7 +138,7 @@
|
|||
<script src="script/scriptTable.js"></script>
|
||||
<script src="script/bench4q.table.js"></script>
|
||||
<script src="script/Share/TestStatusMap.js"></script>
|
||||
<script src="script/loadTestPlans.js"></script>
|
||||
<script src="script/testPlanListManage.js"></script>
|
||||
<script src="script/home.js"></script>
|
||||
</fmt:bundle>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -26,4 +26,6 @@ test-Error=Error
|
|||
test-ErrorInSubmitTask=ErrorInSubmitTask
|
||||
test-ErrorInDistributeLoadForScript=ErrorInDistributeLoadForScript
|
||||
test-Complete=Complete
|
||||
view=View
|
||||
view=View
|
||||
script-edit=Edit
|
||||
script-deleteSuc=Delete Script Success
|
||||
|
|
@ -4,7 +4,7 @@ addCol=\u6DFB\u52A0\u884C
|
|||
removeCol=\u79FB\u9664\u884C
|
||||
cancel=\u53D6\u6D88
|
||||
save=\u4FDD\u5B58
|
||||
gent-InIdle=\u7A7A\u95F2
|
||||
agent-InIdle=\u7A7A\u95F2
|
||||
agent-InRunning=\u6B63\u5728\u8FD0\u884C
|
||||
agent-BackUp=\u5907\u4EFD
|
||||
agent-BreakDown=\u5B95\u673A
|
||||
|
|
@ -21,4 +21,6 @@ test-Error=\u9519\u8BEF
|
|||
test-ErrorInSubmitTask=\u63D0\u4EA4\u9519\u8BEF
|
||||
test-ErrorInDistributeLoadForScript=\u5206\u53D1\u4EE3\u7406\u9519\u8BEF
|
||||
test-Complete=\u5B8C\u6210
|
||||
view=\u67E5\u770B
|
||||
view=\u67E5\u770B
|
||||
script-edit=\u7F16\u8F91
|
||||
script-deleteSuc=\u5220\u9664\u811A\u672C\u6210\u529F
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
|
|
@ -54,17 +54,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="site home">
|
||||
<div class="container">
|
||||
<div class="pagehead homehead">
|
||||
<div class="hero">
|
||||
<h1 id="font">
|
||||
<fmt:message key="login_jsp_Title" />
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="loginDiv">
|
||||
<div style="height: 20px"></div>
|
||||
|
|
|
|||
|
|
@ -9,16 +9,21 @@
|
|||
<li><a class="ajax-link" href="homepage.jsp"><i
|
||||
class="icon-home"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="homepage" /></span></a></li>
|
||||
<li><a class="ajax-link" href="script.jsp"><i
|
||||
class="icon-edit"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="script" /></span></a></li>
|
||||
<li><a class="ajax-link" href="test.jsp"><i
|
||||
class="icon-list-alt"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="creattestplan" /></span></a></li>
|
||||
|
||||
<li><a class="ajax-link" href="createScript.jsp"><i
|
||||
class="icon-list-alt"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="home-createScript" /></span></a></li>
|
||||
|
||||
<li><a class="ajax-link" href="script.jsp"><i
|
||||
class="icon-edit"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="script" /></span></a></li>
|
||||
|
||||
|
||||
<li><a class="ajax-link" href="testplans.jsp"><i
|
||||
|
||||
<li><a class="ajax-link" href="testPlans.jsp"><i
|
||||
class="icon-eye-open"></i><span class="hidden-tablet"> <fmt:message
|
||||
key="testhistory" /></span></a></li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
<link href="css/register.css" media="screen" rel="stylesheet">
|
||||
<link rel="shortcut icon" href="images/bench4q.png">
|
||||
<style type="text/css">
|
||||
/* body {
|
||||
body {
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
.sidebar-nav {
|
||||
padding: 9px 0;
|
||||
} */
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
|
@ -31,11 +31,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="header">
|
||||
<h1>
|
||||
<fmt:message key="index_jsp_Title" />
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
<div class="registerContainer">
|
||||
<div class="left ">
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ body {
|
|||
padding: 9px 0;
|
||||
}
|
||||
</style>
|
||||
<title>Bench4q 2013</title>
|
||||
<title>Bench4Q</title>
|
||||
<link id="bs-css" href="lib/chrisma/css/bootstrap-cerulean.css"
|
||||
rel="stylesheet">
|
||||
<link href="lib/chrisma/css/charisma-app.css" rel="stylesheet">
|
||||
|
|
@ -44,14 +44,22 @@ body {
|
|||
</ul>
|
||||
</div>
|
||||
<div class="row-fluid" id="test">
|
||||
<div class="span4 span-brief" id="status">
|
||||
Test Status<br /> <br>
|
||||
<div class="span4 span-brief">
|
||||
<fmt:message key="result-testStatus" />
|
||||
<br> <br>
|
||||
<div id="status"></div>
|
||||
</div>
|
||||
<div class="span4 span-brief" id="vu">
|
||||
VUs active<br /> <br>
|
||||
<div class="span4 span-brief">
|
||||
<fmt:message key="result-vuser" />
|
||||
<br> <br>
|
||||
<div>
|
||||
<span id="vu"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4 span-brief-last" id="request">
|
||||
Requests<br /> <br>
|
||||
<div class="span4 span-brief-last">
|
||||
<fmt:message key="result-request" />
|
||||
<br> <br>
|
||||
<div id="request"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
|
|
@ -103,7 +111,7 @@ body {
|
|||
<th>Script</th>
|
||||
<th>Successful</th>
|
||||
<th>Total</th>
|
||||
<th>detail</th>
|
||||
<th>detail</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -161,7 +169,7 @@ body {
|
|||
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
|
||||
<script src="lib/jqueryi18n/jquery.i18n.properties-1.0.9.js"></script>
|
||||
<script src="lib/bootstrap/js/bootstrap-modal.js"></script>
|
||||
<script
|
||||
<script
|
||||
src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.10.4/jquery-ui.min.js"></script>
|
||||
<script
|
||||
src="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.1/bootstrap.min.js"></script>
|
||||
|
|
@ -183,7 +191,7 @@ body {
|
|||
<script src="script/testResult/graphSelectorTree.js"></script>
|
||||
<script src="script/testResult/graphSelector.js"></script>
|
||||
<script src="script/testResult/pieChart.js"></script>
|
||||
<script src="script/testResult/result-load.js"></script>
|
||||
<script src="script/testResult/loadProgress.js"></script>
|
||||
<script src="script/testResult/pageResult.js"></script>
|
||||
<script src="script/testResult/behaviorResult.js"></script>
|
||||
<script src="script/testResult/resultNew.js"></script>
|
||||
|
|
|
|||
|
|
@ -87,8 +87,8 @@ body {
|
|||
class="table table-striped table-bordered bootstrap-datatable datatable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><fmt:message key="scriptname" /></th>
|
||||
<th>ID</th>
|
||||
<th><fmt:message key="scriptname" /></th>
|
||||
<th><fmt:message key="datecreated" /></th>
|
||||
<th><fmt:message key="actions" /></th>
|
||||
</tr>
|
||||
|
|
@ -111,13 +111,10 @@ body {
|
|||
<button id="createNewScript"
|
||||
class="btn btn-primary btn-setting" onclick="" type="submit">
|
||||
<fmt:message key="script_jsp_recordScript" />
|
||||
</button>
|
||||
|
||||
<button id="createScript" class="btn btn-primary" onclick="#"
|
||||
type="submit">
|
||||
<fmt:message key="script_jsp_makeScript" />
|
||||
</button>
|
||||
|
||||
</button> <a href="createScript.jsp"><button id="createScript"
|
||||
class="btn btn-primary" onclick="#" type="submit">
|
||||
<fmt:message key="home-createScript" />
|
||||
</button> </a>
|
||||
<button id="refreshPage" class="btn btn-primary "
|
||||
onclick="refresh()" type="submit">
|
||||
<fmt:message key="script_jsp_refresh" />
|
||||
|
|
@ -174,8 +171,7 @@ body {
|
|||
|
||||
</div>
|
||||
<!--/.fluid-container-->
|
||||
|
||||
<script src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.0.js"></script>
|
||||
<script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
|
||||
<script
|
||||
src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.10.4/jquery-ui.min.js"></script>
|
||||
<script src="lib/dataTable/js/jquery.dataTables.js"></script>
|
||||
|
|
@ -187,11 +183,10 @@ body {
|
|||
src="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.1/bootstrap.min.js"></script>
|
||||
<script src="lib/chrisma/js/jquery.cookie.js"></script>
|
||||
<script src="http://malsup.github.com/jquery.form.js"></script>
|
||||
<script
|
||||
src='http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.js'></script>
|
||||
<script src="lib/dataTable/js/jquery.dataTables.js"></script>
|
||||
<script src="lib/chrisma/js/theme.js"></script>
|
||||
<script src="script/base.js"></script>
|
||||
<script src="script/scriptTable.js"></script>
|
||||
<script src="script/scriptListManage.js"></script>
|
||||
<script src="script/script.js"></script>
|
||||
</fmt:bundle>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
var server=null;
|
||||
var table=$("#scriptTab");
|
||||
$('.datatable').dataTable({
|
||||
"sDom": "<'row-fluid'<'span6'l>>t<'row-fluid'<'span3 center'p>>",
|
||||
"sPaginationType": "bootstrap",
|
||||
"oLanguage": {
|
||||
"sLengthMenu": "_MENU_ records per page"
|
||||
}
|
||||
} );
|
||||
// add error massage!
|
||||
var table=$("#scriptTab").DataTable(
|
||||
);
|
||||
|
||||
$('.btn-setting').click(function(e) {
|
||||
e.preventDefault();
|
||||
|
|
@ -104,7 +97,8 @@ function saveScript() {
|
|||
});
|
||||
}
|
||||
$(document).ready(function() {
|
||||
loadScript(table,2);
|
||||
|
||||
loadScript(table);
|
||||
$('#stopServer').attr('disabled', true);
|
||||
|
||||
});
|
||||
|
|
@ -112,10 +106,3 @@ $(document).ready(function() {
|
|||
function refresh(){
|
||||
location.replace(location) ;
|
||||
}
|
||||
|
||||
$('#createScript').click(function(){
|
||||
window.open("plugin.jsp");
|
||||
});
|
||||
//$('#createScript').click(function(){
|
||||
// window.open("plugin-old.jsp");
|
||||
//});
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
|
||||
function loadScript(table) {
|
||||
var editButton = "<a class='btn btn-success edit' ><i class='icon-edit icon-white'></i>"+$.i18n.prop('script-edit')+"</a>";
|
||||
var deleteButton = "<a class='btn btn-info delete'><i class='icon-trash icon-white'></i>"+$.i18n.prop('delete')+"</a>";
|
||||
table.clear();
|
||||
$.post("loadScripts", {}, function(data) {
|
||||
if (data.success) {
|
||||
var scripts = data.scripts;
|
||||
if (scripts == null) {
|
||||
return;
|
||||
}
|
||||
for ( var i = 0; i < scripts.length; i++) {
|
||||
var tr=
|
||||
table.row.add([i+1,scripts[i].name,new Date(scripts[i].createDateTime),
|
||||
editButton+deleteButton]).draw().node();
|
||||
$(tr).attr("id",scripts[i].id);
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
alert(data.failedMessage);
|
||||
}
|
||||
var tbody=table.table().body();
|
||||
$(tbody).on("click","td a.delete",function(){
|
||||
var row=$(this).closest("tr");
|
||||
var scriptId=$(row).attr("id");
|
||||
deleteScript(scriptId, table.row(row));
|
||||
|
||||
});
|
||||
$(tbody).on("click","td a.edit",function(){
|
||||
var row=$(this).closest("tr");
|
||||
var scriptId=$(row).attr("id");
|
||||
var scriptId=$(row).attr("id");
|
||||
var scriptName=table.row(row).data()[1];
|
||||
editScript(scriptId,scriptName);
|
||||
});
|
||||
|
||||
|
||||
}, "json");
|
||||
|
||||
}
|
||||
function deleteScript(scriptId,row) {
|
||||
$.post("deleteScript", {
|
||||
scriptId : scriptId
|
||||
}, function(data) {
|
||||
if (data.success) {
|
||||
|
||||
alert($.i18n.prop("script-deleteSuc"));
|
||||
row.remove();
|
||||
} else {
|
||||
alert( data.failedMessage);
|
||||
// error message
|
||||
}
|
||||
}, "json");
|
||||
}
|
||||
function editScript(scriptId,scriptName) {
|
||||
window.open("script-edit.jsp?name=" + scriptName + "&scriptId=" + scriptId);// need
|
||||
}
|
||||
|
|
@ -62,19 +62,7 @@ function deleteScript(obj) {
|
|||
}
|
||||
}
|
||||
|
||||
function deleteAScript(scriptId) {
|
||||
$.post("deleteScript", {
|
||||
scriptId : scriptId
|
||||
}, function(data) {
|
||||
if (data.success) {
|
||||
alert("delete success,please refresh this page");
|
||||
table.dataTable().fnDeleteRow(row.rowIndex - 1);
|
||||
} else {
|
||||
alert("this script can not be delete in DB:" + data.failedMessage);
|
||||
// error message
|
||||
}
|
||||
}, "json");
|
||||
}
|
||||
|
||||
|
||||
function editScript(obj) {
|
||||
var scriptId = getScriptId(obj);
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ function start() {
|
|||
data : JSON.stringify(testPlan),
|
||||
success : function(data) {
|
||||
if (data.success)
|
||||
window.location.replace("testplans.jsp");
|
||||
window.location.replace("testPlans.jsp");
|
||||
else
|
||||
alert(data.failedMessage);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
function loadTestPlans(table) {
|
||||
|
||||
var downLoadButton = "<a class='btn btn-success download' >"+$.i18n.prop('report')+"</a>";
|
||||
var deleteButton = "<a class='btn btn-info delete'>"+$.i18n.prop('delete')+"</a>";
|
||||
var viewResult = "<a class='btn btn-info result'><i class='icon-zoom-in icon-white'></i>"
|
||||
|
|
@ -40,4 +39,29 @@ function loadTestPlans(table) {
|
|||
window.open("result.jsp?testPlanId=" + testPlanId);
|
||||
});
|
||||
}, "json");
|
||||
}
|
||||
function downloadResult(testPlanId) {
|
||||
var form = $("<form>");// 定义一个form表单
|
||||
form.attr("style", "display:none");
|
||||
form.attr("method", "post");
|
||||
form.attr("action", "downloadReport");
|
||||
var input1 = $("<input>");
|
||||
input1.attr("type", "hidden");
|
||||
input1.attr("name", "testPlanId");
|
||||
input1.attr("value", testPlanId);
|
||||
$("body").append(form);
|
||||
form.append(input1);
|
||||
form.submit();
|
||||
}
|
||||
function deleteTest(testPlanId,table,row) {
|
||||
$.post("deleteTest", {
|
||||
testPlanId : testPlanId
|
||||
}, function(data) {
|
||||
if (data.success) {
|
||||
$(table).dataTable().fnDeleteRow(row.index());
|
||||
} else {
|
||||
alert($.i18n.prop('fail'));
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
$(document).ready(function() {
|
||||
var table = $("#table");
|
||||
|
||||
loadTestPlans(table);
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,13 +1,15 @@
|
|||
function Behavior() {
|
||||
this.addButton = "<img src='images/add.png' alt='details' title='details' class='show-detail'>";
|
||||
this.deleteButton = "<img src='images/add.png' alt='details' title='details' class='delete-detail'>";
|
||||
// this.addButton = "<img src='images/add.png' alt='details' title='details'
|
||||
// class='detail '>";
|
||||
// this.deleteButton = "<img src='images/delete.png' alt='details'
|
||||
// title='details' class='detail'>";
|
||||
this.table = $("#url").DataTable();
|
||||
this.table.column(5).visible(false);
|
||||
this.loadBehaviorResults = function(testPlanId, scripts) {
|
||||
var table = $("#url").DataTable();
|
||||
var map = new HashMap();
|
||||
var behavior = this;
|
||||
var intervalId = setInterval(function() {
|
||||
this.intervalId = setInterval(function() {
|
||||
|
||||
for ( var i = 0; i < scripts.length; i++) {
|
||||
|
||||
|
|
@ -17,33 +19,30 @@ function Behavior() {
|
|||
}
|
||||
var url = "/" + testPlanId + "/" + scripts[i].scriptId
|
||||
+ "/behaviors";
|
||||
behavior.getBehaviorResult(url, map, scripts[i].scriptName);
|
||||
behavior.getBehaviorResult(url, map, scripts[i].scriptName,
|
||||
table);
|
||||
}
|
||||
|
||||
behavior.insertDataToTable(table, map);
|
||||
// can refactor an a function to all script result
|
||||
var scriptsFinished = 0;
|
||||
for ( var i = 0; i < scripts.length; i++) {
|
||||
if (map.get(scripts[i].scriptName) != null
|
||||
&& map.get(scripts[i].scriptName).finished == true) {
|
||||
scriptsFinished++;
|
||||
}
|
||||
}
|
||||
if (scriptsFinished == scripts.length) {
|
||||
clearInterval(intervalId);
|
||||
return;
|
||||
}
|
||||
}, 10000);
|
||||
|
||||
}, 500);
|
||||
|
||||
}
|
||||
this.getBehaviorResult = function(url, map, scriptName) {
|
||||
this.getBehaviorResult = function(url, map, scriptName, table) {
|
||||
var behaviorResult = this;
|
||||
$.post(url, {}, function(data) {
|
||||
if (!data.success) {
|
||||
return;
|
||||
}
|
||||
data = data.behaviors;
|
||||
map.put(scriptName, data);
|
||||
behaviorResult.insertDataToTable(table, map);
|
||||
if ($("#status").attr("status") == "Complete") {
|
||||
clearInterval(behaviorResult.intervalId);
|
||||
}
|
||||
|
||||
}, "json");
|
||||
|
||||
}
|
||||
this.insertDataToTable = function(table, map) {
|
||||
|
||||
|
|
@ -57,24 +56,33 @@ function Behavior() {
|
|||
|
||||
for ( var j = 0; j < behaviors.length; j++) {
|
||||
var data = behaviors[j];
|
||||
var rowNode = table.row.add([ this.addButton, data.behaviorUrl,
|
||||
names[k], data.totalCount, data.successfulCount ,data.detailStatusCodeResultModels]);
|
||||
var rowNode = table.row.add(
|
||||
[ "", data.behaviorUrl, names[k], data.totalCount,
|
||||
data.successfulCount,
|
||||
data.detailStatusCodeResultModels ]).draw()
|
||||
.node();
|
||||
var td = $(rowNode).find("td")[0];
|
||||
$(td).addClass("details-control");
|
||||
}
|
||||
table.draw();
|
||||
}
|
||||
this.addEvent();
|
||||
}
|
||||
|
||||
this.createDetailTable = function(url,detailDatas) {
|
||||
this.createDetailTable = function(url, detailDatas) {
|
||||
var theader = [ "url", "statusCode", "count", "contentLength",
|
||||
"minResponseTime", "maxResponseTime",
|
||||
"totalResponseTimeThisTime" ];
|
||||
var table = $("<table></table>");
|
||||
table.addClass("innerTable");
|
||||
$(table).attr("style", "width: 100%;");
|
||||
var thead = $("<thead></thead>");
|
||||
|
||||
var tr = $("<tr></tr>");
|
||||
for ( var i = 0; i < theader.length; i++) {
|
||||
tr.append("<th>" + theader[i] + "</th>");
|
||||
var th = $("<th>" + theader[i] + "</th>");
|
||||
th.attr("style", "width: ;");
|
||||
tr.append(th);
|
||||
}
|
||||
thead.append(tr);
|
||||
table.append(thead);
|
||||
|
|
@ -94,6 +102,7 @@ function Behavior() {
|
|||
dataArray[0] = url;
|
||||
for ( var i = 0; i < dataArray.length; i++) {
|
||||
var td = $("<td></td>");
|
||||
td.attr("style", "width: 10%;");
|
||||
td.html(dataArray[i]);
|
||||
tr.append(td);
|
||||
}
|
||||
|
|
@ -102,19 +111,24 @@ function Behavior() {
|
|||
|
||||
this.addEvent = function() {
|
||||
var behavior = this;
|
||||
$(".show-detail").click(function() {
|
||||
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();
|
||||
}
|
||||
|
||||
var tr = $(this).closest('tr');
|
||||
var row = behavior.table.row(tr);
|
||||
row.child(behavior.createDetailTable(row.data()[0],row.data()[5])).show();
|
||||
|
||||
});
|
||||
$(".delete-detail").click(function() {
|
||||
var tr = $(this).closest('tr');
|
||||
var row = behavior.table.row(tr);
|
||||
row.child().hide();
|
||||
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,22 +29,22 @@ Chart.prototype.createChart = function(container) {
|
|||
this.modelArray = new Array();
|
||||
};
|
||||
|
||||
Chart.prototype.addAxis = function(axis, seriesId, data) {
|
||||
Chart.prototype.addAxis = function(axis, seriesId,name, data) {
|
||||
this.highChart.addAxis({ // Secondary yAxis
|
||||
id : axis,
|
||||
title : {
|
||||
text : seriesId,
|
||||
text : name,
|
||||
},
|
||||
lineWidth : 2,
|
||||
opposite : true
|
||||
});
|
||||
this.addSeries(axis, seriesId, data);
|
||||
this.addSeries(axis, seriesId, data,name);
|
||||
};
|
||||
|
||||
Chart.prototype.addSeries = function(axis, seriesId, data) {
|
||||
Chart.prototype.addSeries = function(axis, seriesId, data,name) {
|
||||
this.highChart.addSeries({
|
||||
id : seriesId,
|
||||
name : seriesId,
|
||||
name : name,
|
||||
yAxis : axis,
|
||||
data : data,
|
||||
marker : {
|
||||
|
|
@ -77,7 +77,7 @@ var Point = function(x, y) {
|
|||
};
|
||||
Chart.prototype.addGraph = function(model) {
|
||||
var chart = this;
|
||||
chart.addAxis(model.axis, model.series, []);
|
||||
chart.addAxis(model.axis, model.series, model.name,[]);
|
||||
var intervalId = setInterval(function() {
|
||||
$.post(model.url + "/" + model.time, {}, function(data) {
|
||||
loadItems.scriptBriefStatusAve = true;// this need to change
|
||||
|
|
@ -86,6 +86,7 @@ Chart.prototype.addGraph = function(model) {
|
|||
return;
|
||||
}
|
||||
data = data.result;
|
||||
loadItems.scriptBriefStatusAve=true;
|
||||
if (data instanceof Array) {
|
||||
|
||||
var points = new Array();
|
||||
|
|
@ -97,6 +98,9 @@ Chart.prototype.addGraph = function(model) {
|
|||
}
|
||||
|
||||
}, "json");
|
||||
if($("#status").attr("status")=="Complete"){
|
||||
clearInterval(intervalId);
|
||||
}
|
||||
|
||||
}, intervalTime);
|
||||
model.setIntervalId(intervalId);
|
||||
|
|
@ -105,10 +109,10 @@ Chart.prototype.addGraph = function(model) {
|
|||
};
|
||||
Chart.prototype.addDataToGraph = function(chart, model, intervalId, data) {
|
||||
|
||||
if (data.finished) {
|
||||
clearInterval(intervalId);
|
||||
return;
|
||||
}
|
||||
// if (data.finished) {
|
||||
// clearInterval(intervalId);
|
||||
// return;
|
||||
// }
|
||||
var point = new Point(data.time, data.data);
|
||||
if (data.time > model.time){
|
||||
model.time = data.time;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
var ChartSelector = function(allTree, showTree, chart, addSelectorId,
|
||||
deleteSelectorId, addButton, deleteButton, showTreePathValues) {
|
||||
|
||||
this.allTree = allTree;
|
||||
this.showTree = showTree;
|
||||
this.addSelectorId = addSelectorId;
|
||||
|
|
@ -122,10 +121,10 @@ ChartSelector.prototype.getSelectNodeByValue = function(parentNode, values) {
|
|||
ChartSelector.prototype.createSingleListDom = function(lableText, options) {
|
||||
var div = $("<div></div>");
|
||||
div.addClass("control-group");
|
||||
var lable = $("<lable></lable>");
|
||||
lable.addClass("control-label");
|
||||
lable.text(lableText);
|
||||
div.append(lable);
|
||||
// var lable = $("<lable></lable>");
|
||||
// lable.addClass("control-label");
|
||||
// lable.text(lableText);
|
||||
// div.append(lable);
|
||||
div.append("</br>");
|
||||
var select = $("<select ></select>");
|
||||
select.addClass("form-control");
|
||||
|
|
@ -153,6 +152,15 @@ ChartSelector.prototype.getSlectedVluesArray = function(selectorId) {
|
|||
}
|
||||
return dataArray;
|
||||
};
|
||||
ChartSelector.prototype.getSlectedNames = function(selectorId) {
|
||||
var dataArray = new Array();
|
||||
var selectArray = $("#" + selectorId + " select");
|
||||
for ( var i = 0; i < selectArray.length; i++) {
|
||||
dataArray.push($(selectArray[i]).find("option:selected").html());
|
||||
}
|
||||
return dataArray;
|
||||
}
|
||||
|
||||
ChartSelector.prototype.getSelectedNames = function(selectorId) {
|
||||
var dataArray = new Array();
|
||||
var selectArray = $("#" + selectorId + " select");
|
||||
|
|
@ -186,6 +194,7 @@ ChartSelector.prototype.addGraph = function() {
|
|||
var model = new Model();
|
||||
model.setSeries(this.getSlectedVluesArray(this.addSelectorId));
|
||||
model.setUrl(this.getSlectedVluesArray(this.addSelectorId), this);
|
||||
model.setName(this.getSelectedNames(this.addSelectorId));
|
||||
model.axis = model.series + "_Axis";
|
||||
this.chart.addGraph(model);
|
||||
};
|
||||
|
|
@ -194,6 +203,7 @@ ChartSelector.prototype.initChart = function() {
|
|||
model.setSeries(this.getSlectedVluesArray(this.deleteSelectorId));
|
||||
model.setUrl(this.getSlectedVluesArray(this.deleteSelectorId), this);
|
||||
model.axis = (model.series + "_Axis");
|
||||
model.setName(this.getSelectedNames(this.deleteSelectorId));
|
||||
this.chart.addGraph(model);
|
||||
};
|
||||
ChartSelector.prototype.deleteGraph = function() {
|
||||
|
|
@ -204,6 +214,7 @@ ChartSelector.prototype.deleteGraph = function() {
|
|||
var model = new Model();
|
||||
model.setSeries(this.getSlectedVluesArray(this.deleteSelectorId));
|
||||
model.axis = (model.series + "_Axis");
|
||||
model.setName(this.getSelectedNames(this.deleteSelectorId));
|
||||
this.chart.deleteGraph(model);
|
||||
};
|
||||
var Model = function() {
|
||||
|
|
@ -214,6 +225,13 @@ var Model = function() {
|
|||
this.axis = "";
|
||||
this.time = 0;
|
||||
};
|
||||
Model.prototype.setName = function(pathValue) {
|
||||
this.name = pathValue[0];
|
||||
for ( var i = 1; i < pathValue.length; i++) {
|
||||
this.name += "_" + pathValue[i];
|
||||
}
|
||||
}
|
||||
|
||||
Model.prototype.setUrl = function(pathValue, chartSelector) {
|
||||
/* this.url = "/"+chartSelector.allTree.root.value; */
|
||||
this.url = chartSelector.allTree.root.value;
|
||||
|
|
|
|||
|
|
@ -1,94 +1,93 @@
|
|||
Highcharts.theme = {
|
||||
colors: ['#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4'],
|
||||
chart: {
|
||||
width:null,
|
||||
backgroundColor: "#fff",
|
||||
|
||||
borderWidth: 0,
|
||||
plotBackgroundColor: 'rgba(255, 255, 255, .9)',
|
||||
plotShadow: false,
|
||||
plotBorderWidth: 1
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
subtitle: {
|
||||
style: {
|
||||
color: '#666666',
|
||||
font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
xAxis: {
|
||||
gridLineWidth: 1,
|
||||
lineColor: '#000',
|
||||
tickColor: '#000',
|
||||
labels: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: '11px Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#333',
|
||||
fontWeight: 'bold',
|
||||
fontSize: '12px',
|
||||
fontFamily: 'Trebuchet MS, Verdana, sans-serif'
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
lineColor: '#000',
|
||||
lineWidth: 0.5,
|
||||
tickWidth: 1,
|
||||
tickColor: '#000',
|
||||
labels: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: '12px Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#333',
|
||||
fontWeight: 'bold',
|
||||
fontSize: '12px',
|
||||
fontFamily: 'Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
font: '9pt Trebuchet MS, Verdana, sans-serif',
|
||||
color: 'black'
|
||||
|
||||
},
|
||||
itemHoverStyle: {
|
||||
color: '#039'
|
||||
},
|
||||
itemHiddenStyle: {
|
||||
color: 'gray'
|
||||
}
|
||||
},
|
||||
labels: {
|
||||
style: {
|
||||
color: '#99b'
|
||||
}
|
||||
},
|
||||
|
||||
navigation: {
|
||||
buttonOptions: {
|
||||
theme: {
|
||||
stroke: '#CCCCCC',
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Apply the theme
|
||||
Highcharts.theme = {
|
||||
colors: ['#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4'],
|
||||
chart: {
|
||||
width:null,
|
||||
backgroundColor: "#fff",
|
||||
borderWidth: 0,
|
||||
plotBackgroundColor: 'rgba(255, 255, 255, .9)',
|
||||
plotShadow: false,
|
||||
plotBorderWidth: 1
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
subtitle: {
|
||||
style: {
|
||||
color: '#666666',
|
||||
font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
xAxis: {
|
||||
gridLineWidth: 1,
|
||||
lineColor: '#000',
|
||||
tickColor: '#000',
|
||||
labels: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: '11px Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#333',
|
||||
fontWeight: 'bold',
|
||||
fontSize: '12px',
|
||||
fontFamily: 'Trebuchet MS, Verdana, sans-serif'
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
lineColor: '#000',
|
||||
lineWidth: 0.5,
|
||||
tickWidth: 1,
|
||||
tickColor: '#000',
|
||||
labels: {
|
||||
style: {
|
||||
color: '#000',
|
||||
font: '12px Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
},
|
||||
title: {
|
||||
style: {
|
||||
color: '#333',
|
||||
fontWeight: 'normal',
|
||||
fontSize: '12px',
|
||||
fontFamily: 'Trebuchet MS, Verdana, sans-serif'
|
||||
}
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
itemStyle: {
|
||||
font: '9pt Trebuchet MS, Verdana, sans-serif',
|
||||
color: 'black'
|
||||
|
||||
},
|
||||
itemHoverStyle: {
|
||||
color: '#039'
|
||||
},
|
||||
itemHiddenStyle: {
|
||||
color: 'gray'
|
||||
}
|
||||
},
|
||||
labels: {
|
||||
style: {
|
||||
color: '#99b'
|
||||
}
|
||||
},
|
||||
|
||||
navigation: {
|
||||
buttonOptions: {
|
||||
theme: {
|
||||
stroke: '#CCCCCC',
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// Apply the theme
|
||||
var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
|
||||
|
|
@ -1,38 +1,35 @@
|
|||
var progress_id = "loading";
|
||||
var loadItems = function() {
|
||||
this.scriptBriefStatusAve = false;
|
||||
this.pageResult = false;
|
||||
this.behavior = false;
|
||||
this.urlDistribution = false;
|
||||
this.testBrief = false;
|
||||
};
|
||||
function SetProgress(progress) {
|
||||
if (progress) {
|
||||
$("#" + progress_id + " > div").css("width", String(progress) + "%"); // 控制#loading
|
||||
$("#" + progress_id + " > div").html(String(progress) + "%"); // 显示百分比
|
||||
}
|
||||
}
|
||||
|
||||
function doProgress() {
|
||||
var progress = getProgress();
|
||||
SetProgress(progress);
|
||||
if (progress >= 100) {
|
||||
$('#load').modal('hide');
|
||||
return;
|
||||
}
|
||||
if (progress < 100) {
|
||||
$('#load').modal('show');
|
||||
setTimeout("doProgress()", 1000);
|
||||
}
|
||||
}
|
||||
function getProgress() {
|
||||
var progress = 0;
|
||||
for ( var key in loadItems) {
|
||||
if (loadItems[key])
|
||||
progress += 20;
|
||||
}
|
||||
return progress;
|
||||
}
|
||||
$('#cancelLoading').click(function() {
|
||||
window.location.replace("testplans.jsp");
|
||||
});
|
||||
var progress_id = "loading";
|
||||
var loadItems = function() {
|
||||
this.scriptBriefStatusAve = false;
|
||||
this.testBrief = false;
|
||||
};
|
||||
function SetProgress(progress) {
|
||||
if (progress) {
|
||||
$("#" + progress_id + " > div").css("width", String(progress) + "%"); // 控制#loading
|
||||
$("#" + progress_id + " > div").html(String(progress) + "%"); // 显示百分比
|
||||
}
|
||||
}
|
||||
|
||||
function doProgress() {
|
||||
var progress = getProgress();
|
||||
SetProgress(progress);
|
||||
if (progress >= 100) {
|
||||
$('#load').modal('hide');
|
||||
return;
|
||||
}
|
||||
if (progress < 100) {
|
||||
$('#load').modal('show');
|
||||
setTimeout("doProgress()", 1000);
|
||||
}
|
||||
}
|
||||
function getProgress() {
|
||||
var progress = 0;
|
||||
for ( var key in loadItems) {
|
||||
if (loadItems[key])
|
||||
progress += (100 /2);
|
||||
}
|
||||
return progress;
|
||||
}
|
||||
$('#cancelLoading').click(function() {
|
||||
window.location.replace("testplans.jsp");
|
||||
});
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
function loadPageResult(testPlanId, scripts) {
|
||||
function PageResult(){
|
||||
|
||||
this.loadPageResult=function(testPlanId, scripts) {
|
||||
var table = $("#page").dataTable();
|
||||
var map = new HashMap();
|
||||
var intervalId = setInterval(function() {
|
||||
var page=this;
|
||||
this. intervalId = setInterval(function() {
|
||||
|
||||
for ( var i = 0; i < scripts.length; i++) {
|
||||
|
||||
|
|
@ -10,26 +13,16 @@ function loadPageResult(testPlanId, scripts) {
|
|||
continue;
|
||||
}
|
||||
var url = "/" + testPlanId + "/" + scripts[i].scriptId + "/page";
|
||||
getPagesResult(url, map, scripts[i].scriptName);
|
||||
}
|
||||
insertDataToTable(table, map)
|
||||
var scriptsFinished = 0;
|
||||
for ( var i = 0; i < scripts.length; i++) {
|
||||
if (map.get(scripts[i].scriptName) != null
|
||||
&& map.get(scripts[i].scriptName).finished == true) {
|
||||
scriptsFinished++;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
if (scriptsFinished == scripts.length) {
|
||||
clearInterval(intervalId);
|
||||
return;
|
||||
page.getPagesResult(url, map, scripts[i].scriptName,table);
|
||||
}
|
||||
|
||||
|
||||
}, 7000);
|
||||
|
||||
}
|
||||
function getPagesResult(url, map, scriptName) {
|
||||
}
|
||||
this. getPagesResult=function(url, map, scriptName,table) {
|
||||
|
||||
var page=this;
|
||||
|
||||
$.post(url, {}, function(data) {
|
||||
if (!data.success) {
|
||||
|
|
@ -37,10 +30,16 @@ function getPagesResult(url, map, scriptName) {
|
|||
}
|
||||
data = data.pages;
|
||||
map.put(scriptName, data);
|
||||
page.insertDataToTable(table, map)
|
||||
if($("#status").attr("status")=="Complete"){
|
||||
clearInterval(page.intervalId);
|
||||
}
|
||||
}, "json");
|
||||
|
||||
|
||||
}
|
||||
|
||||
function insertDataToTable(table, map) {
|
||||
this. insertDataToTable=function(table, map) {
|
||||
|
||||
table.fnClearTable();
|
||||
for ( var k = 0; k < map.length(); k++) {
|
||||
|
|
@ -59,3 +58,5 @@ function insertDataToTable(table, map) {
|
|||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,38 @@
|
|||
var loadItems = new loadItems();
|
||||
var testStatus;
|
||||
|
||||
$(document).ready(
|
||||
function() {
|
||||
testPlanId = getvars()['testPlanId'];
|
||||
if (!getTestPlanStatus(testPlanId))
|
||||
return;
|
||||
getTestBrief(testPlanId);
|
||||
var tree = getResultInfoTree(testPlanId);
|
||||
var replaceArray = createUrlReplaceArray(testPlanId);
|
||||
doProgress();
|
||||
var chart = new Chart();
|
||||
chart.createChart($("#chart"));
|
||||
var chartSelector = createChartSelector(tree, chart, replaceArray,
|
||||
getShowTreePathValues(tree));
|
||||
chartSelector.initChart(getShowTreePathValues(tree), this);
|
||||
graphButtonListener(chartSelector);
|
||||
var behaviorResult = new BehaviorResult();
|
||||
behaviorResult.getResult(testPlanId, getScriptList(testPlanId));
|
||||
var pageResult = new PageResult();
|
||||
pageResult.getResult(testPlanId, getScriptList(testPlanId));
|
||||
var urlContentTypeDistribution = new UrlContentTypeDistribution(
|
||||
"url-distribution", testPlanId);
|
||||
});
|
||||
|
||||
function replace(keyArray, replaceArray) {
|
||||
for ( var i = 0; i < keyArray.length; i++) {
|
||||
for ( var j = 0; j < replaceArray.length; j++) {
|
||||
if (keyArray[i] == replaceArray[j].oldWord)
|
||||
keyArray[i] = replaceArray[j].newWord;
|
||||
}
|
||||
$(function() {
|
||||
var testPlanId = getvars()['testPlanId'];
|
||||
var testPlan = getTestInfo(testPlanId);
|
||||
if (!(testPlan.currentStatus == "InRunning" || testPlan.currentStatus == "Complete")) {
|
||||
return;
|
||||
}
|
||||
|
||||
doProgress();
|
||||
getTestBrief(testPlanId);
|
||||
var tree = getResultTree(testPlanId);
|
||||
var chart = new Chart();
|
||||
chart.createChart($("#chart"));
|
||||
var chartSelector = createChartSelector(tree, chart,
|
||||
getShowTreePathValues(tree));
|
||||
chartSelector.initChart();
|
||||
graphButtonListener(chartSelector);
|
||||
});
|
||||
function getTestInfo(testPlanId) {
|
||||
var testPlan;
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : testPlanId + "/runningInfo",
|
||||
dataType : "json",
|
||||
async : false,
|
||||
success : function(data) {
|
||||
if (!data.success) {
|
||||
alert("no such testPlan!")
|
||||
return;
|
||||
} else {
|
||||
testPlan = data.testPlan;
|
||||
}
|
||||
}
|
||||
});
|
||||
return testPlan;
|
||||
}
|
||||
|
||||
function graphButtonListener(chartSelector) {
|
||||
|
|
@ -99,32 +101,6 @@ var ReplaceNode = function(oldWord, newWord) {
|
|||
this.oldWord = oldWord;
|
||||
this.newWord = newWord;
|
||||
};
|
||||
//function createUrlReplaceArray(testPlanId) {
|
||||
// var replaceArray = new Array();
|
||||
// $.ajax({
|
||||
// type : "POST",
|
||||
// /* url : "/" + testPlanId + "/mapInfo", */
|
||||
// url : testPlanId + "/mapInfo",
|
||||
// dataType : "json",
|
||||
// async : false,
|
||||
// success : function(data) {
|
||||
// if (!data.success) {
|
||||
// alert(data.failedMessage);
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// else
|
||||
// data = data.data;
|
||||
// for ( var key in data) {
|
||||
// var replaceNode = new ReplaceNode(key, data[key]);
|
||||
// replaceArray.push(replaceNode);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
// });
|
||||
// return replaceArray;
|
||||
//
|
||||
//}
|
||||
|
||||
function getvars() {
|
||||
var vars = [], hash;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
var loadItems = new loadItems();
|
||||
var testStatus;
|
||||
|
||||
$(function() {
|
||||
var testPlanId = getvars()['testPlanId'];
|
||||
var testPlan = getTestInfo(testPlanId);
|
||||
// getTestBrief();
|
||||
loadPageResult(testPlanId, testPlan.scripts);
|
||||
if (!(testPlan.currentStatus == "InRunning" || testPlan.currentStatus == "Complete")) {
|
||||
return;
|
||||
}
|
||||
getTestBrief(testPlanId);
|
||||
|
||||
// doProgress();
|
||||
var pageResult = new PageResult();
|
||||
pageResult.loadPageResult(testPlanId, testPlan.scripts);
|
||||
var behavior = new Behavior();
|
||||
behavior.loadBehaviorResults(testPlanId, testPlan.scripts);
|
||||
var tree = getResultTree(testPlanId);
|
||||
|
|
@ -15,12 +20,6 @@ $(function() {
|
|||
getShowTreePathValues(tree));
|
||||
chartSelector.initChart();
|
||||
graphButtonListener(chartSelector);
|
||||
// var behaviorResult = new BehaviorResult();
|
||||
// behaviorResult.getResult(testPlanId, getScriptList(testPlanId));
|
||||
// // var pageResult = new PageResult();
|
||||
// pageResult.getResult(testPlanId, getScriptList(testPlanId));
|
||||
// var urlContentTypeDistribution = new UrlContentTypeDistribution(
|
||||
// "url-distribution", testPlanId);
|
||||
});
|
||||
function getTestInfo(testPlanId) {
|
||||
var testPlan;
|
||||
|
|
|
|||
|
|
@ -1,64 +1,48 @@
|
|||
function getTestBrief(testPlanId) {
|
||||
var intervalId = setInterval(function() {
|
||||
showTestPlanStatusAsync(testPlanId);
|
||||
showTestBriefStatus();
|
||||
showTestBriefStatus(testPlanId);
|
||||
loadItems.testBrief = true;
|
||||
if (testStatus == "Complete")
|
||||
if ($('#status').attr("status") == "Complete") {
|
||||
clearInterval(intervalId);
|
||||
}
|
||||
$("#vu").html("<h4>" + 0 + "</h4>");
|
||||
|
||||
}, 5000);
|
||||
}
|
||||
function showTestPlanStatusAsync(testPlanId) {
|
||||
var urlAddress = testPlanId + "/runningInfo";
|
||||
$.post(urlAddress, {}, function(data) {
|
||||
if (!data.success) {
|
||||
alert("runningInfo");
|
||||
return;
|
||||
}
|
||||
|
||||
else
|
||||
else {
|
||||
data = data.testPlan;
|
||||
testStatus =testStatusMap(data.currentStatus);
|
||||
$('#status').html($('#status').html()+"<h4>"+testStatus+'</h4>');
|
||||
$('#status').attr("status", data.currentStatus);
|
||||
var testStatus = testStatusMap(data.currentStatus);
|
||||
$('#status').html("<h4>" + testStatus + '</h4>');
|
||||
}
|
||||
|
||||
}, "json");
|
||||
}
|
||||
function showTestBriefStatus() {
|
||||
var urlAddress = testPlanId + "/testBriefStatus" ;
|
||||
function showTestBriefStatus(testPlanId) {
|
||||
var urlAddress = testPlanId + "/testBriefStatus";
|
||||
$.post(urlAddress, {}, function(data) {
|
||||
if (!data.success) {
|
||||
alert("testBrief");
|
||||
return;
|
||||
}
|
||||
|
||||
else
|
||||
else {
|
||||
data = data.briefInfo;
|
||||
}
|
||||
loadItems.testBrief=true;
|
||||
startTime = data.time;
|
||||
$("#vu").html($("#vu").html()+"<h4>"+data.vus+"</h4>");
|
||||
$("#request").html( $("#request").html()+"<h4>"+data.requests+"</h4>")
|
||||
$("#vu").html("<h4>" + data.vus + "</h4>");
|
||||
|
||||
$("#request").html("<h4>" + data.requests + "</h4>")
|
||||
if ($('#status').attr("status") == "Complete") {
|
||||
$("#vu").html("<h4>" + 0 + "</h4>");
|
||||
}
|
||||
}, "json");
|
||||
}
|
||||
function getTestPlanStatus(testPlanId) {
|
||||
var flag = null;
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : testPlanId + "/runningInfo",
|
||||
dataType : "json",
|
||||
async : false,
|
||||
success : function(data) {
|
||||
if (!data.success) {
|
||||
flag = false;
|
||||
return;
|
||||
}
|
||||
|
||||
else
|
||||
data = data.testPlan;
|
||||
testStatus = data.currentStatus;
|
||||
if (data.currentStatus == "Complete"
|
||||
|| data.currentStatus == "InRunning") {
|
||||
flag = true;
|
||||
} else
|
||||
flag = false;
|
||||
}
|
||||
});
|
||||
return flag;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
$(document).ready(function() {
|
||||
var table = $("#table");
|
||||
|
||||
loadTestPlans(table);
|
||||
});
|
||||
|
||||
|
||||
function downloadResult(testPlanId) {
|
||||
var form = $("<form>");// 定义一个form表单
|
||||
form.attr("style", "display:none");
|
||||
form.attr("method", "post");
|
||||
form.attr("action", "downloadReport");
|
||||
var input1 = $("<input>");
|
||||
input1.attr("type", "hidden");
|
||||
input1.attr("name", "testPlanId");
|
||||
input1.attr("value", testPlanId);
|
||||
$("body").append(form);
|
||||
form.append(input1);
|
||||
form.submit();
|
||||
}
|
||||
function deleteTest(testPlanId,table,row) {
|
||||
$.post("deleteTest", {
|
||||
testPlanId : testPlanId
|
||||
}, function(data) {
|
||||
if (data.success) {
|
||||
$(table).dataTable().fnDeleteRow(row.index());
|
||||
} else {
|
||||
alert($.i18n.prop('fail'));
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -222,7 +222,6 @@ body {
|
|||
<script src="lib/chrisma/js/theme.js"></script>
|
||||
<script src="http://code.highcharts.com/highcharts.js"></script>
|
||||
<script src="script/test.js"></script>
|
||||
|
||||
</fmt:bundle>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -131,9 +131,9 @@ body {
|
|||
<script src="lib/chrisma/js/theme.js"></script>
|
||||
<script src="script/base.js"></script>
|
||||
<script src="script/bench4q.table.js"></script>
|
||||
<script src="script/loadTestPlans.js"></script>
|
||||
<script src="script/testPlanListManage.js"></script>
|
||||
<script src="script/Share/TestStatusMap.js"></script>
|
||||
<script src="script/testplans.js"></script>
|
||||
<script src="script/testPlans.js"></script>
|
||||
</fmt:bundle>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue