From 7ca416a20cfe4c267b6063f277453cfeb99d2050 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Tue, 24 Aug 2021 22:34:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BAhtml=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=89=93=E5=BC=80=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/dto/automation/ApiScenarioDTO.java | 1 - .../api/dto/automation/TestPlanFailureApiDTO.java | 2 -- .../api/dto/automation/TestPlanFailureScenarioDTO.java | 5 ----- .../main/java/io/metersphere/track/dto/TestPlanCaseDTO.java | 1 - .../java/io/metersphere/track/service/TestPlanService.java | 3 ++- .../performance/report/components/TestOverview.vue | 2 +- .../view/comonents/report/detail/TestPlanOverviewReport.vue | 4 ++-- 7 files changed, 5 insertions(+), 13 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java index 0a3ea1e9b3..117302645b 100644 --- a/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java +++ b/backend/src/main/java/io/metersphere/api/dto/automation/ApiScenarioDTO.java @@ -16,7 +16,6 @@ public class ApiScenarioDTO extends ApiScenarioWithBLOBs { private String principalName; private List tagNames; private String deleteUser; - private Long deleteTime; /** * 场景跨项目ID diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureApiDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureApiDTO.java index c77bd7a492..097f829e2b 100644 --- a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureApiDTO.java +++ b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureApiDTO.java @@ -12,7 +12,5 @@ public class TestPlanFailureApiDTO extends TestPlanApiCaseDTO { private String projectName; - private String caseId; - private String response; } diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureScenarioDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureScenarioDTO.java index a70e4de82a..f1c7fa6d6c 100644 --- a/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureScenarioDTO.java +++ b/backend/src/main/java/io/metersphere/api/dto/automation/TestPlanFailureScenarioDTO.java @@ -8,10 +8,5 @@ import lombok.Setter; @Setter @JsonInclude(JsonInclude.Include.NON_NULL) public class TestPlanFailureScenarioDTO extends ApiScenarioDTO { - - private String projectName; - - private String caseId; - private APIScenarioReportResult response; } diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java index 347bddaa0d..cbe1fd2985 100644 --- a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java +++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java @@ -11,7 +11,6 @@ import java.util.List; public class TestPlanCaseDTO extends TestCaseWithBLOBs { private String executor; private String executorName; - private String status; private String results; private String planId; private String planName; 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 6614289daa..0fc6b9e9ff 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; import io.metersphere.api.cache.TestPlanExecuteInfo; import io.metersphere.api.cache.TestPlanReportExecuteCatch; import io.metersphere.api.dto.APIReportResult; @@ -1693,7 +1694,7 @@ public class TestPlanService { String line = null; while (null != (line = bufferedReader.readLine())) { if (line.contains("\"#report\"")) { - line = line.replace("\"#report\"", JSONObject.toJSONString(report)); + line = line.replace("\"#report\"", new Gson().toJson(report)); } line += "\n"; byte[] lineBytes = line.getBytes(StandardCharsets.UTF_8); diff --git a/frontend/src/business/components/performance/report/components/TestOverview.vue b/frontend/src/business/components/performance/report/components/TestOverview.vue index e09690f493..2c16831b07 100644 --- a/frontend/src/business/components/performance/report/components/TestOverview.vue +++ b/frontend/src/business/components/performance/report/components/TestOverview.vue @@ -107,6 +107,7 @@ export default { id: '' }; }, + props: ['report', 'export', 'isShare', 'shareId', 'planReportTemplate'], methods: { initTableData() { this.$get("/performance/report/content/testoverview/" + this.id).then(res => { @@ -492,7 +493,6 @@ export default { deep: true } }, - props: ['report', 'export'] }; diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue index 833085d36f..465d1051fb 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanOverviewReport.vue @@ -50,10 +50,10 @@ export default { let startTime = 'NaN'; let endTime = 'NaN'; if (this.report.startTime) { - startTime = timestampFormatDate(this.report.startTime, false).substring(0, 10); + startTime = timestampFormatDate(this.report.startTime, false); } if (this.report.endTime) { - endTime = timestampFormatDate(this.report.endTime, false).substring(0, 10); + endTime = timestampFormatDate(this.report.endTime, false); } return startTime + ' ~ ' + endTime; }