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 @@ - - + + {{$t('project.endpoint.hideSameLabels')}} @@ -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 +=`
`; } - str +=`
`; let val = parseFloat(Number(item.data[1]).toFixed(2)); if(val===0){ val = Number(item.data[1]);