Skip to content

kt-keystone
kt-keystone
提交 3407e9eb authored 作者: mry's avatar mry
浏览文件
操作

fix(web): 修改报告信息

上级 93204ead
隐藏空白字符变更
内嵌 并排
正在显示 包含 24 行增加 和 27 行删除
kt-base/src/main/java/org/matrix/testNg/xml/reportXml/GenerateReporter.java
浏览文件 @ 3407e9eb
......@@ -36,7 +36,7 @@ public class GenerateReporter implements IReporter {
cfg.setDefaultEncoding("UTF-8");
cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
//freemaker的模板文件
Template temp = cfg.getTemplate("overviewBeautiful.ftl");
Template temp = cfg.getTemplate("overview.ftl");
Map context = new HashMap();
for (ISuite suite : suites) {
Map<String, ISuiteResult> suiteResults = suite.getResults();
......
kt-base/src/main/resources/templates/overview.ftl
浏览文件 @ 3407e9eb
......@@ -21,19 +21,19 @@
<form class="form">
<#if overView ??>
<div class="form-group flex">
<label for="total">用例总数:</label>
<label for="total">测试用例总数:</label>
<input class="form-control" id="total" readonly="readonly" value="${overView.total!}"/>
</div>
<div class="form-group flex">
<label for="allTime">执行时间(s):</label>
<label for="allTime">执行总耗时:</label>
<input class="form-control" id="allTime" readonly="readonly" value="${overView.allTime!}"/>
</div>
<div class="form-group flex">
<label for="passNum">通过:</label>
<label for="passNum">通过用例数:</label>
<input class="form-control" id="passNum" readonly="readonly" value="${overView.passNum!}"/>
</div>
<div class="form-group flex">
<label for="failNum">失败:</label>
<label for="failNum">失败用例数:</label>
<input class="form-control" id="failNum" readonly="readonly" value="${overView.failNum!}"/>
</div>
<div class="form-group flex">
......@@ -71,7 +71,7 @@
<td>${failCase.description!}</td>
<td>${failCase.result?c}</td>
<td>${failCase.duration!}</td>
<td class="clickClass" data-message="${failCase.resultMessage!}">点击</td>
<td class="clickClass" data-message="${failCase.resultMessage!}">查看结果</td>
</tr>
</#list>
<#else>
......@@ -90,7 +90,7 @@
<td>${passCase.description!}</td>
<td>${passCase.result?c}</td>
<td>${passCase.duration!}</td>
<td class="clickClass" data-message="${passCase.resultMessage!}">点击</td>
<td class="clickClass" data-message="${passCase.resultMessage!}">查看结果</td>
</tr>
</#list>
<#else>
......@@ -105,14 +105,14 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Modal title</h4>
<h4 class="modal-title" id="myModalLabel">结果信息</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" id="grp">
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
</div>
</div>
</div>
......@@ -127,7 +127,7 @@
let d = c.split(',')
let e = []
d.map(v => {
e.push({key: v.split('=')[0], value: v.split('=')[1]})
e.push({key: v.split('=')[0] + ":", value: v.split('=')[1]})
})
return e
}
......
kt-base/src/main/resources/templates/overviewBeautiful.ftl deleted 100644 → 0
浏览文件 @ 93204ead
This source diff could not be displayed because it is too large. You can view the blob instead.
kt-base/src/main/resources/templates/overviewBeautifuls.ftl deleted 100644 → 0
浏览文件 @ 93204ead
This source diff could not be displayed because it is too large. You can view the blob instead.
kt-web/src/main/resources/reports/index.html
浏览文件 @ 3407e9eb
......@@ -20,19 +20,19 @@
<div class="topTitle">报告汇总</div>
<form class="form">
<div class="form-group flex">
<label for="total">用例总数:</label>
<label for="total">测试用例总数:</label>
<input type="text" class="form-control" id="total" readonly="readonly" value="total"/>
</div>
<div class="form-group flex">
<label for="allTime">执行时间(s):</label>
<label for="allTime">执行总耗时:</label>
<input type="text" class="form-control" id="allTime" readonly="readonly" value="allTime"/>
</div>
<div class="form-group flex">
<label for="passNum">通过:</label>
<label for="passNum">通过用例数:</label>
<input type="text" class="form-control" id="passNum" readonly="readonly" value="passNum"/>
</div>
<div class="form-group flex">
<label for="failNum">失败:</label>
<label for="failNum">失败用例数:</label>
<input type="text" class="form-control" id="failNum" readonly="readonly" value="failNum"/>
</div>
<div class="form-group flex">
......@@ -58,15 +58,15 @@
<tbody>
<tr>
<th scope="row">1</th>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>名称</td>
<td>类型</td>
<td>参数</td>
<td>描述</td>
<td>true/false</td>
<td>时间</td>
<td class="clickClass"
data-message="CheckPointResult(checkPointResultDetails=[CheckPointResultDetail(isSuccess=true, type=EXCEPTION_CHECK, matchExpression=string, parseExpression=string, message=string)])">
点击
查看结果
</td>
</tr>
</tbody>
......@@ -79,7 +79,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Modal title</h4>
<h4 class="modal-title" id="myModalLabel">结果信息</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" id="grp">
......@@ -87,8 +87,7 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
</div>
</div>
</div>
......@@ -103,7 +102,7 @@
let d = c.split(',')
let e = []
d.map(v => {
e.push({key: v.split('=')[0], value: v.split('=')[1]})
e.push({key: v.split('=')[0] + ":", value: v.split('=')[1]})
})
return e
}
......@@ -131,8 +130,6 @@
}
}
})
</script>
</body>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论