diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java index 57294ca00e..95c91d1468 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportStructureService.java @@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.metersphere.api.dto.ApiScenarioReportDTO; +import io.metersphere.api.dto.RequestResultExpandDTO; import io.metersphere.api.dto.StepTreeDTO; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.ApiScenarioMapper; import io.metersphere.base.mapper.ApiScenarioReportResultMapper; import io.metersphere.base.mapper.ApiScenarioReportStructureMapper; import io.metersphere.commons.constants.MsTestElementConstants; +import io.metersphere.commons.utils.BeanUtils; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.constants.RunModeConstants; import io.metersphere.dto.RequestResult; @@ -222,14 +224,15 @@ public class ApiScenarioReportStructureService { } } if (StringUtils.isNotEmpty(dto.getType()) && requests.contains(dto.getType()) && dto.getValue() == null) { - RequestResult requestResult = new RequestResult(); - requestResult.setName(dto.getLabel()); - dto.setValue(requestResult); + RequestResultExpandDTO requestResultExpandDTO = new RequestResultExpandDTO(); + requestResultExpandDTO.setStatus("unexecute"); + requestResultExpandDTO.setName(dto.getLabel()); + dto.setValue(requestResultExpandDTO); } if (CollectionUtils.isNotEmpty(dto.getChildren())) { reportFormatting(dto.getChildren(), maps); if (StringUtils.isEmpty(dto.getErrorCode())) { - //统计child的errorCode + //统计child的errorCode,合并到parent中 List childErrorCodeList = new ArrayList<>(); for (StepTreeDTO child : dto.getChildren()) { if (StringUtils.isNotEmpty(child.getErrorCode()) && !childErrorCodeList.contains(child.getErrorCode())) { diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue index 8dba373bc9..89dab85d48 100644 --- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue +++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue @@ -49,13 +49,17 @@ {{ $t('commons.testing') }} - - {{ $t('error_report_library.option.name') }} - {{ $t('api_test.home_page.detail_card.unexecute') }} + {{ + $t('api_test.home_page.detail_card.unexecute') + }} + + + {{ $t('error_report_library.option.name') }} + {{ $t('api_report.success') }} {{ $t('api_report.fail') }} @@ -223,6 +227,12 @@ export default { color: #6D317C; } +.ms-test-error_code { + color: #F6972A; + background-color: #FDF5EA; + border-color: #FDF5EA; +} + .ms-api-col { background-color: #EFF0F0; border-color: #EFF0F0;