fix(UI测试): UI报告列表展示了接口报告
This commit is contained in:
parent
5e85378be3
commit
dc803f430a
|
@ -17,7 +17,8 @@ public class QueryAPIReportRequest {
|
|||
private String workspaceId;
|
||||
private String userId;
|
||||
private String reportType;
|
||||
private boolean recent = false;
|
||||
private boolean recent;
|
||||
private Boolean isUi = false;
|
||||
private List<OrderRequest> orders;
|
||||
private Map<String, List<String>> filters;
|
||||
private Map<String, Object> combine;
|
||||
|
|
|
@ -169,6 +169,14 @@
|
|||
AND s_r.project_id = #{request.projectId}
|
||||
</if>
|
||||
|
||||
<if test="request.isUi">
|
||||
AND s_r.report_type like 'UI%'
|
||||
</if>
|
||||
|
||||
<if test="!request.isUi">
|
||||
AND s_r.report_type not like 'UI%'
|
||||
</if>
|
||||
|
||||
<if test="request.filters != null and request.filters.size() > 0">
|
||||
<foreach collection="request.filters.entrySet()" index="key" item="values">
|
||||
<if test="values != null and values.size() > 0">
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<template v-slot:header>
|
||||
<ms-table-header :condition.sync="condition" @search="search" :show-create="false">
|
||||
<template v-slot:button>
|
||||
<el-button-group>
|
||||
<el-button-group v-if="!isUI">
|
||||
|
||||
<el-tooltip class="item" effect="dark" content="left" :disabled="true" placement="left">
|
||||
<el-button plain :class="{active: leftActive}" @click="changeTab('left')">{{$t('commons.scenario')}}</el-button>
|
||||
|
@ -263,6 +263,10 @@ export default {
|
|||
if(this.trashActiveDom==='left'){
|
||||
this.reportTypeFilters =this.reportScenarioFilters;
|
||||
url = "/api/scenario/report/list/" + this.currentPage + "/" + this.pageSize;
|
||||
this.condition.isUi = false;
|
||||
if (this.isUI) {
|
||||
this.condition.isUi = true;
|
||||
}
|
||||
}else{
|
||||
this.reportTypeFilters =this.reportCaseFilters;
|
||||
url = "/api/execute/result/list/" + this.currentPage + "/" + this.pageSize;
|
||||
|
|
Loading…
Reference in New Issue