修复轮询日志和任务状态

This commit is contained in:
whyour 2021-05-12 12:02:08 +08:00
parent a50e3ad401
commit 57c1bbcae4
2 changed files with 3 additions and 3 deletions

View File

@ -99,12 +99,12 @@ const Crontab = () => {
align: 'center' as const, align: 'center' as const,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<> <>
{record.status !== CrontabStatus.disabled && !record.pid && ( {record.status === CrontabStatus.idle && (
<Tag icon={<ClockCircleOutlined />} color="default"> <Tag icon={<ClockCircleOutlined />} color="default">
</Tag> </Tag>
)} )}
{record.status === CrontabStatus.running && record.pid && ( {record.status === CrontabStatus.running && (
<Tag icon={<SyncOutlined spin />} color="processing"> <Tag icon={<SyncOutlined spin />} color="processing">
</Tag> </Tag>

View File

@ -31,7 +31,7 @@ const CronLogModal = ({
if (localStorage.getItem('logCron') === cron._id) { if (localStorage.getItem('logCron') === cron._id) {
const log = data.data as string; const log = data.data as string;
setValue(log || '暂无日志'); setValue(log || '暂无日志');
if (log && !log.includes('执行结束') && visible) { if (log && !log.includes('执行结束')) {
setTimeout(() => { setTimeout(() => {
getCronLog(); getCronLog();
}, 2000); }, 2000);