gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改panel 使用expression模板闪退的问题 ，以及修改前端给模板字符的取值问题

Browse Source
This commit is contained in:
zhangyu
2021-03-16 18:16:10 +08:00
parent a900833a92
commit 1ca749dfda
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/js/tools.js
View File

@@ -298,13 +298,13 @@ export function calcDurationByStringTime(startTime, endTime) {
export function calcDurationByStringTimeB(startTime, endTime) {
let durationSecond = stringTimeParseToUnix(endTime)-stringTimeParseToUnix(startTime);
let result = `${durationSecond%60}s`;
if(durationSecond > 60*60 *24){
if(durationSecond >= 60*60 *24){
result = `${(Math.floor(durationSecond/3600))%24}h`
result = `${Math.floor(durationSecond/(60*60*24))}d ${result}`;
} else if (durationSecond > 60*60) {
} else if (durationSecond >= 60*60) {
result = `${(Math.floor(durationSecond/60))%60}m`
result = `${Math.floor(durationSecond/(60*60))}h ${result}`;
}else if(durationSecond > 60) {
}else if(durationSecond >= 60) {
result = `${(Math.floor(durationSecond/60))%60}m ${result}`;
}