diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 61fd1584f3..ff5deffc33 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -139,8 +139,8 @@ public class JMeterService { JvmInfoDTO jvmInfoDTO = resources.get(index); TestResourceDTO testResource = jvmInfoDTO.getTestResource(); String configuration = testResource.getConfiguration(); - request.setCorePoolSize(MessageCache.corePoolSize); NodeDTO node = JSON.parseObject(configuration, NodeDTO.class); + request.setCorePoolSize(node.getMaxConcurrency()); String nodeIp = node.getIp(); Integer port = node.getPort(); String uri = String.format(BASE_URL + "/jmeter/api/start", nodeIp, port); diff --git a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue index 34b41f173c..82df2a7688 100644 --- a/frontend/src/business/components/api/automation/report/ApiReportDetail.vue +++ b/frontend/src/business/components/api/automation/report/ApiReportDetail.vue @@ -324,16 +324,21 @@ export default { if (data) { this.report = data; if (this.report.reportVersion && this.report.reportVersion > 1) { - if (data.content) { - let report = JSON.parse(data.content); - this.content = report; - this.fullTreeNodes = report.steps; - this.content.console = report.console; - this.content.error = report.error; - this.content.success = (report.total - report.error); - this.totalTime = report.totalTime; + this.report.status = data.status; + if (!this.isNotRunning) { + setTimeout(this.getReport, 2000) + } else { + if (data.content) { + let report = JSON.parse(data.content); + this.content = report; + this.fullTreeNodes = report.steps; + this.content.console = report.console; + this.content.error = report.error; + this.content.success = (report.total - report.error); + this.totalTime = report.totalTime; + } + this.loading = false; } - this.loading = false; } else { this.buildReport(); } @@ -528,10 +533,12 @@ export default { .report-container .is-active .fail { color: inherit; } + .report-console { height: calc(100vh - 270px); overflow-y: auto; } + .export-button { float: right; } diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue index 24557a1c5c..b57532733a 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue @@ -450,7 +450,9 @@ export default { if (this.planId) { this.$post("/test/plan/scenario/case/run", param, response => { this.runVisible = true; - this.reportId = response.data; + if (response.data && response.data.length > 0) { + this.reportId = response.data[0].reportId; + } }); } if (this.reviewId) {