fix:抽取时区计算方法

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;
             }

nezha-fronted/src/components/charts/chartPreview.vue

@@ -205,10 +205,7 @@
         showLegend:true,
         tableShow:true,
         urlShow:true,
-        searchTime: [
+        searchTime: bus.getTimezontDateRange(),
-          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:[],
         minHeight:200,
         chartSpaceHeight:5,//top-border: 1,bottom-border: 1,padding-bottome:3
@@ -224,10 +221,7 @@
       // 全屏查看
       show(chartInfo) {
         this.isError = false;
-        this.searchTime = [
+        this.searchTime = bus.getTimezontDateRange();
-          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));
 
         let chartType= chartInfo.type;

nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue

@@ -94,10 +94,7 @@
           show: false,
         },
         tableHover: false,
-        searchTime: [
+        searchTime: bug.getTimezontDateRange(),
-          new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),
-          new Date(bus.computeTimezone(new Date().getTime()))
-        ],
         intervalTimer: null,
         interval: 0,
         panel: { //新增panel
@@ -256,9 +253,9 @@
       // 获取数据,用在子页面
       getData(params) {
         if (params.start_time === '' || params.end_time === '') {
-          let now = new Date();
+          let now = bus.getTimezontDateRange();
-          let endTimeTmp = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss');
+          let endTimeTmp = bus.timeFormate(now[1].getTime(), 'yyyy-MM-dd hh:mm:ss');
-          let startTimeTmp = bus.timeFormate(now.setHours(now.getHours() - 1), '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;

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(bus.getOffsetTimezoneData(-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(),'yyyy-MM-dd hh:mm:ss')
       ],
       showTime: {
         id: 4,

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(bus.getOffsetTimezoneData(-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(),'yyyy-MM-dd hh:mm:ss')
         ],
 
         /*工具参数*/

nezha-fronted/src/components/page/dashboard/overview/chart.vue

@@ -334,7 +334,7 @@
         let str = `<div>`;
         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(':');

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(':');

nezha-fronted/src/components/page/dashboard/panel.vue

@@ -94,10 +94,7 @@
           panel: {show: false},
         },
         tableHover: false,
-        searchTime: [
+        searchTime: bus.getTimezontDateRange(),
-          new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 1),
-          new Date(bus.computeTimezone(new Date().getTime()))
-        ],
         intervalTimer: null,
         interval: 0,
         showPanel: { //panel下拉列表
@@ -331,9 +328,9 @@
       // 获取数据,用在子页面
       getData(params) {
         if (params.start_time === '' || params.end_time === '') {
-          let now = new Date();
+          let now = bus.getTimezontDateRange();
-          let endTimeTmp = bus.timeFormate(now, 'yyyy-MM-dd hh:mm:ss');
+          let endTimeTmp = bus.timeFormate(now[1].getTime(), 'yyyy-MM-dd hh:mm:ss');
-          let startTimeTmp = bus.timeFormate(now.setHours(now.getHours() - 1), '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;
         }

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;