From 01662cec66a9c16f0a3699037b647b7a15105732 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Thu, 6 Oct 2022 15:31:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/cornjob.go              |  5 --
 backend/app/service/cronjob_helper.go       |  7 +--
 frontend/src/views/cronjob/record/index.vue | 53 +++++++++++----------
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/backend/app/service/cornjob.go b/backend/app/service/cornjob.go
index b79763ebb..6e9f7bc44 100644
--- a/backend/app/service/cornjob.go
+++ b/backend/app/service/cornjob.go
@@ -18,11 +18,6 @@ import (
 	"github.com/robfig/cron/v3"
 )
 
-const (
-	errRecord = "errRecord"
-	errHandle = "errHandle"
-)
-
 type CronjobService struct{}
 
 type ICronjobService interface {
diff --git a/backend/app/service/cronjob_helper.go b/backend/app/service/cronjob_helper.go
index a280fa389..be89c0288 100644
--- a/backend/app/service/cronjob_helper.go
+++ b/backend/app/service/cronjob_helper.go
@@ -49,20 +49,17 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 		request, _ := http.NewRequest("GET", cronjob.URL, nil)
 		response, err := client.Do(request)
 		if err != nil {
-			record.Records = errHandle
-			cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), errHandle)
+			cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), string(message))
 		}
 		defer response.Body.Close()
 		message, _ = ioutil.ReadAll(response.Body)
 	}
 	if err != nil {
-		record.Records = errHandle
-		cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), errHandle)
+		cronjobRepo.EndRecords(record, constant.StatusFailed, err.Error(), string(message))
 		return
 	}
 	record.Records, err = mkdirAndWriteFile(cronjob, record.StartTime, message)
 	if err != nil {
-		record.Records = errRecord
 		global.LOG.Errorf("save file %s failed, err: %v", record.Records, err)
 	}
 	cronjobRepo.EndRecords(record, constant.StatusSuccess, "", record.Records)
diff --git a/frontend/src/views/cronjob/record/index.vue b/frontend/src/views/cronjob/record/index.vue
index 0e9c4d301..a6cc0fa3c 100644
--- a/frontend/src/views/cronjob/record/index.vue
+++ b/frontend/src/views/cronjob/record/index.vue
@@ -152,9 +152,12 @@
                                 v-if="dialogData.rowData!.type === 'website' || dialogData.rowData!.type === 'directory'"
                             >
                                 <el-form-item :label="$t('cronjob.exclusionRules')">
-                                    <div v-for="item in dialogData.rowData!.exclusionRules.split(';')" :key="item">
-                                        <el-tag>{{ item }}</el-tag>
+                                    <div v-if="dialogData.rowData!.exclusionRules">
+                                        <div v-for="item in dialogData.rowData!.exclusionRules.split(';')" :key="item">
+                                            <el-tag>{{ item }}</el-tag>
+                                        </div>
                                     </div>
+                                    <span v-else>-</span>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -191,30 +194,32 @@
                         <el-row>
                             <el-col :span="24">
                                 <el-form-item :label="$t('commons.table.records')">
-                                    <span
-                                        style="color: red"
-                                        v-if="currentRecord?.records! === 'errRecord' || currentRecord?.records! === 'errHandle'|| currentRecord?.records! === 'noRecord'"
-                                    >
+                                    <span style="color: red" v-if="currentRecord?.status! === 'Failed'">
                                         {{ currentRecord?.message }}
                                     </span>
-                                    <el-popover
-                                        v-else
-                                        placement="right"
-                                        :width="600"
-                                        trigger="click"
-                                        style="white-space: pre-wrap"
-                                    >
-                                        <div style="margin-left: 20px; max-height: 400px; overflow: auto">
-                                            <span style="white-space: pre-wrap">
-                                                {{ currentRecordDetail }}
-                                            </span>
-                                        </div>
-                                        <template #reference>
-                                            <el-button type="primary" link @click="loadRecord(currentRecord?.records!)">
-                                                {{ $t('commons.button.expand') }}
-                                            </el-button>
-                                        </template>
-                                    </el-popover>
+                                    <div v-else>
+                                        <el-popover
+                                            placement="right"
+                                            :width="600"
+                                            trigger="click"
+                                            style="white-space: pre-wrap"
+                                        >
+                                            <div style="margin-left: 20px; max-height: 400px; overflow: auto">
+                                                <span style="white-space: pre-wrap">
+                                                    {{ currentRecordDetail }}
+                                                </span>
+                                            </div>
+                                            <template #reference>
+                                                <el-button
+                                                    type="primary"
+                                                    link
+                                                    @click="loadRecord(currentRecord?.records!)"
+                                                >
+                                                    {{ $t('commons.button.expand') }}
+                                                </el-button>
+                                            </template>
+                                        </el-popover>
+                                    </div>
                                 </el-form-item>
                             </el-col>
                         </el-row>