refactor: Merge branch 'v1.1'

2020-07-23 10:57:44 +08:00 · 2020-07-23 10:57:44 +08:00 · ab2020873a
parent fffea1a1da 7880c09b53
commit ab2020873a
1 changed files with 1 additions and 2 deletions
--- a/frontend/src/business/components/performance/report/components/LogDetails.vue
+++ b/frontend/src/business/components/performance/report/components/LogDetails.vue
@ -21,7 +21,7 @@
        result: {},
        id: '',
        page: 1,
-        pageCount: 1,
+        pageCount: 5,
        loading: false,
      }
    },
@ -44,7 +44,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);
          })