From 8e3407bbcb9e6d0c60af91503eafeeab95ed18c8 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 10 Jun 2021 17:30:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=A5=BC=E5=9B=BE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=20console=20=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/report/ApiReportExport.vue      |  2 +-
 .../automation/report/components/MetricChart.vue   | 14 ++++++++++----
 .../automation/report/components/ResponseText.vue  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportExport.vue b/frontend/src/business/components/api/automation/report/ApiReportExport.vue
index 34cb5ecf80..ce00198e50 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportExport.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportExport.vue
@@ -1,6 +1,6 @@
 <template>
   <ms-report-export-template :title="title" :type="$t('report.api_test_report')">
-    <ms-metric-chart :content="content" :totalTime="totalTime"/>
+    <ms-metric-chart :content="content" :is-export="true" :totalTime="totalTime"/>
     <div class="scenario-result" v-for="(scenario, index) in content.scenarios" :key="index" :scenario="scenario">
       <div>
         <el-card>
diff --git a/frontend/src/business/components/api/automation/report/components/MetricChart.vue b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
index a502103321..add6a6d5f0 100644
--- a/frontend/src/business/components/api/automation/report/components/MetricChart.vue
+++ b/frontend/src/business/components/api/automation/report/components/MetricChart.vue
@@ -9,13 +9,15 @@
             </div>
           </el-row>
 
-          <!--<ms-chart id="chart" ref="chart" :options="options" :autoresize="true"></ms-chart>-->
-          <span class="ms-req ms-req-error" v-if="content.error && content.error>0">
+          <div v-if="isExport">
+             <span class="ms-req ms-req-error" v-if="content.error && content.error>0">
                 <span class="ms-req-span"> {{content.success+content.error}} 请求</span>
            </span>
-          <span class="ms-req ms-req-success" v-else>
+            <span class="ms-req ms-req-success" v-else>
                 <span class="ms-req-span">  {{content.success? content.success+content.error :0}} 请求</span>
            </span>
+          </div>
+          <ms-chart id="chart" ref="chart" :options="options" :autoresize="true" v-else/>
           <el-row type="flex" justify="center" align="middle">
             <i class="circle success"/>
             <div class="metric-box">
@@ -87,7 +89,11 @@
     components: {MsChart},
     props: {
       content: Object,
-      totalTime: Number
+      totalTime: Number,
+      isExport:{
+        type: Boolean,
+        default: false,
+      }
     },
     data() {
       return {
diff --git a/frontend/src/business/components/api/automation/report/components/ResponseText.vue b/frontend/src/business/components/api/automation/report/components/ResponseText.vue
index 3a3c8284dd..f7f7ea82a0 100644
--- a/frontend/src/business/components/api/automation/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/automation/report/components/ResponseText.vue
@@ -12,7 +12,7 @@
         </el-tab-pane>
 
         <el-tab-pane :label="$t('api_test.definition.request.console')" name="console" class="pane">
-          <pre>{{ console }}</pre>
+          <pre>{{ console ? console : response.console }}</pre>
         </el-tab-pane>
 
         <el-tab-pane :label="$t('api_report.assertions')" name="assertions" class="pane assertions">