diff --git a/src/module/timeLabel.js b/src/module/timeLabel.js index d5d0fdd..b6b7ca0 100644 --- a/src/module/timeLabel.js +++ b/src/module/timeLabel.js @@ -76,15 +76,19 @@ export function followTimeLabel(second, max, fixedNumber = 0) { maxUnit = dd > 0 ? 'd' : hh > 0 ? 'h' : mm > 0 ? 'm' : 's'; switch (maxUnit) { case 'd': + if((second / day) === 0) fixedNumber = 0; result = (second / day).toFixed(fixedNumber) + 'd'; break; case 'h': + if(((second % day) / hour) === 0) fixedNumber = 0; result = ((second % day) / hour).toFixed(fixedNumber) + 'h'; break; case 'm': + if(((second % hour) / minutes) === 0) fixedNumber = 0; result = ((second % hour) / minutes).toFixed(fixedNumber) + 'm'; break; case 's': + if(second === 0) fixedNumber = 0; result = second.toFixed(fixedNumber) + 's'; break; } diff --git a/src/views/Compare/Dashboard/index.vue b/src/views/Compare/Dashboard/index.vue index fc20d3e..b38864b 100644 --- a/src/views/Compare/Dashboard/index.vue +++ b/src/views/Compare/Dashboard/index.vue @@ -351,7 +351,7 @@ export default { setOption.scales.x.min = minX; setOption.scales.x.max = maxX; setOption.scales.y.ticks.callback = function (value, index, ticks) { - return getFollowTimeLabel(value, maxY, 2) + return getFollowTimeLabel(value, maxY, 1) } break; case 'count': @@ -656,7 +656,7 @@ export default { } }; setOption.scales.x.ticks.callback = function (value, index, ticks) { - return getFollowTimeLabel(value, maxY, 2) + return getFollowTimeLabel(value, maxY, 1) }; break; case 'count': diff --git a/src/views/Discover/Performance/index.vue b/src/views/Discover/Performance/index.vue index 0f4ef7a..df9198e 100644 --- a/src/views/Discover/Performance/index.vue +++ b/src/views/Discover/Performance/index.vue @@ -337,7 +337,7 @@ export default { setOption.scales.x.min = minX; setOption.scales.x.max = maxX; setOption.scales.y.ticks.callback = function (value, index, ticks) { - return getFollowTimeLabel(value, maxY, 2) + return getFollowTimeLabel(value, maxY, 1) }; break; case 'count': @@ -569,7 +569,7 @@ export default { return `${content.x}: ${getSimpleTimeLabel(context.parsed.x, 2)}`; }; setOption.scales.x.ticks.callback = function (value, index, ticks) { - return getFollowTimeLabel(value, maxY, 2) + return getFollowTimeLabel(value, maxY, 1) }; break; case 'count':