Merge remote-tracking branch 'origin/dev' into dev

2023-08-07 18:58:08 +08:00
parent 5f9649f651 aa40ea8954
commit 6764ec4fab
1 changed files with 1 additions and 1 deletions
--- a/src/utils/date-util.js
+++ b/src/utils/date-util.js
@@ -122,7 +122,7 @@ export function xAxisTimeFormatter (value) {
    (date.getMinutes() < 10 ? `0${date.getMinutes()}` : date.getMinutes())
  // 如果是一天的开始
  if (date.getTime() === dayStart.getTime()) {
-    return '{day|' + dateFormat(date, 'YYYY-MM-DD\nHH:mm') + '}'
+    return '{day|' + dateFormat(date, 'YYYY-MM-DD') + '}'
  } else if (date.getTime() === hourStart.getTime()) {
    return '{hour|' + HHmm + '}'
  } else {