From 35af224764b6bb20df341c3242e9ff49ebd046f7 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 14 Nov 2024 10:51:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/src/main/resources/i18n/dashboard.properties | 6 ++++++ .../sdk/src/main/resources/i18n/dashboard_en_US.properties | 4 ++++ .../sdk/src/main/resources/i18n/dashboard_zh_CN.properties | 5 +++++ .../io/metersphere/dashboard/service/DashboardService.java | 6 +++--- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/dashboard.properties b/backend/framework/sdk/src/main/resources/i18n/dashboard.properties index 31ea3fa891..82c9f5376b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/dashboard.properties +++ b/backend/framework/sdk/src/main/resources/i18n/dashboard.properties @@ -22,6 +22,12 @@ api_management.scenarioPassRate=场景通过率 api_management.passCount=已通过 api_management.unPassCount=未通过 +bug_management.retentionRate=遗留率 +bug_management.totalCount=缺陷总数 +bug_management.retentionCount=遗留缺陷数 + + + diff --git a/backend/framework/sdk/src/main/resources/i18n/dashboard_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/dashboard_en_US.properties index 2040ceb806..985fbf2035 100644 --- a/backend/framework/sdk/src/main/resources/i18n/dashboard_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/dashboard_en_US.properties @@ -21,3 +21,7 @@ api_management.scenarioExecRate=Scenario execution rate api_management.scenarioPassRate=Scenario pass rate api_management.passCount=Passed api_management.unPassCount=Un pass + +bug_management.retentionRate=Retention rate +bug_management.totalCount=Bug total count +bug_management.retentionCount=Retention count diff --git a/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties index a69108c27a..8f50df24db 100644 --- a/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/dashboard_zh_CN.properties @@ -21,3 +21,8 @@ api_management.scenarioExecRate=场景执行率 api_management.scenarioPassRate=场景通过率 api_management.passCount=已通过 api_management.unPassCount=未通过 + + +bug_management.retentionRate=遗留率 +bug_management.totalCount=缺陷总数 +bug_management.retentionCount=遗留缺陷数 \ No newline at end of file diff --git a/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java b/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java index 15763c9807..bb98de5f72 100644 --- a/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java +++ b/backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java @@ -901,11 +901,11 @@ public class DashboardService { NameCountDTO processDTO = getNameCountDTO(CollectionUtils.isEmpty(processList) ? 0 : processList.size(), Translator.get("api_definition.status.ongoing")); NameCountDTO deprecateDTO = getNameCountDTO(CollectionUtils.isEmpty(deprecatedList) ? 0 : deprecatedList.size(), Translator.get("api_definition.status.abandoned")); NameCountDTO debugDTO = getNameCountDTO(CollectionUtils.isEmpty(debugList) ? 0 : debugList.size(), Translator.get("api_definition.status.continuous")); + nameCountDTOS.add(completionRate); + nameCountDTOS.add(doneDTO); + nameCountDTOS.add(processDTO); nameCountDTOS.add(debugDTO); nameCountDTOS.add(deprecateDTO); - nameCountDTOS.add(processDTO); - nameCountDTOS.add(doneDTO); - nameCountDTOS.add(completionRate); Map> statusStatisticsMap = new HashMap<>(); statusStatisticsMap.put("completionRate", nameCountDTOS); statisticsDTO.setStatusPercentList(statusPercentList);