From 7530fff6812fff140276e123f4f58e0c87242b78 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 13 Aug 2020 09:51:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4=EF=BC=8C=E5=93=8D=E5=BA=94=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/report/ApiReportView.vue     | 10 +++++++---
 .../api/report/components/MetricChart.vue       |  9 ++++++---
 .../api/report/components/RequestResult.vue     | 17 +++++++++--------
 .../api/report/components/ResponseText.vue      |  5 +----
 .../components/common/components/MsCodeEdit.vue |  6 ++----
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue
index 579f277332..df1037b4c1 100644
--- a/frontend/src/business/components/api/report/ApiReportView.vue
+++ b/frontend/src/business/components/api/report/ApiReportView.vue
@@ -42,6 +42,7 @@
   import MsScenarioResult from "./components/ScenarioResult";
   import MsMetricChart from "./components/MetricChart";
   import MsScenarioResults from "./components/ScenarioResults";
+  import {Scenario} from "../test/model/ScenarioModel";
 
   export default {
     name: "MsApiReportView",
@@ -119,9 +120,12 @@
         }
       },
       requestResult(requestResult) {
-        this.isRequestResult = true;
-        this.request = requestResult.request;
-        this.scenarioName = requestResult.scenarioName;
+        this.isRequestResult = false;
+        this.$nextTick(function () {
+          this.isRequestResult = true;
+          this.request = requestResult.request;
+          this.scenarioName = requestResult.scenarioName;
+        });
       }
     },
 
diff --git a/frontend/src/business/components/api/report/components/MetricChart.vue b/frontend/src/business/components/api/report/components/MetricChart.vue
index 004b882583..e5ca53c7c4 100644
--- a/frontend/src/business/components/api/report/components/MetricChart.vue
+++ b/frontend/src/business/components/api/report/components/MetricChart.vue
@@ -3,9 +3,12 @@
     <el-row type="flex" align="middle">
       <div style="width: 50%">
         <el-row type="flex" justify="center" align="middle">
-          <div class="metric-time">
-            <div class="value" style="margin-left: -150px">{{time}}</div>
-          </div>
+          <el-row>
+            <div class="metric-time">
+              <div class="value" style="margin-right: 10px">{{time}}</div>
+            </div>
+          </el-row>
+
           <chart id="chart" ref="chart" :options="options" :autoresize="true"></chart>
           <el-row type="flex" justify="center" align="middle">
             <i class="circle success"/>
diff --git a/frontend/src/business/components/api/report/components/RequestResult.vue b/frontend/src/business/components/api/report/components/RequestResult.vue
index 2cd63aab03..f333a6796c 100644
--- a/frontend/src/business/components/api/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/report/components/RequestResult.vue
@@ -39,17 +39,18 @@
     methods: {
       active() {
         this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName});
+
       }
     },
 
-    computed: {
-      assertion() {
-        return this.request.passAssertions + " / " + this.request.totalAssertions;
-      },
-      hasSub() {
-        return this.request.subRequestResults.length > 0;
-      }
-    }
+    /*  computed: {
+        assertion() {
+          return this.request.passAssertions + " / " + this.request.totalAssertions;
+        },
+        hasSub() {
+          return this.request.subRequestResults.length > 0;
+        }
+      }*/
   }
 </script>
 
diff --git a/frontend/src/business/components/api/report/components/ResponseText.vue b/frontend/src/business/components/api/report/components/ResponseText.vue
index 77b87fb7c7..6dc3c409ac 100644
--- a/frontend/src/business/components/api/report/components/ResponseText.vue
+++ b/frontend/src/business/components/api/report/components/ResponseText.vue
@@ -7,10 +7,7 @@
     <el-collapse-transition>
       <el-tabs v-model="activeName" v-show="isActive">
         <el-tab-pane label="Body" name="body" class="pane">
-          <!--
-                    <ms-code-edit :mode="mode" :read-only="true" :data="response.body" :modes="modes" ref="codeEdit"/>
-          -->
-          <pre>{{response.body}}</pre>
+          <ms-code-edit :mode="mode" :read-only="true" :data="response.body" :modes="modes" ref="codeEdit"/>
         </el-tab-pane>
         <el-tab-pane label="Headers" name="headers" class="pane">
           <pre>{{response.headers}}</pre>
diff --git a/frontend/src/business/components/common/components/MsCodeEdit.vue b/frontend/src/business/components/common/components/MsCodeEdit.vue
index 94c949d2fe..5e50d959db 100644
--- a/frontend/src/business/components/common/components/MsCodeEdit.vue
+++ b/frontend/src/business/components/common/components/MsCodeEdit.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
     <editor v-model="formatData" :lang="mode" @init="editorInit" theme="chrome"/>
-  </div>
 </template>
 
 <script>
@@ -65,7 +63,7 @@
             this.init(editor);
           }
         },
-        /*format() {
+        format() {
           if (this.mode === 'json') {
             try {
               this.formatData = JSON.stringify(JSON.parse(this.data), null, '\t');
@@ -79,7 +77,7 @@
               this.formatData = this.data;
             }
           }
-        }*/
+        }
       }
     }
 </script>