From f6a2a330ad93d35a93137f01df7b05183c1c262a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 20 Jun 2022 18:01:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PerformanceReportController.java       |  2 +-
 .../performance/report/components/LogDetails.vue      | 11 +++--------
 2 files changed, 4 insertions(+), 9 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 3c6a55ca87..af6ebb5794 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
@@ -126,7 +126,7 @@ public class PerformanceReportController {
 
     @GetMapping("log/{reportId}/{resourceId}/{goPage}")
     public Pager<List<LoadTestReportLog>> logs(@PathVariable String reportId, @PathVariable String resourceId, @PathVariable int goPage) {
-        Page<Object> page = PageHelper.startPage(goPage, 1, true, false, null);
+        Page<Object> page = PageHelper.startPage(goPage, 5, true);
         return PageUtils.setPageInfo(page, performanceReportService.getReportLogs(reportId, resourceId));
     }
 
diff --git a/frontend/src/business/components/performance/report/components/LogDetails.vue b/frontend/src/business/components/performance/report/components/LogDetails.vue
index 43f6751a67..585a9b4d0d 100644
--- a/frontend/src/business/components/performance/report/components/LogDetails.vue
+++ b/frontend/src/business/components/performance/report/components/LogDetails.vue
@@ -2,7 +2,8 @@
   <div>
     <el-row :gutter="10">
       <el-col :span="4">
-        <el-select v-model="currentInstance" placeholder="" size="small" style="width: 100%">
+        <el-select v-model="currentInstance" placeholder="" size="small" style="width: 100%"
+                   @change="changeInstance(currentInstance)">
           <el-option
             v-for="item in resource"
             :key="item.resourceId"
@@ -72,6 +73,7 @@ export default {
       this.resource = data;
       if (!this.currentInstance) {
         this.currentInstance = this.resource[0]?.resourceId;
+        this.changeInstance(this.currentInstance);
       }
       this.page = data.map(item => item.resourceId).reduce((result, curr) => {
         result[curr] = 1;
@@ -108,8 +110,6 @@ export default {
       });
       this.page[resourceId]++;
       this.loading = false;
-      // 继续查询
-      this.load(resourceId);
     },
     changeInstance(instance) {
       this.currentInstance = instance;
@@ -184,11 +184,6 @@ export default {
         }
       },
       deep: true
-    },
-    currentInstance() {
-      if (this.currentInstance) {
-        this.changeInstance(this.currentInstance);
-      }
     }
   },
 };