From 06eefdd11730c6380daab5891cba2eb78efb68b5 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 5 Jun 2024 10:59:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0=5Fbeta4):=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=96=B0=E5=A2=9E=E7=82=B9=E5=87=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/router.ts                    |  2 +-
 src/typings/api.d.ts                          |  2 +-
 src/views/home/modules/card-data.vue          | 53 +++++++++++++------
 src/views/job/batch/index.vue                 |  4 +-
 .../job/batch/modules/job-batch-search.vue    |  6 ---
 src/views/retry/log/index.vue                 |  5 +-
 .../retry/log/modules/retry-log-search.vue    | 10 ++++
 src/views/workflow/batch/index.vue            |  4 +-
 8 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts
index 21fe3db..6f1ce1e 100644
--- a/src/hooks/common/router.ts
+++ b/src/hooks/common/router.ts
@@ -21,7 +21,7 @@ export function useRouterPush(inSetup = true) {
   interface RouterPushOptions {
     query?: Record<string, string>;
     params?: Record<string, string>;
-    state?: Record<string, string>;
+    state?: Record<string, string | number>;
   }
 
   async function routerPushByKey(key: RouteKey, options?: RouterPushOptions) {
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index b65346a..e494e5e 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1162,7 +1162,7 @@ declare namespace Api {
 
     /** retryLog search params */
     type RetryLogSearchParams = CommonType.RecordNullable<
-      Pick<Api.RetryLog.RetryLog, 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo'> &
+      Pick<Api.RetryLog.RetryLog, 'uniqueId' | 'groupName' | 'sceneName' | 'idempotentId' | 'bizNo' | 'retryStatus'> &
         CommonSearchParams
     >;
 
diff --git a/src/views/home/modules/card-data.vue b/src/views/home/modules/card-data.vue
index a560d9e..fe1e282 100644
--- a/src/views/home/modules/card-data.vue
+++ b/src/views/home/modules/card-data.vue
@@ -108,22 +108,22 @@ const cardData = computed<CardData[]>(() => [
       {
         label: $t('common.success'),
         value: props.modelValue?.jobTask.successNum ?? 0,
-        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: '3' } })
+        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: 3 } })
       },
       {
         label: $t('common.fail'),
         value: props.modelValue?.jobTask.failNum ?? 0,
-        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: '4' } })
+        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: 4 } })
       },
       {
         label: $t('common.stop'),
         value: props.modelValue?.jobTask.stopNum ?? 0,
-        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: '5' } })
+        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: 5 } })
       },
       {
         label: $t('common.cancel'),
         value: props.modelValue?.jobTask.cancelNum ?? 0,
-        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: '6' } })
+        click: () => routerPushByKey('job_batch', { state: { taskBatchStatus: 6 } })
       }
     ]
   },
