test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划,系统设置): #1006013 【测试计划】执行计划，查看测试报告，报告页面异常；系统设置删除项目报错 

--bug=1006013 --user=宋天阳 【测试计划】执行计划，查看测试报告，报告页面异常
https://www.tapd.cn/55049933/s/1040472；系统设置删除项目报错
This commit is contained in:
song-tianyang 2021-08-26 11:08:28 +08:00 committed by 刘瑞斌
parent 39ec7debf5
commit 5d5ef4baff
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/service/ProjectService.java
View File

@ -194,7 +194,11 @@ public class ProjectService {
deleteProjectUserGroup(projectId); deleteProjectUserGroup(projectId);
//关闭TCP //关闭TCP
try {
//捕获关闭失败的异常，使其不影响删除
this.closeMockTcp(projectId); this.closeMockTcp(projectId);
}catch (Exception e){}
// delete project // delete project
projectMapper.deleteByPrimaryKey(projectId); projectMapper.deleteByPrimaryKey(projectId);

2
backend/src/main/java/io/metersphere/track/service/TestPlanService.java
View File

@ -990,7 +990,6 @@ public class TestPlanService {
@Transactional(propagation = Propagation.NOT_SUPPORTED) @Transactional(propagation = Propagation.NOT_SUPPORTED)
public String run(String testPlanID, String projectID, String userId, String triggerMode, String apiRunConfig) { public String run(String testPlanID, String projectID, String userId, String triggerMode, String apiRunConfig) {
triggerMode = ReportTriggerMode.SCHEDULE.name();
//创建测试报告，然后返回的ID重新赋值为resourceID，作为后续的参数 //创建测试报告，然后返回的ID重新赋值为resourceID，作为后续的参数
TestPlanScheduleReportInfoDTO reportInfoDTO = testPlanReportService.genTestPlanReportBySchedule(projectID, testPlanID, userId, triggerMode); TestPlanScheduleReportInfoDTO reportInfoDTO = testPlanReportService.genTestPlanReportBySchedule(projectID, testPlanID, userId, triggerMode);
@ -1647,6 +1646,7 @@ public class TestPlanService {
buildApiReport(report, config, executeInfo, planId, saveResponse); buildApiReport(report, config, executeInfo, planId, saveResponse);
buildLoadReport(report, config, executeInfo, planId, saveResponse); buildLoadReport(report, config, executeInfo, planId, saveResponse);
report.setEndTime(System.currentTimeMillis());
return report; return report;
}else { }else {
return null; return null;

2
frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
View File

@ -98,6 +98,8 @@ export default {
apiCases() { apiCases() {
if (this.apiCases) { if (this.apiCases) {
this.$emit('setSize', this.apiCases.length); this.$emit('setSize', this.apiCases.length);
} else {
this.apiCases = [];
} }
} }
}, },