gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:dashboard table pageSizes显示异常调整& view graph显示优化

Browse Source
This commit is contained in:
wangwenrui
2020-03-13 18:32:47 +08:00
parent bc9da07d2c
commit b94d644581
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/charts/chart-table.vue
View File

@@ -119,12 +119,12 @@ export default {
pageSizes:[50,100,200], pageSizes:[50,100,200],
pageObj: { pageObj: {
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 50,
total: 0 total: 0
}, },
screenPageObj:{ screenPageObj:{
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 50,
total: 0 total: 0
}, },
storedTableData:[], storedTableData:[],

2
nezha-fronted/src/components/common/pagination.vue
View File

@@ -56,7 +56,7 @@ export default {
}, },
mounted() { mounted() {
let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); 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(() => { this.$nextTick(() => {
let input = document.querySelector(".el-pagination .el-select .el-input__inner"); let input = document.querySelector(".el-pagination .el-select .el-input__inner");
input.value = this.pageSize + this.$t('pageSize'); input.value = this.pageSize + this.$t('pageSize');

6
nezha-fronted/src/components/page/project/project.vue
View File

@@ -210,8 +210,8 @@
</el-date-picker> </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> <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> </div>
<el-dropdown split-button type="primary" size="mini" class="dropdownBtn" > <el-dropdown split-button type="primary" size="mini" class="dropdownBtn" @click="viewGraph">
<i class="nz-icon nz-icon-chart" @click="viewGraph" :class="{'control-icon-unchecked':selectedEndpoints.length<1,'control-icon-checked':selectedEndpoints.length>0}"></i> <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-dropdown-menu slot="dropdown" style="padding:10px 4px 10px 10px;">
<el-row> <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> <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]); let t_date = new Date(item.data[0]);
str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " "
+ [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':');
}
str +=`<br/>`; str +=`<br/>`;
}
let val = parseFloat(Number(item.data[1]).toFixed(2)); let val = parseFloat(Number(item.data[1]).toFixed(2));
if(val===0){ if(val===0){
val = Number(item.data[1]); val = Number(item.data[1]);