diff --git a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java index aab1b12fbe..7888e2db78 100644 --- a/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java +++ b/workstation/backend/src/main/java/io/metersphere/workstation/service/WorkstationService.java @@ -95,7 +95,6 @@ public class WorkstationService { operatorValue.put("operator", "current user"); operatorValue.put("value", "current user"); combine.put("creator", operatorValue); - Map> 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 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); diff --git a/workstation/frontend/src/business/component/CaseTableList.vue b/workstation/frontend/src/business/component/CaseTableList.vue index 0f7d390489..a555e364e8 100644 --- a/workstation/frontend/src/business/component/CaseTableList.vue +++ b/workstation/frontend/src/business/component/CaseTableList.vue @@ -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; diff --git a/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue b/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue index 7c470d864b..4c0cffdb59 100644 --- a/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue +++ b/workstation/frontend/src/business/othermodule/track/ReviewStatus.vue @@ -3,6 +3,8 @@ + + diff --git a/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue b/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue index b680f6637f..3e818faf93 100644 --- a/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue +++ b/workstation/frontend/src/business/othermodule/track/TestCaseReviewStatusTableItem.vue @@ -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'} ] } }