diff --git a/frontend/src/utils/validate.ts b/frontend/src/utils/validate.ts index 2f406c1da..2e405db24 100644 --- a/frontend/src/utils/validate.ts +++ b/frontend/src/utils/validate.ts @@ -153,9 +153,13 @@ export function transTimeUnit(val: string): any { } export function splitTimeFromSecond(item: number): any { - if (item < 60) return { timeItem: item, timeUnit: 's' }; - if (item < 3600) return { timeItem: item / 60, timeUnit: 'm' }; - return { timeItem: item / 3600, timeUnit: 'h' }; + if (item >= 3600 && item % 3600 === 0) { + return { timeItem: item / 3600, timeUnit: 'h' }; + } + if (item >= 60 && item % 60 === 0) { + return { timeItem: item / 60, timeUnit: 'm' }; + } + return { timeItem: item, timeUnit: 's' }; } export function splitHttp(url: string) { diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index f486e6dce..c45946e99 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -1112,7 +1112,7 @@ const search = async () => { form.retryTimes = res.data.retryTimes; form.timeout = res.data.timeout || 3600; - let item = splitTimeFromSecond(form.timeout); + const item = splitTimeFromSecond(form.timeout); form.timeoutItem = item.timeItem; form.timeoutUnit = item.timeUnit;