From 91b1eca3cabee4eb06463946e6f893a6ec435726 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 22 Jun 2024 17:50:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BB=8E=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=89=B9=E6=AC=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/job/batch/index.vue                    | 3 +++
 src/views/job/batch/modules/job-batch-search.vue | 3 +--
 src/views/job/task/index.vue                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue
index 053afd4..707f906 100644
--- a/src/views/job/batch/index.vue
+++ b/src/views/job/batch/index.vue
@@ -17,6 +17,7 @@ const detailData = ref<Api.JobBatch.JobBatch | null>();
 /** 详情页可见状态 */
 const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
 const jobName = history.state.jobName;
+const jobId = history.state.jobId;
 const taskBatchStatus = history.state.taskBatchStatus;
 
 const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
@@ -27,9 +28,11 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
     groupName: null,
     jobName: null,
     taskBatchStatus: null,
+    jobId: null,
     datetimeRange: monthRangeISO8601()
   },
   searchParams: {
+    jobId,
     jobName,
     taskBatchStatus
   },
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index b5b7ddb..c359b60 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -15,8 +15,6 @@ interface Emits {
   (e: 'search'): void;
 }
 
-const keywords = ref<string>('');
-
 const noSearchFlag = ref(false);
 
 const emit = defineEmits<Emits>();
@@ -25,6 +23,7 @@ const emit = defineEmits<Emits>();
 const jobList = ref<Api.Job.Job[]>([]);
 
 const model = defineModel<Api.JobBatch.JobBatchSearchParams>('model', { required: true });
+const keywords = ref<string>(model.value.jobName as string);
 
 function reset() {
   keywords.value = '';
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index f75ce89..72724e6 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -251,7 +251,7 @@ async function handleTriggerJob(id: string) {
 
 function goToBatch(jobId: string) {
   const findItem = data.value.find(item => item.id === jobId)!;
-  routerPushByKey('job_batch', { state: { jobName: findItem.jobName } });
+  routerPushByKey('job_batch', { state: { jobId, jobName: findItem.jobName } });
 }
 
 function body(): Api.Job.ExportJob {