From b98b7646cb11ac8bd4718f614c14ce4230b767f5 Mon Sep 17 00:00:00 2001 From: whyour Date: Mon, 28 Nov 2022 23:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/services/cron.ts | 4 ++-- src/layouts/index.less | 4 ++-- src/pages/crontab/index.less | 7 ++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/back/services/cron.ts b/back/services/cron.ts index 1a1e34fa..9f7e34fe 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -326,10 +326,10 @@ export default class CronService { const endTime = dayjs(); const diffTimeStr = doc.last_execution_time - ? `,耗时 ${endTime.diff( + ? ` 耗时 ${endTime.diff( dayjs(doc.last_execution_time * 1000), 'second', - )}` + )} 秒` : ''; if (logFileExist) { const str = err ? `\n${err}` : ''; diff --git a/src/layouts/index.less b/src/layouts/index.less index cfb596a7..82b3972c 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -10,8 +10,8 @@ } .ant-modal-body { - max-height: calc(85vh - 110px); - max-height: calc(85vh - var(--vh-offset, 110px)); + max-height: calc(80vh - 110px); + max-height: calc(80vh - var(--vh-offset, 110px)); overflow-y: auto; } diff --git a/src/pages/crontab/index.less b/src/pages/crontab/index.less index b31ac988..089dcb30 100644 --- a/src/pages/crontab/index.less +++ b/src/pages/crontab/index.less @@ -4,13 +4,10 @@ .crontab-detail { .card-wrapper { - height: 80vh; - height: calc(80vh - var(--vh-offset, 0px)); - .ant-card:last-child { .ant-card-body { - height: calc(80vh - 238px); - height: calc(80vh - var(--vh-offset, 0px) - 238px); + height: calc(80vh - 367px); + height: calc(80vh - var(--vh-offset, 0px) - 367px); overflow-y: auto; } }