gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-17 03:04:46 +08:00
Code

pref: 优化计划任务错误显示 (#4803)

Browse Source
This commit is contained in:
ssongliu 2024-04-30 17:33:15 +08:00 committed by GitHub
parent e47d449b1b
commit 164a48c99f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/system-upgrade/index.vue
View File

@ -16,9 +16,9 @@
</span> </span>
<el-button type="primary" link @click="toHalo"> <el-button type="primary" link @click="toHalo">
{{ isProductPro ? $t('license.pro') : $t('license.community') }} {{ isProductPro ? $t('license.pro') : $t('license.community') }}
<span class="version">{{ version }}</span>
</el-button> </el-button>
<el-badge is-dot style="margin-left: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion"> <span class="version">{{ version }}</span>
<el-badge is-dot style="margin-top: -3px" v-if="version !== 'Waiting' && globalStore.hasNewVersion">
<el-button type="primary" link @click="onLoadUpgradeInfo"> <el-button type="primary" link @click="onLoadUpgradeInfo">
<span>({{ $t('setting.hasNewVersion') }})</span> <span>({{ $t('setting.hasNewVersion') }})</span>
</el-button> </el-button>

19
frontend/src/views/cronjob/record/index.vue
View File

@ -154,14 +154,9 @@
<template #label> <template #label>
<span class="status-label">{{ $t('commons.table.status') }}</span> <span class="status-label">{{ $t('commons.table.status') }}</span>
</template> </template>
<el-tooltip v-if="currentRecord?.status === 'Failed'" placement="top"> <el-tag type="danger" v-if="currentRecord?.status === 'Failed'">
<template #content> {{ $t('commons.table.statusFailed') }}
<div style="width: 300px; word-break: break-all"> </el-tag>
{{ currentRecord?.message }}
</div>
</template>
<el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
</el-tooltip>
<el-tag type="success" v-if="currentRecord?.status === 'Success'"> <el-tag type="success" v-if="currentRecord?.status === 'Success'">
{{ $t('commons.table.statusSuccess') }} {{ $t('commons.table.statusSuccess') }}
</el-tag> </el-tag>
@ -170,6 +165,14 @@
</el-tag> </el-tag>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row v-if="currentRecord?.status === 'Failed'">
<el-form-item class="w-full">
<template #label>
<span class="status-label">{{ $t('commons.table.message') }}</span>
</template>
{{ currentRecord?.message }}
</el-form-item>
</el-row>
<el-row v-if="currentRecord?.records"> <el-row v-if="currentRecord?.records">
<span>{{ $t('commons.table.records') }}</span> <span>{{ $t('commons.table.records') }}</span>
<codemirror <codemirror