diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 1b4aba928..ccccb346e 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -846,6 +846,7 @@ endTime = this.filter.end_time; //this.$parent.refreshTime(startTime,endTime);全屏查询,不更新panel列表的时间条件 } else { + console.log('页面进入',this.filter) startTime = this.filter.start_time; endTime = this.filter.end_time; } diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index e5bfec31a..2576c4b9c 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -205,10 +205,7 @@ showLegend:true, tableShow:true, urlShow:true, - 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())) - ], + searchTime: bus.getTimezontDateRange(), //oldSearchTime:[], minHeight:200, chartSpaceHeight:5,//top-border: 1,bottom-border: 1,padding-bottome:3 @@ -224,10 +221,7 @@ // 全屏查看 show(chartInfo) { this.isError = false; - 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.searchTime = bus.getTimezontDateRange(); this.chart = JSON.parse(JSON.stringify(chartInfo)); let chartType= chartInfo.type; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue index 32f675f98..8b712aa65 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue @@ -94,10 +94,7 @@ show: false, }, tableHover: false, - 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())) - ], + searchTime: bug.getTimezontDateRange(), intervalTimer: null, interval: 0, panel: { //新增panel @@ -256,9 +253,9 @@ // 获取数据,用在子页面 getData(params) { if (params.start_time === '' || params.end_time === '') { - let now = new Date(); - let endTimeTmp = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss'); - let startTimeTmp = bus.timeFormate(now.setHours(now.getHours() - 1), 'yyyy-MM-dd hh:mm:ss'); + let now = bus.getTimezontDateRange(); + let endTimeTmp = bus.timeFormate(now[1].getTime(), 'yyyy-MM-dd hh:mm:ss'); + let startTimeTmp = bus.timeFormate(now[0].getTime(), 'yyyy-MM-dd hh:mm:ss'); params.start_time = startTimeTmp; params.end_time = endTimeTmp; params.from = this.from; diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index f9eccb1a4..9a7236f98 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -130,8 +130,8 @@ export default { isPopoverDisabled:false, isCustom:false, searchTime:[ - bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),'yyyy-MM-dd hh:mm:ss'), - bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())),'yyyy-MM-dd hh:mm:ss') + bus.timeFormate(bus.getOffsetTimezoneData(-1),'yyyy-MM-dd hh:mm:ss'), + bus.timeFormate(bus.getOffsetTimezoneData(),'yyyy-MM-dd hh:mm:ss') ], showTime: { id: 4, diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue index a80232f48..1d3d51f59 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue @@ -227,8 +227,8 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c promqlKeys: [], expressions: [''], filterTime: [ - bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),'yyyy-MM-dd hh:mm:ss'), - bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())),'yyyy-MM-dd hh:mm:ss') + bus.timeFormate(bus.getOffsetTimezoneData(-1),'yyyy-MM-dd hh:mm:ss'), + bus.timeFormate(bus.getOffsetTimezoneData(),'yyyy-MM-dd hh:mm:ss') ], /*工具参数*/ diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 6b7b15510..a95388e7f 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -334,7 +334,7 @@ let str = `
`; params.forEach((item, i) => { if(i===0){ - let value=bus.computeTimezone(item.data[0]) + let value=item.data[0] let t_date = new Date(value); str += [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + " " + [t_date.getHours(), t_date.getMinutes(),t_date.getSeconds()].join(':'); diff --git a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue index 9a103af33..3aa9eb1fd 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chartConfig.vue @@ -90,7 +90,7 @@ intervale: 0, rotate: 0, formatter: function (value) { - value=bus.computeTimezone(value) + value=value var t_date = new Date(value); return [t_date.getFullYear(), t_date.getMonth() + 1, t_date.getDate()].join('-') + "\n" + [t_date.getHours(), t_date.getMinutes()].join(':'); diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index c95fe4e29..8a495c715 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -94,10 +94,7 @@ panel: {show: false}, }, tableHover: false, - 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())) - ], + searchTime: bus.getTimezontDateRange(), intervalTimer: null, interval: 0, showPanel: { //panel下拉列表 @@ -331,9 +328,9 @@ // 获取数据,用在子页面 getData(params) { if (params.start_time === '' || params.end_time === '') { - let now = new Date(); - let endTimeTmp = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss'); - let startTimeTmp = bus.timeFormate(now.setHours(now.getHours() - 1), 'yyyy-MM-dd hh:mm:ss'); + let now = bus.getTimezontDateRange(); + let endTimeTmp = bus.timeFormate(now[1].getTime(), 'yyyy-MM-dd hh:mm:ss'); + let startTimeTmp = bus.timeFormate(now[0].getTime(), 'yyyy-MM-dd hh:mm:ss'); params.start_time = startTimeTmp; params.end_time = endTimeTmp; } diff --git a/nezha-fronted/src/libs/bus.js b/nezha-fronted/src/libs/bus.js index ae90b7a3c..6b0e56364 100644 --- a/nezha-fronted/src/libs/bus.js +++ b/nezha-fronted/src/libs/bus.js @@ -267,6 +267,15 @@ export default new Vue({ return sourceTime; } }, + getTimezontDateRange:function(offset=-1){ + return [ + new Date(new Date(this.computeTimezone(new Date().getTime())).setHours(new Date(this.computeTimezone(new Date().getTime())).getHours() + offset)), + new Date(this.computeTimezone(new Date().getTime())) + ] + }, + getOffsetTimezoneData(offset=0){ + return new Date(this.computeTimezone(new Date().getTime())).setHours(new Date(this.computeTimezone(new Date().getTime())).getHours() + offset) + }, debounce(fn, delay) { // 记录上一次的延时器 var timer = null;