Merge branch 'perf/application-call' into 'main_dev'

fix: 统一统计时间间隔计算

See merge request yunteng/thingskit-front!1503

@@ -55,7 +55,7 @@ export const formSchema: DescItem[] = [
 function generateFullXAxis(type: DateInterval) {
 function generateFullXAxis(type: DateInterval) {
   if (type === 'hour') {
   if (type === 'hour') {
     let minute = dateUtil().minute();
     let minute = dateUtil().minute();
-    minute = minute - (minute % 10);
+    minute = Math.floor(minute / 5) * 5;
 
 
     return Array.from({ length: 60 / 5 }, (_, index) =>
     return Array.from({ length: 60 / 5 }, (_, index) =>
       dateUtil()
       dateUtil()
@@ -65,8 +65,11 @@ function generateFullXAxis(type: DateInterval) {
         .valueOf()
         .valueOf()
     );
     );
   } else if (type === 'day') {
   } else if (type === 'day') {
+    let hour = dateUtil().hour();
+    hour = Math.floor(hour / 2) * 2;
     return Array.from({ length: 24 / 2 }, (_, index) =>
     return Array.from({ length: 24 / 2 }, (_, index) =>
       dateUtil()
       dateUtil()
+        .hour(hour)
         .subtract(index * 2, 'hour')
         .subtract(index * 2, 'hour')
         .startOf('hour')
         .startOf('hour')
         .valueOf()
         .valueOf()