From d33f6eccea910cd8308d09851cf4584fb667704c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 19 Jul 2021 15:30:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=90=AB=E6=9C=89=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=85=8D=E7=BD=AE=E5=B9=B6=E4=BD=BF=E7=94=A8k8s?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=B5=84=E6=BA=90=E6=B1=A0=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E4=B8=AD=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?Tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PerformanceReportController.java      |  5 -----
 .../performance/report/PerformanceReportView.vue     | 12 +-----------
 .../plan/view/comonents/load/LoadCaseReportView.vue  | 12 +-----------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
index c96bf0f2a8..137a899b77 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
@@ -119,11 +119,6 @@ public class PerformanceReportController {
         return performanceReportService.getLoadTestReport(reportId);
     }
 
-    @GetMapping("/pool/type/{reportId}")
-    public String getPoolTypeByReportId(@PathVariable String reportId) {
-        return performanceReportService.getPoolTypeByReportId(reportId);
-    }
-
     @GetMapping("log/resource/{reportId}")
     public List<LogDetailDTO> getResourceIds(@PathVariable String reportId) {
         return performanceReportService.getReportLogResource(reportId);
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index ec35f73f12..c72ca61629 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -97,7 +97,7 @@
             <el-tab-pane :label="$t('report.test_log_details')">
               <ms-report-log-details :report="report"/>
             </el-tab-pane>
-            <el-tab-pane :label="$t('report.test_monitor_details')" v-if="poolType === 'NODE'">
+            <el-tab-pane :label="$t('report.test_monitor_details')">
               <monitor-card :report="report"/>
             </el-tab-pane>
           </el-tabs>
@@ -188,7 +188,6 @@ export default {
         {value: '60', label: '1m'},
         {value: '300', label: '5m'}
       ],
-      poolType: "",
       testDeleted: false,
     };
   },
@@ -410,21 +409,12 @@ export default {
         }
       }
       localStorage.setItem("reportRefreshTime", this.refreshTime);
-    },
-    getPoolType(reportId) {
-      this.$get("/performance/report/pool/type/" + reportId, result => {
-        let data = result.data;
-        if (data) {
-          this.poolType = data;
-        }
-      });
     }
   },
   created() {
     this.isReadOnly = !hasPermission('PROJECT_PERFORMANCE_REPORT:READ+DELETE');
     this.reportId = this.$route.path.split('/')[4];
     this.getReport(this.reportId);
-    this.getPoolType(this.reportId);
   },
   watch: {
     '$route'(to) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
index 9e8771d1cb..73441a8f4d 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue
@@ -66,7 +66,7 @@
             <el-tab-pane :label="$t('report.test_log_details')">
               <ms-report-log-details :report="report"/>
             </el-tab-pane>
-            <el-tab-pane :label="$t('report.test_monitor_details')" v-if="poolType === 'NODE'">
+            <el-tab-pane :label="$t('report.test_monitor_details')">
               <monitor-card :report="report"/>
             </el-tab-pane>
           </el-tabs>
@@ -142,7 +142,6 @@ export default {
       reportExportVisible: false,
       testPlan: {testResourcePoolId: null},
       show: true,
-      poolType: "",
     }
   },
   props: {
@@ -356,19 +355,10 @@ export default {
           this.$error(this.$t('report.not_exist'));
         }
       });
-    },
-    getPoolType(reportId) {
-      this.$get("/performance/report/pool/type/" + reportId, result => {
-        let data = result.data;
-        if (data) {
-          this.poolType = data;
-        }
-      });
     }
   },
   created() {
     this.init();
-    this.getPoolType(this.reportId);
   }
 }
 </script>