From 00705e1ead9add86f6f3540ec7d50b65efb98827 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 21 May 2024 17:46:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E4=BB=BB=E5=8A=A1=E9=A1=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/business.ts                     |  9 ++++++
 src/locales/langs/en-us.ts                    | 12 +++++++
 src/locales/langs/zh-cn.ts                    | 12 +++++++
 src/typings/api.d.ts                          |  5 +++
 src/typings/app.d.ts                          | 12 +++++++
 .../batch/modules/job-batch-detail-drawer.vue | 31 +++++++++++++++++--
 6 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/src/constants/business.ts b/src/constants/business.ts
index af6202e..ac956f7 100644
--- a/src/constants/business.ts
+++ b/src/constants/business.ts
@@ -213,6 +213,15 @@ export const taskBatchStatusRecord: Record<Api.Common.TaskBatchStatus, App.I18n.
 };
 export const taskBatchStatusRecordOptions = transformRecordToNumberOption(taskBatchStatusRecord);
 
+export const taskStatusRecord: Record<Api.Common.TaskStatus, App.I18n.I18nKey> = {
+  2: 'common.taskStatus.items.running',
+  3: 'common.taskStatus.items.success',
+  4: 'common.taskStatus.items.fail',
+  5: 'common.taskStatus.items.stop',
+  6: 'common.taskStatus.items.cancel'
+};
+export const taskStatusRecordOptions = transformRecordToNumberOption(taskStatusRecord);
+
 export const operationReasonRecord: Record<Api.Common.OperationReason, App.I18n.I18nKey> = {
   0: 'common.jobOperationReason.items.none',
   1: 'common.jobOperationReason.items.taskExecutionTimeout',
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index d2f048e..2d6a975 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -133,6 +133,17 @@ const local: App.I18n.Schema = {
         cancel: 'Cancel'
       }
     },
+    taskStatus: {
+      label: 'Task status',
+      form: 'Please enter task status',
+      items: {
+        running: 'Running',
+        success: 'Success',
+        fail: 'Fail',
+        stop: 'Stop',
+        cancel: 'Cancel'
+      }
+    },
     jobOperationReason: {
       label: 'Job operation reason',
       form: 'Please enter job operation reason',
@@ -1003,6 +1014,7 @@ const local: App.I18n.Schema = {
         title: 'Job task list',
         id: 'ID',
         groupName: 'Group name',
+        taskStatus: 'Status',
         clientInfo: 'Client address',
         argsStr: 'Argument string',
         resultMessage: 'Result message',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 9567491..55f29d2 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -133,6 +133,17 @@ const local: App.I18n.Schema = {
         cancel: '取消'
       }
     },
+    taskStatus: {
+      label: '状态',
+      form: '请选择状态',
+      items: {
+        running: '运行中',
+        success: '处理成功',
+        fail: '处理失败',
+        stop: '任务停止',
+        cancel: '取消'
+      }
+    },
     jobOperationReason: {
       label: '操作原因',
       form: '请选择执行状态',
@@ -1010,6 +1021,7 @@ const local: App.I18n.Schema = {
         title: 'JobTask 列表',
         id: 'ID',
         groupName: '组名称',
+        taskStatus: '状态',
         clientInfo: '地址',
         argsStr: '参数',
         resultMessage: '结果',
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 4722812..5353744 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -88,6 +88,9 @@ declare namespace Api {
     /** 1、待处理 2、运行中 3、成功 4、失败 5、停止 6、取消 */
     type TaskBatchStatus = 1 | 2 | 3 | 4 | 5 | 6;
 
+    /** 2、处理中 3、处理成功 4、处理失败、5、任务停止 6、取消 */
+    type TaskStatus = 2 | 3 | 4 | 5 | 6;
+
     /**
      * 1、任务执行超时 2、无客户端节点 3、JOB已关闭 4、任务丢弃 5、任务被覆盖 6、无可执行任务项 7、任务执行期间发生非预期异常 8、手动停止 9、条件节点执行异常 10、任务中断 11、回调节点执行异常 12、无需处理
      * 13、节点关闭跳过执行 14、判定未通过
@@ -995,6 +998,8 @@ declare namespace Api {
       createDt: string;
       /** 任务批次 ID */
       taskBatchId: string;
+      /** 任务状态 ID */
+      taskStatus: Common.TaskStatus;
     }>;
 
     /** jobTask search params */
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index dddcca1..136a479 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -383,6 +383,17 @@ declare namespace App {
             cancel: string;
           };
         };
+        taskStatus: {
+          label: string;
+          form: string;
+          items: {
+            running: string;
+            success: string;
+            fail: string;
+            stop: string;
+            cancel: string;
+          };
+        };
         jobOperationReason: {
           label: string;
           form: string;
@@ -1149,6 +1160,7 @@ declare namespace App {
             title: string;
             id: string;
             groupName: string;
+            taskStatus: string;
             clientInfo: string;
             argsStr: string;
             resultMessage: string;
diff --git a/src/views/job/batch/modules/job-batch-detail-drawer.vue b/src/views/job/batch/modules/job-batch-detail-drawer.vue
index 88b2cc9..0d0c9b0 100644
--- a/src/views/job/batch/modules/job-batch-detail-drawer.vue
+++ b/src/views/job/batch/modules/job-batch-detail-drawer.vue
@@ -1,9 +1,13 @@
 <script setup lang="tsx">
-import { NButton } from 'naive-ui';
+import { NButton, NTag } from 'naive-ui';
 import { onBeforeUnmount, ref } from 'vue';
-import { executorTypeRecord, operationReasonRecord, taskBatchStatusRecord } from '@/constants/business';
+import {
+  executorTypeRecord,
+  operationReasonRecord,
+  taskBatchStatusRecord,
+  taskStatusRecord
+} from '@/constants/business';
 import { $t } from '@/locales';
-// import { fetchGetJobBatchDetail } from '@/service/api';
 import { tagColor } from '@/utils/common';
 import { useTable } from '@/hooks/common/table';
 import { fetchGetJobTaskList } from '@/service/api';
@@ -71,6 +75,27 @@ const { columns, data, loading, mobilePagination } = useTable({
       align: 'left',
       minWidth: 120
     },
+    {
+      key: 'taskStatus',
+      title: $t('page.jobBatch.jobTask.taskStatus'),
+      align: 'left',
+      minWidth: 80,
+      render: row => {
+        if (row.taskStatus === null) {
+          return null;
+        }
+        const label = $t(taskStatusRecord[row.taskStatus!]);
+        const tagMap: Record<number, NaiveUI.ThemeColor> = {
+          1: 'info',
+          2: 'info',
+          3: 'info',
+          4: 'error',
+          5: 'error',
+          6: 'error'
+        };
+        return <NTag type={tagMap[row.taskStatus!]}>{label}</NTag>;
+      }
+    },
     {
       key: 'clientInfo',
       title: $t('page.jobBatch.jobTask.clientInfo'),