diff --git a/agent/app/repo/cronjob.go b/agent/app/repo/cronjob.go index 454f93d32..50987021d 100644 --- a/agent/app/repo/cronjob.go +++ b/agent/app/repo/cronjob.go @@ -173,7 +173,7 @@ func (u *CronjobRepo) AddFailedRecord(cronjobID uint, message string) { var record model.JobRecords record.StartTime = time.Now() record.CronjobID = cronjobID - record.Status = constant.StatusFailed + record.Status = constant.StatusUnexecuted record.Message = message if err := global.DB.Create(&record).Error; err != nil { global.LOG.Errorf("create record status failed, err: %v", err) diff --git a/agent/constant/status.go b/agent/constant/status.go index 315ed354a..3c7aca53e 100644 --- a/agent/constant/status.go +++ b/agent/constant/status.go @@ -36,6 +36,7 @@ const ( StatusInstallErr = "InstallErr" StatusUninstalling = "Uninstalling" StatusWaitingRestart = "WaitingRestart" + StatusUnexecuted = "Unexecuted" OrderDesc = "descending" OrderAsc = "ascending" diff --git a/frontend/src/components/status/index.vue b/frontend/src/components/status/index.vue index a9816171c..c1cab2470 100644 --- a/frontend/src/components/status/index.vue +++ b/frontend/src/components/status/index.vue @@ -80,6 +80,7 @@ const getType = (status: string) => { case 'conflict': return 'warning'; case 'duplicate': + case 'unexecuted': return 'info'; default: return 'primary'; diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 762360c12..6e8613015 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -344,6 +344,7 @@ const message = { new: 'New', conflict: 'Conflict', duplicate: 'Duplicate', + unexecuted: 'Unexecuted', }, units: { second: ' second | second | seconds', diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index 8f33bf5aa..b693a1351 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -351,6 +351,7 @@ const message = { new: 'Nuevo', conflict: 'Conflicto', duplicate: 'Duplicado', + unexecuted: 'No Ejecutado', }, units: { second: ' segundo | segundo | segundos', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 5e5e66043..4d2ef2f23 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -333,6 +333,7 @@ const message = { new: '新規', conflict: '競合', duplicate: '重複', + unexecuted: '未実行', }, units: { second: '2番目|2番目|秒', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index e9a6a58e3..3e4f4f0a3 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -335,6 +335,7 @@ const message = { new: '신규', conflict: '충돌', duplicate: '중복', + unexecuted: '실행되지 않음', }, units: { second: '초 | 초 | 초', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index c2d28956e..6c4e45b1f 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -341,6 +341,7 @@ const message = { new: 'Baru', conflict: 'Konflik', duplicate: 'Pendua', + unexecuted: 'Tidak Dilaksanakan', }, units: { second: 'saat | saat | saat', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 7075a2a31..1e4c1cb2c 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -339,6 +339,7 @@ const message = { new: 'Novo', conflict: 'Conflito', duplicate: 'Duplicado', + unexecuted: 'Não Executado', }, units: { second: 'segundo | segundos | segundos', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 8f7125902..455924e81 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -336,6 +336,7 @@ const message = { new: 'Новый', conflict: 'Конфликт', duplicate: 'Дубликат', + unexecuted: 'Не Выполнено', }, units: { second: ' секунда | секунда | секунд', diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index 532e88510..882c9c71a 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -348,6 +348,7 @@ const message = { new: 'Yeni', conflict: 'Çakışma', duplicate: 'Yinelenen', + unexecuted: 'Yürütülmedi', }, units: { second: ' saniye | saniye | saniye', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index e7354be41..6aeb045f2 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -332,6 +332,7 @@ const message = { new: '新', conflict: '衝突', duplicate: '重複', + unexecuted: '未執行', }, units: { second: '秒', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index f6363448c..480d90394 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -332,6 +332,7 @@ const message = { new: '新', conflict: '冲突', duplicate: '重复', + unexecuted: '未执行', }, units: { second: '秒', diff --git a/frontend/src/views/cronjob/cronjob/index.vue b/frontend/src/views/cronjob/cronjob/index.vue index e34c2356b..6d3fba533 100644 --- a/frontend/src/views/cronjob/cronjob/index.vue +++ b/frontend/src/views/cronjob/cronjob/index.vue @@ -141,6 +141,7 @@ + {{ row.lastRecordTime }} diff --git a/frontend/src/views/cronjob/cronjob/record/index.vue b/frontend/src/views/cronjob/cronjob/record/index.vue index 564380061..8b652e66f 100644 --- a/frontend/src/views/cronjob/cronjob/record/index.vue +++ b/frontend/src/views/cronjob/cronjob/record/index.vue @@ -81,6 +81,7 @@ + @@ -100,7 +101,7 @@