github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/3856/head
ssongliu 10 months ago 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
Show Stats Download Patch File Download Diff File

6
backend/init/migration/migrations/v_1_9.go
Unescape View File

@ -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 {

113
frontend/src/views/setting/snapshot/status/index.vue
Unescape View File

@ -48,13 +48,6 @@
<el-tag type="info" v-if="snapInfo.recoverStatus === 'Waiting'">
{{ $t('commons.table.statusWaiting') }}
</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
:label="$t('setting.lastRecoverAt')"
@ -77,66 +70,68 @@
</div>
</el-card>
<span class="card-title">{{ $t('setting.rollback') }}</span>
<el-divider class="divider" />
<div v-if="!snapInfo.rollbackStatus && !snapInfo.lastRollbackedAt">
<el-alert center class="alert" style="height: 257px" :closable="false">
<el-button size="large" round plain type="primary" @click="rollbackSnapshot()">
{{ $t('setting.rollback') }}
</el-button>
</el-alert>
</div>
<div v-if="!snapInfo.rollbackStatus">
<div v-if="snapInfo.lastRollbackedAt">
<div v-if="snapInfo.recoverStatus === 'Failed'">
<span class="card-title">{{ $t('setting.rollback') }}</span>
<el-divider class="divider" />
<div v-if="!snapInfo.rollbackStatus && !snapInfo.lastRollbackedAt">
<el-alert center class="alert" style="height: 257px" :closable="false">
<el-button size="large" round plain type="primary" @click="rollbackSnapshot()">
{{ $t('setting.rollback') }}
</el-button>
</el-alert>
</div>
<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-tag type="success">
<el-tag type="success" v-if="snapInfo.rollbackStatus === 'Success'">
{{ $t('commons.table.statusSuccess') }}
</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') }}
</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-tag type="success" v-if="snapInfo.rollbackStatus === 'Success'">
{{ $t('commons.table.statusSuccess') }}
</el-tag>
<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"
<el-form-item
:label="$t('setting.lastRollbackAt')"
v-if="snapInfo.rollbackStatus !== 'Waiting'"
>
{{ $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>
{{ 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>
</el-col>

Write Preview
Loading…
Cancel
Save