From 40b679f607df0ae16f86373c136efc6b7bf28c81 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 1 May 2024 13:02:18 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3457=20fix:=20=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=B8=8D=E5=90=8C=E6=9C=88=E4=BD=86=E6=98=AF=E7=9B=B8?= =?UTF-8?q?=E5=B7=AE30=E5=A4=A9=E4=BB=A5=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/chart/uplot/chartTimeSeriesMixin.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js index 0223b3ce9..617450228 100644 --- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js +++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js @@ -557,6 +557,7 @@ export default { const moment1 = moment((minTime * 1000 - localOffset + offset * 60 * 1000)) const moment2 = moment((maxTime * 1000 - localOffset + offset * 60 * 1000)) + console.log(minTime, maxTime) const isSameDay = moment1.isSame(moment2, 'day') const isSameMonth = moment1.isSame(moment2, 'month') @@ -564,6 +565,8 @@ export default { return [hour, minute].join(':') } else if (isSameMonth) { // 同一月 return str + '\n' + [hour, minute].join(':') + } else if (maxTime - minTime <= 30 * 24 * 60 * 60) { // 不同月 相差30天以内 + return str + '\n' + [hour, minute].join(':') } else { // 大于等于30天 return str }