imacat/lucia-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Issues #261 done.

Browse Source
This commit is contained in:
chiayin
2024-03-25 11:36:06 +08:00
parent dfc0d9a7a6
commit 83cca58fe2
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/module/timeLabel.js
View File

@@ -76,15 +76,19 @@ export function followTimeLabel(second, max, fixedNumber = 0) {
maxUnit = dd > 0 ? 'd' : hh > 0 ? 'h' : mm > 0 ? 'm' : 's'; maxUnit = dd > 0 ? 'd' : hh > 0 ? 'h' : mm > 0 ? 'm' : 's';
switch (maxUnit) { switch (maxUnit) {
case 'd': case 'd':
if((second / day) === 0) fixedNumber = 0;
result = (second / day).toFixed(fixedNumber) + 'd'; result = (second / day).toFixed(fixedNumber) + 'd';
break; break;
case 'h': case 'h':
if(((second % day) / hour) === 0) fixedNumber = 0;
result = ((second % day) / hour).toFixed(fixedNumber) + 'h'; result = ((second % day) / hour).toFixed(fixedNumber) + 'h';
break; break;
case 'm': case 'm':
if(((second % hour) / minutes) === 0) fixedNumber = 0;
result = ((second % hour) / minutes).toFixed(fixedNumber) + 'm'; result = ((second % hour) / minutes).toFixed(fixedNumber) + 'm';
break; break;
case 's': case 's':
if(second === 0) fixedNumber = 0;
result = second.toFixed(fixedNumber) + 's'; result = second.toFixed(fixedNumber) + 's';
break; break;
} }

4
src/views/Compare/Dashboard/index.vue
View File

@@ -351,7 +351,7 @@ export default {
setOption.scales.x.min = minX; setOption.scales.x.min = minX;
setOption.scales.x.max = maxX; setOption.scales.x.max = maxX;
setOption.scales.y.ticks.callback = function (value, index, ticks) { setOption.scales.y.ticks.callback = function (value, index, ticks) {
return getFollowTimeLabel(value, maxY, 2) return getFollowTimeLabel(value, maxY, 1)
} }
break; break;
case 'count': case 'count':
@@ -656,7 +656,7 @@ export default {
} }
}; };
setOption.scales.x.ticks.callback = function (value, index, ticks) { setOption.scales.x.ticks.callback = function (value, index, ticks) {
return getFollowTimeLabel(value, maxY, 2) return getFollowTimeLabel(value, maxY, 1)
}; };
break; break;
case 'count': case 'count':

4
src/views/Discover/Performance/index.vue
View File

@@ -337,7 +337,7 @@ export default {
setOption.scales.x.min = minX; setOption.scales.x.min = minX;
setOption.scales.x.max = maxX; setOption.scales.x.max = maxX;
setOption.scales.y.ticks.callback = function (value, index, ticks) { setOption.scales.y.ticks.callback = function (value, index, ticks) {
return getFollowTimeLabel(value, maxY, 2) return getFollowTimeLabel(value, maxY, 1)
}; };
break; break;
case 'count': case 'count':
@@ -569,7 +569,7 @@ export default {
return `${content.x}: ${getSimpleTimeLabel(context.parsed.x, 2)}`; return `${content.x}: ${getSimpleTimeLabel(context.parsed.x, 2)}`;
}; };
setOption.scales.x.ticks.callback = function (value, index, ticks) { setOption.scales.x.ticks.callback = function (value, index, ticks) {
return getFollowTimeLabel(value, maxY, 2) return getFollowTimeLabel(value, maxY, 1)
}; };
break; break;
case 'count': case 'count':