Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1

backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java

@@ -105,7 +105,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, 10, true);
+        Page<Object> page = PageHelper.startPage(goPage, 1, true);
         return PageUtils.setPageInfo(page, reportService.getReportLogs(reportId, resourceId));
     }
 

frontend/src/business/components/performance/report/components/LogDetails.vue

@@ -21,7 +21,7 @@
         result: {},
         id: '',
         page: 1,
-        pageCount: 1,
+        pageCount: 5,
         loading: false,
       }
     },
@@ -36,6 +36,8 @@
       getResource() {
         this.result = this.$get("/performance/report/log/resource/" + this.id, data => {
           this.resource = data.data;
+          this.page = 1;
+          this.logContent = [];
         })
       },
       load(resourceId) {
@@ -44,7 +46,6 @@
         let url = "/performance/report/log/" + this.id + "/" + resourceId + "/" + this.page;
         this.$get(url, res => {
           let data = res.data;
-          this.pageCount = data.pageCount;
           data.listObject.forEach(log => {
             this.logContent.push(log);
           })