From 8eeb6ba40ae7a850a6134b0279e52616710e4740 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Sat, 23 Jul 2022 14:56:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95=E5=9C=BA=E6=99=AF=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B1=95=E7=A4=BA=E8=BF=90=E8=A1=8C=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015004 --user=宋天阳 【接口测试】场景，列表执行或者调试生成报告，没有展示环境信息
https://www.tapd.cn/55049933/s/1208087
---
 .../automation/report/SysnApiReportDetail.vue | 75 +++++++++++--------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
index 15e74cb99e..6cb067a5bd 100644
--- a/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
+++ b/frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
@@ -5,28 +5,29 @@
         <section class="report-container">
           <div style="margin-top: 10px">
             <ms-api-report-view-header
-                :show-cancel-button="false"
-                :debug="debug"
-                :export-flag="exportFlag"
-                :report="report"
-                @reportExport="handleExport"
-                @reportSave="handleSave"/>
+              :show-cancel-button="false"
+              :debug="debug"
+              :export-flag="exportFlag"
+              :report="report"
+              :project-env-map="projectEnvMap"
+              @reportExport="handleExport"
+              @reportSave="handleSave"/>
           </div>
           <main>
             <ms-metric-chart
-                :content="content"
-                :totalTime="totalTime"
-                :report="report"
-                v-if="!loading"/>
+              :content="content"
+              :totalTime="totalTime"
+              :report="report"
+              v-if="!loading"/>
             <div>
               <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane :label="$t('api_report.total')" name="total">
                   <ms-scenario-results
-                      :treeData="fullTreeNodes"
-                      :report="report"
-                      :default-expand="true"
-                      :console="content.console"
-                      v-on:requestResult="requestResult"
+                    :treeData="fullTreeNodes"
+                    :report="report"
+                    :default-expand="true"
+                    :console="content.console"
+                    v-on:requestResult="requestResult"
                   />
                 </el-tab-pane>
                 <el-tab-pane name="fail">
@@ -36,11 +37,11 @@
                     </span>
                   </template>
                   <ms-scenario-results
-                      :console="content.console"
-                      :report="report"
-                      :treeData="fullTreeNodes"
-                      v-on:requestResult="requestResult"
-                      ref="failsTree"
+                    :console="content.console"
+                    :report="report"
+                    :treeData="fullTreeNodes"
+                    v-on:requestResult="requestResult"
+                    ref="failsTree"
                   />
                 </el-tab-pane>
                 <el-tab-pane name="errorReport" v-if="content.errorCode > 0">
@@ -52,7 +53,9 @@
                 </el-tab-pane>
                 <el-tab-pane name="unExecute" v-if="content.unExecute > 0">
                   <template slot="label">
-                    <span class="fail" style="color: #9C9B9A">{{ $t('api_test.home_page.detail_card.unexecute') }}</span>
+                    <span class="fail" style="color: #9C9B9A">{{
+                        $t('api_test.home_page.detail_card.unexecute')
+                      }}</span>
                   </template>
                   <ms-scenario-results v-on:requestResult="requestResult"
                                        :report="report"
@@ -69,11 +72,12 @@
               </el-tabs>
             </div>
             <ms-api-report-export
-                :title="report.testName"
-                :content="content"
-                :total-time="totalTime"
-                id="apiTestReport"
-                v-if="reportExportVisible"
+              :title="report.testName"
+              :content="content"
+              :total-time="totalTime"
+              :project-env-map="projectEnvMap"
+              id="apiTestReport"
+              v-if="reportExportVisible"
             />
           </main>
         </section>
@@ -93,9 +97,9 @@ import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import MsApiReportExport from "./ApiReportExport";
 import MsApiReportViewHeader from "./ApiReportViewHeader";
-import {KeyValue, RequestFactory} from "../../definition/model/ApiTestModel";
-import {windowPrint, getCurrentProjectID, getUUID} from "@/common/js/utils";
-import {ELEMENT_TYPE, STEP, TYPE_TO_C} from "../scenario/Setting";
+import {RequestFactory} from "../../definition/model/ApiTestModel";
+import {getCurrentProjectID, windowPrint} from "@/common/js/utils";
+import {STEP} from "../scenario/Setting";
 
 export default {
   name: "SysnApiReportDetail",
@@ -128,6 +132,7 @@ export default {
       websocket: {},
       stepFilter: new STEP,
       tempResult: [],
+      projectEnvMap: {},
     }
   },
   activated() {
@@ -160,7 +165,14 @@ export default {
   methods: {
     initTree() {
       this.fullTreeNodes = [];
-      let obj = {resId: "root", index: 1, label: this.scenario.name, value: {responseResult: {}, unexecute: true, testing: false}, children: [], unsolicited: true};
+      let obj = {
+        resId: "root",
+        index: 1,
+        label: this.scenario.name,
+        value: {responseResult: {}, unexecute: true, testing: false},
+        children: [],
+        unsolicited: true
+      };
       this.formatContent(this.scenario.scenarioDefinition.hashTree, obj, "", "root");
       this.fullTreeNodes.push(obj);
     },
@@ -332,6 +344,9 @@ export default {
           if (!this.content) {
             this.content = {scenarios: []};
           }
+          if (this.content.projectEnvMap) {
+            this.projectEnvMap = this.content.projectEnvMap;
+          }
           this.content.error = this.content.error;
 
           this.content.success = (this.content.total - this.content.error - this.content.errorCode - this.content.unExecute);