From b0e8787f05de0f9d4c1c8bf02a9d9a612c1ea65b Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Wed, 25 Oct 2023 15:28:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=20(#2675)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs #2652 --- backend/utils/cmd/cmd.go | 3 -- frontend/src/views/cronjob/record/index.vue | 31 ++++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/backend/utils/cmd/cmd.go b/backend/utils/cmd/cmd.go index 409bf9f65..1e56332f5 100644 --- a/backend/utils/cmd/cmd.go +++ b/backend/utils/cmd/cmd.go @@ -91,9 +91,6 @@ func ExecCronjobWithTimeOut(cmdStr string, workdir string, timeout time.Duration return "", buserr.New(constant.ErrCmdTimeout) } - if len(stderr.String()) != 0 { - err = buserr.New(constant.ErrBashExecute) - } return output.String(), err } diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue index 01fea06bb..c3b0fba81 100644 --- a/frontend/src/views/cronjob/record/index.vue +++ b/frontend/src/views/cronjob/record/index.vue @@ -131,8 +131,8 @@ {{ $t('commons.status.success') }} @@ -143,13 +143,12 @@ {{ $t('commons.status.failed') }} - + {{ dateFormat(0, 0, item.startTime) }} - {{ dateFormat(0, 0, item.startTime) }} -
+