From ece2cb433daa8469782b604f43dbe102a99ef327 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:20:14 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=B3=BB=E7=BB=9F=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20(#3845?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/init/migration/migrations/v_1_9.go | 6 +- .../views/setting/snapshot/status/index.vue | 113 +++++++++--------- 2 files changed, 57 insertions(+), 62 deletions(-) diff --git a/backend/init/migration/migrations/v_1_9.go b/backend/init/migration/migrations/v_1_9.go index d3404c4be..6106ed03d 100644 --- a/backend/init/migration/migrations/v_1_9.go +++ b/backend/init/migration/migrations/v_1_9.go @@ -330,7 +330,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{ Source: snap.From, BackupType: snap.From, BaseModel: model.BaseModel{ - CreatedAt: job.CreatedAt, + CreatedAt: record.CreatedAt, }, } _ = tx.Create(&item).Error @@ -348,7 +348,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{ Source: mapAccount[uint(job.TargetDirID)].Type, BackupType: mapAccount[uint(job.TargetDirID)].Type, BaseModel: model.BaseModel{ - CreatedAt: job.CreatedAt, + CreatedAt: record.CreatedAt, }, } _ = tx.Create(&item).Error @@ -364,7 +364,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{ FileName: path.Base(record.File), BackupType: mapAccount[uint(job.TargetDirID)].Type, BaseModel: model.BaseModel{ - CreatedAt: job.CreatedAt, + CreatedAt: record.CreatedAt, }, } if record.FromLocal { diff --git a/frontend/src/views/setting/snapshot/status/index.vue b/frontend/src/views/setting/snapshot/status/index.vue index bed032c99..ddfd00bc9 100644 --- a/frontend/src/views/setting/snapshot/status/index.vue +++ b/frontend/src/views/setting/snapshot/status/index.vue @@ -48,13 +48,6 @@ {{ $t('commons.table.statusWaiting') }} - - {{ $t('setting.rollback') }} - -
- - - {{ $t('setting.rollback') }} - - -
-
-
+
+ {{ $t('setting.rollback') }} + +
+ + + {{ $t('setting.rollback') }} + + +
+
+
+ + + {{ $t('commons.table.statusSuccess') }} + + + {{ $t('setting.rollback') }} + + + + {{ snapInfo.lastRollbackedAt }} + +
+
+
- + {{ $t('commons.table.statusSuccess') }} - + + {{ $t('commons.table.statusFailed') }} + + + {{ $t('commons.table.statusWaiting') }} + + {{ $t('setting.rollback') }} - - {{ snapInfo.lastRollbackedAt }} - -
-
-
- - - {{ $t('commons.table.statusSuccess') }} - - - {{ $t('commons.table.statusFailed') }} - - - {{ $t('commons.table.statusWaiting') }} - - - {{ $t('setting.rollback') }} - - - - {{ snapInfo.lastRollbackedAt }} - -
- - - {{ snapInfo.rollbackMessage }} - - - - - {{ $t('commons.button.retry') }} - + {{ snapInfo.lastRollbackedAt }} +
+ + + {{ snapInfo.rollbackMessage }} + + + + + {{ $t('commons.button.retry') }} + + +