fix(测试跟踪): 修改测试计划报告的完成率为执行完成率

修改测试计划报告的完成率为执行完成率
metersphere · May 11, 2023 · 382e366 · 382e366
1 parent 127e7e5
commit 382e366
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java b/backend/src/main/java/io/metersphere/commons/utils/TestPlanUtils.java
@@ -67,8 +67,8 @@ public static void buildStatusResultMap(List<PlanReportCaseDTO> planReportCaseDT
             report.setCaseCount((report.getCaseCount() == null ? 0 : report.getCaseCount()) + 1);
             String status = item.getStatus();
             if (StringUtils.isNotBlank(status)
-                    && !StringUtils.equalsAnyIgnoreCase(status, TestPlanTestCaseStatus.Underway.name(), TestPlanTestCaseStatus.Prepare.name(),
-                    ExecuteResult.UN_EXECUTE.toString(), ExecuteResult.STOP.toString(), ExecuteResult.WAITING.toString())) {
+                    && !StringUtils.equalsAnyIgnoreCase(status, TestPlanTestCaseStatus.Underway.name(), TestPlanTestCaseStatus.Prepare.name(),TestPlanTestCaseStatus.Blocking.name(),
+                    ExecuteResult.UN_EXECUTE.toString(), ExecuteResult.STOP.toString(), ExecuteResult.WAITING.toString(), ExecuteResult.TEST_PLAN_PREPARE.toString(), ExecuteResult.TEST_PLAN_RUNNING.toString())) {
                 // 计算执行过的数量
                 report.setExecuteCount(report.getExecuteCount() + 1);
                 if (StringUtils.equals(successStatus, status)) {

diff --git a/...rc/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/...rc/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -11,7 +11,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item :label="$t('test_track.report.exacutive_rate') + ':'">
+          <el-form-item :label="$t('test_track.report.executive_finish_rate') + ':'">
             {{ (report.executeRate ? (report.executeRate * 100).toFixed(1) : 0) + '%'}}
             <ms-instructions-icon :content="$t('test_track.report.exacutive_rate_tip')"/>
           </el-form-item>

diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
@@ -2503,6 +2503,7 @@ export default {
       testing_time: "Testing time",
       total_number_tests: "Total",
       exacutive_rate: "Exacutive rate",
+      executive_finish_rate: "Executive finish rate",
       exacutive_rate_tip: "Use cases executed/all use cases * 100%",
       passing_rate: "Passing rate",
       passing_rate_tip: "Execute passed use cases/all use cases * 100%",

diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
@@ -2509,6 +2509,7 @@ export default {
       testing_time: "测试时间",
       total_number_tests: "测试总数",
       exacutive_rate: "执行率",
+      executive_finish_rate: "执行完成率",
       exacutive_rate_tip: "执行过的用例/所有用例 * 100%",
       passing_rate: "通过率",
       passing_rate_tip: "执行通过用例/所有用例 * 100%",

diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
@@ -2505,6 +2505,7 @@ export default {
       testing_time: "測試時間",
       total_number_tests: "測試總數",
       exacutive_rate: "執行率",
+      executive_finish_rate: "執行完成率",
       exacutive_rate_tip: "執行過的用例/所有用例 * 100%",
       passing_rate: "通過率",
       passing_rate_tip: "執行通過用例/所有用例 * 100%",