From 0d1d1acd3d684329ce66bef11a4b9400408b3737 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/jmeter/APIBackendListenerClient.java  |  2 +-
 .../api/automation/report/ApiReportList.vue   | 14 ++++-------
 .../api/automation/report/ApiReportView.vue   | 24 +++++++++++++++++++
 .../src/business/components/api/router.js     |  6 +++++
 4 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/report/ApiReportView.vue

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index 0a704845f9..b34067ab89 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -253,7 +253,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         String url2 = reportUrl;
         if (StringUtils.isEmpty(url)) {
             url = baseSystemConfigDTO.getUrl() + "/#/api/report/view/" + report.getId();
-            url2 = baseSystemConfigDTO.getUrl() + "/#/api/automation/report";
+            url2 = baseSystemConfigDTO.getUrl() + "/#/api/automation/report/view/" + report.getId();
         }
         String successContext = "";
         String failedContext = "";
diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index 4d0d6cb1c7..f26eda2ed4 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -68,12 +68,6 @@
                              :total="total"/>
       </el-card>
     </ms-main-container>
-
-    <el-drawer :visible.sync="debugVisible" :destroy-on-close="true" direction="ltr" :withHeader="false"
-               :title="$t('test_track.plan_view.test_result')" :modal="false" size="90%">
-      <ms-api-report-detail :report-id="reportId" :currentProjectId="currentProjectId" :info-db="true"
-                            @refresh="search"/>
-    </el-drawer>
   </ms-container>
 </template>
 
@@ -89,14 +83,13 @@ import ReportTriggerModeItem from "../../../common/tableItem/ReportTriggerModeIt
 import {REPORT_CONFIGS} from "../../../common/components/search/search-components";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import ShowMoreBtn from "../../../track/case/components/ShowMoreBtn";
-import MsApiReportDetail from "./ApiReportDetail";
 import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   components: {
     ReportTriggerModeItem,
     MsTableOperatorButton,
-    MsApiReportStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, ShowMoreBtn, MsApiReportDetail
+    MsApiReportStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, ShowMoreBtn
   },
   data() {
     return {
@@ -167,7 +160,10 @@ export default {
     handleView(report) {
       this.reportId = report.id;
       this.currentProjectId = report.projectId;
-      this.debugVisible = true;
+        this.$router.push({
+          path: 'report/view/' + report.id,
+        })
+
     },
     handleDelete(report) {
       this.$alert(this.$t('api_report.delete_confirm') + report.name + "？", '', {
diff --git a/frontend/src/business/components/api/automation/report/ApiReportView.vue b/frontend/src/business/components/api/automation/report/ApiReportView.vue
new file mode 100644
index 0000000000..03533b7c52
--- /dev/null
+++ b/frontend/src/business/components/api/automation/report/ApiReportView.vue
@@ -0,0 +1,24 @@
+<template>
+  <ms-api-report :report-id="reportId"></ms-api-report>
+</template>
+
+<script>
+import MsApiReport from "@/business/components/api/automation/report/ApiReportDetail";
+export default {
+  name: "ApiReportView",
+  components: {MsApiReport},
+   computed: {
+     reportId:function (){
+       return this.$route.params.reportId
+     }
+   },
+  created() {
+    console.log(this.reportId)
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/api/router.js b/frontend/src/business/components/api/router.js
index 4f1fd3a90c..20a0108078 100644
--- a/frontend/src/business/components/api/router.js
+++ b/frontend/src/business/components/api/router.js
@@ -63,6 +63,12 @@ export default {
       name: "ApiReportList",
       component: () => import('@/business/components/api/automation/report/ApiReportList'),
     },
+    {
+      path:"automation/report/view/:reportId",
+      name:"ApiReportView",
+      component: () => import('@/business/components/api/automation/report/ApiReportView'),
+
+    },
     {
       path: 'monitor/view',
       name: 'ApiMonitor',