@@ -142,19 +142,23 @@ const cardData = computed<CardData[]>(() => [
     bottom: [
       {
         label: $t('common.success'),
-        value: props.modelValue?.retryTask.finishNum ?? 0
+        value: props.modelValue?.retryTask.finishNum ?? 0,
+        click: () => routerPushByKey('retry_log', { state: { retryStatus: 1 } })
       },
       {
         label: $t('common.running'),
-        value: props.modelValue?.retryTask.runningNum ?? 0
+        value: props.modelValue?.retryTask.runningNum ?? 0,
+        click: () => routerPushByKey('retry_log', { state: { retryStatus: 0 } })
       },
       {
         label: $t('page.manage.retryTask.status.maxRetryTimes'),
-        value: props.modelValue?.retryTask.maxCountNum ?? 0
+        value: props.modelValue?.retryTask.maxCountNum ?? 0,
+        click: () => routerPushByKey('retry_log', { state: { retryStatus: 2 } })
       },
       {
         label: $t('page.manage.retryTask.status.pauseRetry'),
-        value: props.modelValue?.retryTask.suspendNum ?? 0
+        value: props.modelValue?.retryTask.suspendNum ?? 0,
+        click: () => routerPushByKey('retry_log', { state: { retryStatus: 3 } })
       }
     ]
   },
@@ -173,19 +177,23 @@ const cardData = computed<CardData[]>(() => [
     bottom: [
       {
         label: $t('common.success'),
-        value: props.modelValue?.workFlowTask.successNum ?? 0
+        value: props.modelValue?.workFlowTask.successNum ?? 0,
+        click: () => routerPushByKey('workflow_batch', { state: { taskBatchStatus: 3 } })
       },
       {
         label: $t('common.fail'),
-        value: props.modelValue?.workFlowTask.failNum ?? 0
+        value: props.modelValue?.workFlowTask.failNum ?? 0,
+        click: () => routerPushByKey('workflow_batch', { state: { taskBatchStatus: 4 } })
       },
       {
         label: $t('common.stop'),
-        value: props.modelValue?.workFlowTask.stopNum ?? 0
+        value: props.modelValue?.workFlowTask.stopNum ?? 0,
+        click: () => routerPushByKey('workflow_batch', { state: { taskBatchStatus: 5 } })
       },
       {
         label: $t('common.cancel'),
-        value: props.modelValue?.workFlowTask.cancelNum ?? 0
+        value: props.modelValue?.workFlowTask.cancelNum ?? 0,
+        click: () => routerPushByKey('workflow_batch', { state: { taskBatchStatus: 6 } })
       }
     ]
   },
@@ -204,11 +212,13 @@ const cardData = computed<CardData[]>(() => [
     bottom: [
       {
         label: $t('page.manage.machine.type.client'),
-        value: props.modelValue?.onLineService.clientTotal ?? 0
+        value: props.modelValue?.onLineService.clientTotal ?? 0,
+        click: () => routerPushByKey('pods')
       },
       {
         label: $t('page.manage.machine.type.server'),
-        value: props.modelValue?.onLineService.serverTotal ?? 0
+        value: props.modelValue?.onLineService.serverTotal ?? 0,
+        click: () => routerPushByKey('pods')
       }
     ]
   }
@@ -283,9 +293,9 @@ function getGradientColor(color: CardData['color']) {
             <NDivider />
             <template v-for="(bottomItem, bottomIndex) in item.bottom" :key="bottomIndex">
               <NDivider v-if="bottomIndex !== 0" vertical />
-              <span :class="bottomItem.click ? 'cursor-pointer' : null" @click="bottomItem.click">
+              <span :class="bottomItem.click ? 'cursor-pointer home-card-footer' : null" @click="bottomItem.click">
                 {{ bottomItem.label }}
-                <CountTo :start-value="0" :end-value="bottomItem.value" class="text-white" />
+                <CountTo :start-value="0" :end-value="bottomItem.value" />
               </span>
             </template>
           </GradientBg>
@@ -317,4 +327,15 @@ function getGradientColor(color: CardData['color']) {
   box-shadow: var(--n-box-shadow);
   border-radius: 8px;
 }
+
+.home-card-footer:hover {
+  color: #fff;
+  font-size: 14px;
+  transition: all 0.25s ease-in;
+}
+
+.home-card-footer:hover {
+  color: #1366ff !important;
+  font-size: 15px;
+}
 </style>
diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 43cf6dc..ead9755 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -20,6 +20,8 @@ const detailData = ref<Api.JobBatch.JobBatch | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 
+const taskBatchStatus = history.state.taskBatchStatus;
+
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetJobBatchList,
   apiParams: {
@@ -27,7 +29,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     size: 10,
     groupName: null,
     jobName: null,
-    taskBatchStatus: null
+    taskBatchStatus
   },
   columns: () => [
     {
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index ea29c97..2df1836 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -23,12 +23,6 @@ function reset() {
 function search() {
   emit('search');
 }
-
-const taskBatchStatus = history.state.taskBatchStatus;
-
-if (taskBatchStatus) {
-  model.value.taskBatchStatus = Number(taskBatchStatus) as Api.Common.TaskBatchStatus;
-}
 </script>
 
 <template>
diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue
index 2857515..516314d 100644
--- a/src/views/retry/log/index.vue
+++ b/src/views/retry/log/index.vue
@@ -18,6 +18,8 @@ const detailData = ref<Api.RetryLog.RetryLog | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 
+const retryStatus = history.state.retryStatus;
+
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchRetryLogPageList,
   apiParams: {
@@ -29,7 +31,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     groupName: null,
     sceneName: null,
     idempotentId: null,
-    bizNo: null
+    bizNo: null,
+    retryStatus
   },
   columns: () => [
     {
diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue
index 2f5fba8..f779999 100644
--- a/src/views/retry/log/modules/retry-log-search.vue
+++ b/src/views/retry/log/modules/retry-log-search.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
+import { translateOptions } from '@/utils/common';
+import { retryTaskStatusTypeOptions } from '@/constants/business';
 import SelectGroup from '@/components/common/select-group.vue';
 import SelectScene from '@/components/common/select-scene.vue';
 
@@ -42,6 +44,14 @@ function search() {
     <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.bizNo')" path="bizNo" class="pr-24px">
       <NInput v-model:value="model.bizNo" :placeholder="$t('page.retryLog.form.bizNo')" />
     </NFormItemGi>
+    <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.retryStatus')" path="taskBatchStatus" class="pr-24px">
+      <NSelect
+        v-model:value="model.retryStatus"
+        :placeholder="$t('page.retryTask.form.retryStatus')"
+        :options="translateOptions(retryTaskStatusTypeOptions)"
+        clearable
+      />
+    </NFormItemGi>
   </SearchForm>
 </template>
 
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index a640a4f..c72e573 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -16,6 +16,8 @@ const workflowId =
 
 const appStore = useAppStore();
 
+const taskBatchStatus = history.state.taskBatchStatus;
+
 const { columns, columnChecks, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
   apiFn: fetchGetWorkflowBatchList,
   apiParams: {
@@ -25,7 +27,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     // the value can not be undefined, otherwise the property in Form will not be reactive
     workflowId,
     groupName: null,
-    taskBatchStatus: null
+    taskBatchStatus
   },
   columns: () => [
     {