diff --git a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java index 4067a6981f..264a66f673 100644 --- a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java +++ b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java @@ -133,7 +133,6 @@ public class TestPlanTestJob extends MsScheduleJob { performanceRequest.setId(caseID); performanceRequest.setTestPlanLoadId(caseID); performanceRequest.setTriggerMode(ReportTriggerMode.TEST_PLAN_SCHEDULE.name()); - String reportId = null; try { reportId = performanceTestService.run(performanceRequest); @@ -148,6 +147,11 @@ public class TestPlanTestJob extends MsScheduleJob { }catch (Exception e){ e.printStackTrace(); } + //更新关联处的报告 + TestPlanLoadCase loadCase = new TestPlanLoadCaseDTO(); + loadCase.setId(id); + loadCase.setLoadReportId(reportId); + testPlanLoadCaseService.update(loadCase); } if(!performaneReportIDList.isEmpty()){ diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index bdf0b28af4..2c2a9626f0 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -150,6 +150,7 @@ public class TestPlanService { public List getTestPlanByName(String name) { TestPlanExample example = new TestPlanExample(); example.createCriteria().andWorkspaceIdEqualTo(SessionUtils.getCurrentWorkspaceId()) + .andProjectIdEqualTo(SessionUtils.getCurrentProjectId()) .andNameEqualTo(name); return testPlanMapper.selectByExample(example); } diff --git a/frontend/src/business/components/api/automation/scenario/MsInputTag.vue b/frontend/src/business/components/api/automation/scenario/MsInputTag.vue index b8decca23f..c53111a410 100644 --- a/frontend/src/business/components/api/automation/scenario/MsInputTag.vue +++ b/frontend/src/business/components/api/automation/scenario/MsInputTag.vue @@ -21,7 +21,7 @@ v-if="!readOnly" class="tag-input el-input" v-model="newTag" - placeholder="输入回车添加" + placeholder="$t('commons.tag_tip)" @keydown.delete.stop="removeLastTag" @keydown="addNew" @blur="addNew"/> diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 937990b776..18be511007 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -132,6 +132,7 @@ export default { batch_add: "Batch add", check_project_tip: "Create or select the project first", auth_redirect_tip: 'Jump to the authentication source page for authentication', + tag_tip: "Enter Enter to Add Label", table: { select_tip: "Item {0} data is selected" }, diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index b266f3f1cd..ddd79f959d 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -133,6 +133,7 @@ export default { batch_add: "批量添加", check_project_tip: "请先创建或选择项目", auth_redirect_tip: '即将跳转到认证源页面进行认证', + tag_tip: "输入回车添加标签", table: { select_tip: "已选中 {0} 条数据" }, diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 7d24108c54..0298d2bba4 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -133,6 +133,7 @@ export default { batch_add: "批量添加", check_project_tip: "請先創建或選擇項目", auth_redirect_tip: '即將跳轉到認證源頁面進行認證', + tag_tip: "輸入回車添加標簽", table: { select_tip: "已选中 {0} 条数据" },