From b94d64458166bb920c99f76bd76c6823b0df173a Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Fri, 13 Mar 2020 18:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:dashboard=20table=20pageSizes=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=E8=B0=83=E6=95=B4&=20view=20graph?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-table.vue   | 4 ++--
 nezha-fronted/src/components/common/pagination.vue    | 2 +-
 nezha-fronted/src/components/page/project/project.vue | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index 51ffb274a..fcf80eb46 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -119,12 +119,12 @@ export default {
             pageSizes:[50,100,200],
             pageObj: {
               pageNo: 1,
-              pageSize: 20,
+              pageSize: 50,
               total: 0
             },
             screenPageObj:{
               pageNo: 1,
-              pageSize: 20,
+              pageSize: 50,
               total: 0
             },
             storedTableData:[],
diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue
index aeed641ef..3c752ea41 100644
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -56,7 +56,7 @@ export default {
   },
   mounted() {
     let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId);
-    this.pageSize = pageSize ? pageSize : 20;
+    this.pageSize = pageSizes&&pageSizes.length>0?pageSizes[0]:(pageSize ? pageSize : 20);
     this.$nextTick(() => {
       let input = document.querySelector(".el-pagination .el-select .el-input__inner");
       input.value = this.pageSize + this.$t('pageSize');
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 91ce72306..ac09dfab6 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -210,8 +210,8 @@
             </el-date-picker>
             <button @click="changeTime(10)" class="nz-btn nz-btn-size-normal nz-btn-style-light change-time-height"><i class="el-icon-d-arrow-right"></i></button>
           </div>
-          <el-dropdown split-button type="primary"  size="mini" class="dropdownBtn" >
-            <i class="nz-icon nz-icon-chart" @click="viewGraph" :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i>
+          <el-dropdown split-button type="primary"  size="mini" class="dropdownBtn" @click="viewGraph">
+            <i class="nz-icon nz-icon-chart"  :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i>
             <el-dropdown-menu slot="dropdown" style="padding:10px 4px 10px 10px;">
               <el-row>
                 <el-col :span="16" style="padding-top: 4px;padding-left: 1px"><span style="padding-top: 2px">{{$t('project.endpoint.hideSameLabels')}}</span></el-col>
@@ -608,8 +608,8 @@
                   let t_date = new Date(item.data[0]);
                   str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " "
                     + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':');
+                  str +=`<br/>`;
                 }
-                str +=`<br/>`;
                 let val = parseFloat(Number(item.data[1]).toFixed(2));
                 if(val===0){
                   val = Number(item.data[1]);