From 0a596f3fdccc9fcecdb3d550889cb006450b30a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E5=B8=86?= <201379873@qq.com>
Date: Sat, 3 Aug 2024 22:25:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E5=9C=A8=E5=B0=8F?=
 =?UTF-8?q?=E5=B1=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/schedule/type.ts                 |  2 +-
 src/styles/global.scss                    | 17 -----------
 src/views/schedule/log/LogDetailModal.vue | 35 ++++++++++++++---------
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/apis/schedule/type.ts b/src/apis/schedule/type.ts
index f3eaa51..57acbaf 100644
--- a/src/apis/schedule/type.ts
+++ b/src/apis/schedule/type.ts
@@ -71,7 +71,7 @@ export interface JobInstanceQuery {
 export interface JobInstanceLogResp {
   id: number
   message: any[]
-  isFinished: number
+  finished: number
   fromIndex: number
   nextStartId: number
 }
diff --git a/src/styles/global.scss b/src/styles/global.scss
index d142ef3..03dd98d 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -1,22 +1,5 @@
 /* 全局样式 */
 @import './var.scss';
-// 全局滚动条
-::-webkit-scrollbar-thumb {
-  background-color: var(--color-bg-3);
-  border-radius: 5px;
-}
-::-webkit-scrollbar-thumb:hover {
-  background-color: var(--color-bg-3);
-  border-radius: 5px;
-}
-::-webkit-scrollbar {
-  width:8px;
-  height: 5px;
-}
-::-webkit-scrollbar-track-piece {
-  background-color: rgba(0, 0, 0, 0);
-  border-radius: 0;
-}
 // 通用外边距
 .gi_margin {
   margin: $margin;
diff --git a/src/views/schedule/log/LogDetailModal.vue b/src/views/schedule/log/LogDetailModal.vue
index f0a58c3..19637e4 100644
--- a/src/views/schedule/log/LogDetailModal.vue
+++ b/src/views/schedule/log/LogDetailModal.vue
@@ -1,7 +1,7 @@
 <template>
-  <a-modal v-model:visible="visible" title="任务日志详情" :width="width >= 1500 ? 1500 : '100%'" :footer="false"
-    @close="closed">
-    <div style="display: flex; min-height: 600px;max-height: 800px;">
+  <a-modal v-model:visible="visible" title="任务日志详情" :bodyStyle="{ maxHeight: '80vh', overflow: 'auto' }"
+    :width="width >= 1500 ? 1500 : '100%'" :footer="false" @close="closed">
+    <div style="display: flex;">
       <div style="padding: 10px 10px;">
         <div class="job_list">
           <div :class="`job_list_item ${item.id === activeId ? 'active' : ''}`" v-for="item in dataList" :key="item.id"
@@ -92,16 +92,25 @@ const onDetail = (record: JobLogResp) => {
 // 日志输出
 const onLogDetail = async (record: JobInstanceResp) => {
   activeId.value = record?.id
-  // todo startId根据第一次查询 如果有返回!=0则需要在查一次
-  const res = await listJobInstanceLog({
-    taskBatchId: record.taskBatchId,
-    jobId: record.jobId,
-    taskId: record.id,
-    startId: 0,
-    fromIndex: 0,
-    size: 50
-  })
-  content.value = res.data.message.map(formatLog).join('\n')
+  try {
+    // todo startId根据第一次查询 如果有返回!=0则需要在查一次
+    const res = await listJobInstanceLog({
+      taskBatchId: record.taskBatchId,
+      jobId: record.jobId,
+      taskId: record.id,
+      startId: 0,
+      fromIndex: 0,
+      size: 50
+    })
+    if (res.data?.finished) {
+      clearInterval(setIntervalNode.value)
+    }
+    content.value = res.data.message.map(formatLog).join('\n')
+  } catch (error) {
+    content.value = ''
+  }
+
+
 }
 const onStartInfo = (record: JobInstanceResp) => {
   content.value = ''