Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Apr 30, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/system-upgrade/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</span>
<el-button type="primary" link @click="toHalo">
{{ isProductPro ? $t('license.pro') : $t('license.community') }}
<span class="version">{{ version }}</span>
</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">
<span>({{ $t('setting.hasNewVersion') }})</span>
</el-button>
Expand Down
19 changes: 11 additions & 8 deletions frontend/src/views/cronjob/record/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,9 @@
<template #label>
<span class="status-label">{{ $t('commons.table.status') }}</span>
</template>
<el-tooltip v-if="currentRecord?.status === 'Failed'" placement="top">
<template #content>
<div style="width: 300px; word-break: break-all">
{{ currentRecord?.message }}
</div>
</template>
<el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
</el-tooltip>
<el-tag type="danger" v-if="currentRecord?.status === 'Failed'">
{{ $t('commons.table.statusFailed') }}
</el-tag>
<el-tag type="success" v-if="currentRecord?.status === 'Success'">
{{ $t('commons.table.statusSuccess') }}
</el-tag>
Expand All @@ -170,6 +165,14 @@
</el-tag>
</el-form-item>
</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">
<span>{{ $t('commons.table.records') }}</span>
<codemirror
Expand Down
Loading