diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java index b4e936f863..0f7f45e728 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java @@ -31,6 +31,7 @@ import io.metersphere.service.ScenarioExecutionInfoService; import io.metersphere.service.SystemParameterService; import io.metersphere.service.UserService; import io.metersphere.track.dto.PlanReportCaseDTO; +import io.metersphere.track.dto.UiRunModeConfigDTO; import io.metersphere.utils.LoggerUtil; import io.metersphere.xmind.utils.FileUtil; import org.apache.commons.beanutils.BeanMap; @@ -907,7 +908,11 @@ public class ApiScenarioReportService { if (config != null) { report.setEnvConfig(JSON.toJSONString(config)); } - report.setReportType(ReportTypeConstants.SCENARIO_INDEPENDENT.name()); + if (config instanceof UiRunModeConfigDTO) { + report.setReportType(ReportTypeConstants.UI_INDEPENDENT.name()); + } else { + report.setReportType(ReportTypeConstants.SCENARIO_INDEPENDENT.name()); + } return report; } diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue index b8f2ede30a..152abd67ab 100644 --- a/frontend/src/business/components/task/TaskCenter.vue +++ b/frontend/src/business/components/task/TaskCenter.vue @@ -81,7 +81,7 @@
- {{ getModeName(item.executionModule) }} : {{ + {{ getModeName(item) }} : {{ item.name }} @@ -327,10 +327,14 @@ export default { } return true; }, - getModeName(executionModule) { - switch (executionModule) { + getModeName(item) { + switch (item.executionModule) { case "SCENARIO": - return this.$t('test_track.scenario_test_case'); + if (item.reportType !== "UI_INDEPENDENT") { + return this.$t('test_track.scenario_test_case'); + } else { + return this.$t("test_track.ui_scenario_test_case"); + } case "PERFORMANCE": return this.$t('test_track.performance_test_case'); case "API": diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index a9f5f22c37..8b425005ce 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -2060,6 +2060,7 @@ export default { ui_test_case: "UI Case", performance_test_case: "Performance Case", scenario_test_case: "Scenario Case", + ui_scenario_test_case: "UI Scenario Case", report_statistics: "Report Statistics", sort: 'Sort', other_test_name: 'Other Test Name', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 472869aaa7..b1a060d0a5 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -2067,6 +2067,7 @@ export default { ui_test_case: "UI 测试用例", performance_test_case: "性能测试用例", scenario_test_case: "场景测试用例", + ui_scenario_test_case: "UI 测试用例", report_statistics: "报告统计", sort: '种类', other_test_name: '其他测试名称', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index cdadedbdf7..3bf3e7fb1a 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -2064,6 +2064,7 @@ export default { ui_test_case: "UI 測試用例", performance_test_case: "性能測試用例", scenario_test_case: "場景測試用例", + ui_scenario_test_case: "UI 測試用例", report_statistics: "報告統計", sort: '種類', other_test_name: '其他測試名稱',