test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(工作台): 功能用例仪表盘数目与列表不一致 

--bug=1026482 --user=宋昌昌 【工作台】我的仪表盘中的我创建的功能用例数量跟跳转到我创建的功能用例统计的数量不一致 https://www.tapd.cn/55049933/s/1375631
This commit is contained in:
song-cc-rock 2023-05-25 11:54:51 +08:00 committed by fit2-zhao
parent c744030a1a
commit 3aac1506a7
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java
View File

@ -95,7 +95,6 @@ public class WorkstationService {
operatorValue.put("operator", "current user");
operatorValue.put("value", "current user");
combine.put("creator", operatorValue);
Map<String, List<String>> filter = new HashMap<>(2);
testPlanRequest.setCombine(combine);
apiTestCaseRequest.setCombine(combine);
ApiScenarioRequest apiScenarioRequest = new ApiScenarioRequest();
@ -110,12 +109,6 @@ public class WorkstationService {
if (isWeek) {
testCaseRequest.setCreateTime(createTime);
}
List<String> status = new ArrayList<>();
status.add("Prepare");
status.add("Pass");
status.add("UnPass");
filter.put("reviewStatus", status);
testCaseRequest.setFilters(filter);
//query db
int apiScenarioCaseCount = extApiScenarioMapper.listModule(apiScenarioRequest);
int apiTestCaseCount = extApiTestCaseMapper.moduleCount(apiTestCaseRequest);

14
workstation/frontend/src/business/component/CaseTableList.vue
View File

@ -424,14 +424,6 @@ export default {
} else {
this.condition.filters = { status: ["Trash"] };
}
} else {
if (this.condition.filters) {
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
} else {
this.condition.filters = {
review_status: ["Prepare", "Underway", "Pass", "UnPass"],
};
}
}
this.condition.versionId = this.currentVersion;
this.initTableData();
@ -445,11 +437,6 @@ export default {
},
activated() {
this.getTemplateField();
if (this.condition.filters) {
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
} else {
this.condition.filters = { review_status: ["Prepare", "Underway", "Pass", "UnPass"] };
}
let ids = this.$route.params.ids;
if (ids) {
this.condition.ids = ids;
@ -689,7 +676,6 @@ export default {
this.condition.selectThisWeedData = false;
this.condition.selectThisWeedRelevanceData = false;
this.condition.caseCoverage = null;
this.condition.filters.review_status = ["Prepare", "Underway", "Pass", "UnPass"];
switch (this.selectDataRange) {
case "thisWeekCount":
this.condition.selectThisWeedData = true;

2
workstation/frontend/src/business/othermodule/track/ReviewStatus.vue
View File

@ -3,6 +3,8 @@
<ms-tag v-if="value === 'Prepare'" type="info" :content="$t('test_track.review.prepare')"/>
<ms-tag v-if="value === 'Pass'" type="success" :content="$t('test_track.review.pass')"/>
<ms-tag v-if="value === 'UnPass'" type="danger" :content="$t('test_track.review.un_pass')"/>
<ms-tag v-if="value === 'Underway'" type="primary" :content="$t('test_track.review.underway')"/>
<ms-tag v-if="value === 'Again'" type="warning" :content="$t('test_track.review.again')"/>
</span>
</template>

2
workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue
View File

@ -39,8 +39,10 @@ export default {
return {
reviewStatusFilters: [
{text: this.$t('test_track.review.prepare'), value: 'Prepare'},
{text: this.$t('test_track.review.again'), value: 'Again'},
{text: this.$t('test_track.review.pass'), value: 'Pass'},
{text: this.$t('test_track.review.un_pass'), value: 'UnPass'},
{text: this.$t('test_track.review.underway'), value: 'Underway'}
]
}
}