diff --git a/backend/src/main/java/io/metersphere/report/JtlResolver.java b/backend/src/main/java/io/metersphere/report/JtlResolver.java index ba423a1ac8..f518c37b38 100644 --- a/backend/src/main/java/io/metersphere/report/JtlResolver.java +++ b/backend/src/main/java/io/metersphere/report/JtlResolver.java @@ -434,22 +434,22 @@ public class JtlResolver { totalLineList.sort(Comparator.comparing(t0 -> Long.valueOf(t0.getTimestamp()))); String startTimeStamp = totalLineList.get(0).getTimestamp(); - String endTimeStamp = totalLineList.get(totalLineList.size() - 1).getTimestamp(); + String endTimeStamp = totalLineList.get(totalLineList.size()-1).getTimestamp(); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"); String startTime = dtf.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.parseLong(startTimeStamp)), ZoneId.systemDefault())); String endTime = dtf.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.parseLong(endTimeStamp)), ZoneId.systemDefault())); reportTimeInfo.setStartTime(startTime); reportTimeInfo.setEndTime(endTime); + Date startDate = new Date(Long.parseLong(startTimeStamp)); + Date endDate = new Date(Long.parseLong(endTimeStamp)); + long timestamp = endDate.getTime() - startDate.getTime(); + reportTimeInfo.setDuration(String.valueOf(timestamp*1.0 / 1000 / 60)); + + // todo 时间问题 long seconds = Duration.between(Instant.ofEpochMilli(Long.parseLong(startTimeStamp)), Instant.ofEpochMilli(Long.parseLong(endTimeStamp))).getSeconds(); - String duration; - if (seconds / 60 == 0) { - duration = String.valueOf(1); - } else { - duration = String.valueOf(seconds / 60); - } - reportTimeInfo.setDuration(duration); + reportTimeInfo.setDuration(String.valueOf(seconds)); return reportTimeInfo; } diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue index 2326cb5493..58a63cc689 100644 --- a/frontend/src/business/components/performance/report/PerformanceReportView.vue +++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue @@ -20,7 +20,7 @@ - 持续时间: {{minutes}} 分钟 + 持续时间: {{minutes}} 分钟 {{seconds}} 秒 开始时间: {{startTime}} @@ -79,6 +79,7 @@ startTime: '0', endTime: '0', minutes: '0', + seconds: '0' } }, methods: { @@ -101,7 +102,9 @@ if(data){ this.startTime = data.startTime; this.endTime = data.endTime; - this.minutes = data.duration; + let duration = data.duration; + this.minutes = Math.floor(duration / 60); + this.seconds = duration % 60; } }) } @@ -144,7 +147,9 @@ if(data){ this.startTime = data.startTime; this.endTime = data.endTime; - this.minutes = data.duration; + let duration = data.duration; + this.minutes = Math.floor(duration / 60); + this.seconds = duration % 60; } }) window.location.reload();