1
0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-12 11:30:07 +08:00

style: 系统快照恢复样式调整 (#3845)

This commit is contained in:
ssongliu 2024-02-06 14:20:14 +08:00 committed by GitHub
parent fb06e29aa3
commit ece2cb433d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 62 deletions

View File

@ -330,7 +330,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{
Source: snap.From, Source: snap.From,
BackupType: snap.From, BackupType: snap.From,
BaseModel: model.BaseModel{ BaseModel: model.BaseModel{
CreatedAt: job.CreatedAt, CreatedAt: record.CreatedAt,
}, },
} }
_ = tx.Create(&item).Error _ = tx.Create(&item).Error
@ -348,7 +348,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{
Source: mapAccount[uint(job.TargetDirID)].Type, Source: mapAccount[uint(job.TargetDirID)].Type,
BackupType: mapAccount[uint(job.TargetDirID)].Type, BackupType: mapAccount[uint(job.TargetDirID)].Type,
BaseModel: model.BaseModel{ BaseModel: model.BaseModel{
CreatedAt: job.CreatedAt, CreatedAt: record.CreatedAt,
}, },
} }
_ = tx.Create(&item).Error _ = tx.Create(&item).Error
@ -364,7 +364,7 @@ var UpdateCronjobSpec = &gormigrate.Migration{
FileName: path.Base(record.File), FileName: path.Base(record.File),
BackupType: mapAccount[uint(job.TargetDirID)].Type, BackupType: mapAccount[uint(job.TargetDirID)].Type,
BaseModel: model.BaseModel{ BaseModel: model.BaseModel{
CreatedAt: job.CreatedAt, CreatedAt: record.CreatedAt,
}, },
} }
if record.FromLocal { if record.FromLocal {

View File

@ -48,13 +48,6 @@
<el-tag type="info" v-if="snapInfo.recoverStatus === 'Waiting'"> <el-tag type="info" v-if="snapInfo.recoverStatus === 'Waiting'">
{{ $t('commons.table.statusWaiting') }} {{ $t('commons.table.statusWaiting') }}
</el-tag> </el-tag>
<!-- <el-button
style="margin-left: 15px"
@click="recoverSnapshot(true)"
:disabled="snapInfo.recoverStatus !== 'Success'"
>
{{ $t('setting.recover') }}
</el-button> -->
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('setting.lastRecoverAt')" :label="$t('setting.lastRecoverAt')"
@ -77,66 +70,68 @@
</div> </div>
</el-card> </el-card>
<span class="card-title">{{ $t('setting.rollback') }}</span> <div v-if="snapInfo.recoverStatus === 'Failed'">
<el-divider class="divider" /> <span class="card-title">{{ $t('setting.rollback') }}</span>
<div v-if="!snapInfo.rollbackStatus && !snapInfo.lastRollbackedAt"> <el-divider class="divider" />
<el-alert center class="alert" style="height: 257px" :closable="false"> <div v-if="!snapInfo.rollbackStatus && !snapInfo.lastRollbackedAt">
<el-button size="large" round plain type="primary" @click="rollbackSnapshot()"> <el-alert center class="alert" style="height: 257px" :closable="false">
{{ $t('setting.rollback') }} <el-button size="large" round plain type="primary" @click="rollbackSnapshot()">
</el-button> {{ $t('setting.rollback') }}
</el-alert> </el-button>
</div> </el-alert>
<div v-if="!snapInfo.rollbackStatus"> </div>
<div v-if="snapInfo.lastRollbackedAt"> <div v-if="!snapInfo.rollbackStatus">
<div v-if="snapInfo.lastRollbackedAt">
<el-form-item :label="$t('commons.table.status')">
<el-tag type="success">
{{ $t('commons.table.statusSuccess') }}
</el-tag>
<el-button @click="rollbackSnapshot" style="margin-left: 10px" type="primary">
{{ $t('setting.rollback') }}
</el-button>
</el-form-item>
<el-form-item :label="$t('setting.lastRollbackAt')">
{{ snapInfo.lastRollbackedAt }}
</el-form-item>
</div>
</div>
<div v-else>
<el-form-item :label="$t('commons.table.status')"> <el-form-item :label="$t('commons.table.status')">
<el-tag type="success"> <el-tag type="success" v-if="snapInfo.rollbackStatus === 'Success'">
{{ $t('commons.table.statusSuccess') }} {{ $t('commons.table.statusSuccess') }}
</el-tag> </el-tag>
<el-button @click="rollbackSnapshot" style="margin-left: 10px" type="primary"> <el-tag type="danger" v-if="snapInfo.rollbackStatus === 'Failed'">
{{ $t('commons.table.statusFailed') }}
</el-tag>
<el-tag type="info" v-if="snapInfo.rollbackStatus === 'Waiting'">
{{ $t('commons.table.statusWaiting') }}
</el-tag>
<el-button
style="margin-left: 15px"
:disabled="snapInfo.rollbackStatus !== 'Success'"
@click="rollbackSnapshot"
>
{{ $t('setting.rollback') }} {{ $t('setting.rollback') }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item :label="$t('setting.lastRollbackAt')"> <el-form-item
:label="$t('setting.lastRollbackAt')"
v-if="snapInfo.rollbackStatus !== 'Waiting'"
>
{{ snapInfo.lastRollbackedAt }} {{ snapInfo.lastRollbackedAt }}
</el-form-item> </el-form-item>
</div> <div v-if="snapInfo.rollbackStatus === 'Failed'">
</div> <el-form-item :label="$t('commons.button.log')">
<div v-else> <span style="word-break: break-all; flex-wrap: wrap; word-wrap: break-word">
<el-form-item :label="$t('commons.table.status')"> {{ snapInfo.rollbackMessage }}
<el-tag type="success" v-if="snapInfo.rollbackStatus === 'Success'"> </span>
{{ $t('commons.table.statusSuccess') }} </el-form-item>
</el-tag> <el-form-item>
<el-tag type="danger" v-if="snapInfo.rollbackStatus === 'Failed'"> <el-button @click="rollbackSnapshot()" type="primary">
{{ $t('commons.table.statusFailed') }} {{ $t('commons.button.retry') }}
</el-tag> </el-button>
<el-tag type="info" v-if="snapInfo.rollbackStatus === 'Waiting'"> </el-form-item>
{{ $t('commons.table.statusWaiting') }} </div>
</el-tag>
<el-button
style="margin-left: 15px"
:disabled="snapInfo.rollbackStatus !== 'Success'"
@click="rollbackSnapshot"
>
{{ $t('setting.rollback') }}
</el-button>
</el-form-item>
<el-form-item
:label="$t('setting.lastRollbackAt')"
v-if="snapInfo.rollbackStatus !== 'Waiting'"
>
{{ snapInfo.lastRollbackedAt }}
</el-form-item>
<div v-if="snapInfo.rollbackStatus === 'Failed'">
<el-form-item :label="$t('commons.button.log')">
<span style="word-break: break-all; flex-wrap: wrap; word-wrap: break-word">
{{ snapInfo.rollbackMessage }}
</span>
</el-form-item>
<el-form-item>
<el-button @click="rollbackSnapshot()" type="primary">
{{ $t('commons.button.retry') }}
</el-button>
</el-form-item>
</div> </div>
</div> </div>
</el-col> </el-col>