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

fix:修复preview及图表刷新时，请求时间未计算时区的问题

Browse Source
This commit is contained in:
wangwenrui
2020-09-02 16:55:02 +08:00
parent 93906e9b3c
commit b4e3adad0f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -831,7 +831,7 @@
let startTime = ''; let startTime = '';
let endTime = ''; let endTime = '';
if (filterType === 'refresh') {//刷新 if (filterType === 'refresh') {//刷新
const now = new Date(); const now = new Date(bus.computeTimezone(new Date().getTime()));
const origin = new Date(this.filter.end_time); const origin = new Date(this.filter.end_time);
const numInterval = now.getTime() - origin.getTime(); const numInterval = now.getTime() - origin.getTime();
if (numInterval >= 60000) {//大于1分钟，则start、end均往后移numInterval，否则时间不变 if (numInterval >= 60000) {//大于1分钟，则start、end均往后移numInterval，否则时间不变

14
nezha-fronted/src/components/charts/chartPreview.vue
View File

@@ -205,7 +205,10 @@
showLegend:true, showLegend:true,
tableShow:true, tableShow:true,
urlShow:true, urlShow:true,
searchTime: [new Date().setHours(new Date().getHours()-1),new Date()], searchTime: [
new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),
new Date(bus.computeTimezone(new Date().getTime()))
],
//oldSearchTime:[], //oldSearchTime:[],
minHeight:200, minHeight:200,
chartSpaceHeight:5,//top-border: 1,bottom-border: 1,padding-bottome:3 chartSpaceHeight:5,//top-border: 1,bottom-border: 1,padding-bottome:3
@@ -221,7 +224,10 @@
// 全屏查看 // 全屏查看
show(chartInfo) { show(chartInfo) {
this.isError = false; this.isError = false;
this.searchTime = [new Date().setHours(new Date().getHours()-1),new Date()]; this.searchTime = [
new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),
new Date(bus.computeTimezone(new Date().getTime()))
];
this.chart = JSON.parse(JSON.stringify(chartInfo)); this.chart = JSON.parse(JSON.stringify(chartInfo));
let chartType= chartInfo.type; let chartType= chartInfo.type;
@@ -242,7 +248,6 @@
chartContainerId = 'chartAlertListPreview'; chartContainerId = 'chartAlertListPreview';
} }
console.log('previewChart',this.chart,chartContainerId)
//设置高度 chart-table //设置高度 chart-table
this.$nextTick(() => { this.$nextTick(() => {
//const chartBox = document.getElementById('chartPreviewDailog'); //const chartBox = document.getElementById('chartPreviewDailog');
@@ -264,7 +269,6 @@
tableBox.style.height = `${height-this.titleHeight-this.pageHeight-25}px`;//-75-32+25 tableBox.style.height = `${height-this.titleHeight-this.pageHeight-25}px`;//-75-32+25
}else{ }else{
const chartDiv = document.getElementById(chartContainerId); const chartDiv = document.getElementById(chartContainerId);
console.log('container div',chartDiv)
chartDiv.style.height = `${height-this.chartSpaceHeight-this.titleHeight-15}px`; chartDiv.style.height = `${height-this.chartSpaceHeight-this.titleHeight-15}px`;
} }
}); });
@@ -361,7 +365,7 @@
let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss'); let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss'); let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
if(!startTime || !endTime){//如果时间为空，则默认取最近1小时 if(!startTime || !endTime){//如果时间为空，则默认取最近1小时
let now = new Date(); let now = new Date(bus.computeTimezone(new Date().getTime()));
startTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss'); startTime = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss');
endTime = bus.timeFormate(now.setHours(now.getHours()-1), 'yyyy-MM-dd hh:mm:ss'); endTime = bus.timeFormate(now.setHours(now.getHours()-1), 'yyyy-MM-dd hh:mm:ss');
this.searchTime[0] = startTime; this.searchTime[0] = startTime;