From 58758ffd905340457c40a0e485f83da6524900a5 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 18 Oct 2023 13:11:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E5=AF=BC=E5=87=BA=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=97=B6=E6=94=AF=E6=8C=81=E6=96=B0=E7=89=88=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/report/PerformanceReportExport.vue  | 11 ++++++++++-
 .../src/business/report/PerformanceReportView.vue    |  4 ++++
 .../report/components/samples/SamplesDrawer.vue      | 12 ++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/performance-test/frontend/src/business/report/PerformanceReportExport.vue b/performance-test/frontend/src/business/report/PerformanceReportExport.vue
index fe76abcb25..63ac301e4b 100644
--- a/performance-test/frontend/src/business/report/PerformanceReportExport.vue
+++ b/performance-test/frontend/src/business/report/PerformanceReportExport.vue
@@ -26,6 +26,13 @@
       </template>
       <ms-report-request-statistics :report="report" ref="requestStatistics"/>
     </el-card>
+
+    <el-card v-if="haveErrorSamples" id="errorSamples" title="'errorSamples'">
+      <template v-slot:header>
+        <span class="title">{{ $t('report.test_error_log') }}</span>
+      </template>
+      <samples-tabs ref="errorSamples" :samples="errorSamples"/>
+    </el-card>
     <el-card id="errorLog" title="'errorLog'">
       <template v-slot:header>
         <span class="title">{{ $t('report.test_error_log') }}</span>
@@ -52,11 +59,13 @@ import MsReportExportTemplate from "metersphere-frontend/src/components/report/M
 import MsReportTestDetails from "./components/TestDetails";
 import MonitorCard from "./components/MonitorCard";
 import MsTag from "metersphere-frontend/src/components/MsTag";
+import SamplesTabs from "@/business/report/components/samples/SamplesTabs.vue";
 
 
 export default {
   name: "MsPerformanceReportExport",
   components: {
+    SamplesTabs,
     MonitorCard,
     MsReportExportTemplate,
     MsReportTitle,
@@ -66,7 +75,7 @@ export default {
     MsReportTestOverview,
     MsTag,
   },
-  props: ['report', 'title', 'projectEnvMap']
+  props: ['report', 'title', 'projectEnvMap', 'haveErrorSamples', 'errorSamples']
 }
 </script>
 
diff --git a/performance-test/frontend/src/business/report/PerformanceReportView.vue b/performance-test/frontend/src/business/report/PerformanceReportView.vue
index f4419775d4..dd6de1aa8c 100644
--- a/performance-test/frontend/src/business/report/PerformanceReportView.vue
+++ b/performance-test/frontend/src/business/report/PerformanceReportView.vue
@@ -124,6 +124,7 @@
         </div>
 
         <ms-performance-report-export :title="reportName" id="performanceReportExport" v-show="reportExportVisible"
+                                      :error-samples="errorSamples" :have-error-samples="haveErrorSamples"
                                       :project-env-map="allProjectEnvMap"
                                       :report="report"/>
 
@@ -389,6 +390,9 @@ export default {
       this.$nextTick(function () {
         setTimeout(() => {
           let ids = ['testOverview', 'testDetails', 'requestStatistics', 'errorLog', 'monitorCard'];
+          if (this.haveErrorSamples) {
+            ids = ['testOverview', 'testDetails', 'requestStatistics', 'errorSamples', 'monitorCard'];
+          }
           let promises = [];
           ids.forEach(id => {
             let promise = html2canvas(document.getElementById(id), {scale: 2});
diff --git a/performance-test/frontend/src/business/report/components/samples/SamplesDrawer.vue b/performance-test/frontend/src/business/report/components/samples/SamplesDrawer.vue
index 630bbe4e4c..dd5491b0e8 100644
--- a/performance-test/frontend/src/business/report/components/samples/SamplesDrawer.vue
+++ b/performance-test/frontend/src/business/report/components/samples/SamplesDrawer.vue
@@ -50,14 +50,18 @@ export default {
     datetimeFormat,
 
     handleClose(done) {
+      this.activeName = '1';
+      this.sampleRecord = [];
       done();
     },
     openRecord(samples) {
       this.sampleRecord = [];
-      samples.forEach(sample => {
-        this.sampleRecord.push(sample);
-      });
-      this.drawer = true;
+      this.$nextTick(() => {
+        samples.forEach(sample => {
+          this.sampleRecord.push(sample);
+        });
+        this.drawer = true;
+      })
     },
   },
 }