feat(sj_1.1.0-beta1): 完成定时任务从任务跳转到批次页面时自动填充任务名称

This commit is contained in:
opensnail 2024-06-22 17:50:26 +08:00
parent 3e0d2d926b
commit 91b1eca3ca
3 changed files with 5 additions and 3 deletions

View File

@ -17,6 +17,7 @@ const detailData = ref<Api.JobBatch.JobBatch | null>();
/** 详情页可见状态 */ /** 详情页可见状态 */
const { bool: detailVisible, setTrue: openDetail } = useBoolean(false); const { bool: detailVisible, setTrue: openDetail } = useBoolean(false);
const jobName = history.state.jobName; const jobName = history.state.jobName;
const jobId = history.state.jobId;
const taskBatchStatus = history.state.taskBatchStatus; const taskBatchStatus = history.state.taskBatchStatus;
const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({ const { columnChecks, columns, data, getData, loading, mobilePagination, searchParams, resetSearchParams } = useTable({
@ -27,9 +28,11 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
groupName: null, groupName: null,
jobName: null, jobName: null,
taskBatchStatus: null, taskBatchStatus: null,
jobId: null,
datetimeRange: monthRangeISO8601() datetimeRange: monthRangeISO8601()
}, },
searchParams: { searchParams: {
jobId,
jobName, jobName,
taskBatchStatus taskBatchStatus
}, },

View File

@ -15,8 +15,6 @@ interface Emits {
(e: 'search'): void; (e: 'search'): void;
} }
const keywords = ref<string>('');
const noSearchFlag = ref(false); const noSearchFlag = ref(false);
const emit = defineEmits<Emits>(); const emit = defineEmits<Emits>();
@ -25,6 +23,7 @@ const emit = defineEmits<Emits>();
const jobList = ref<Api.Job.Job[]>([]); const jobList = ref<Api.Job.Job[]>([]);
const model = defineModel<Api.JobBatch.JobBatchSearchParams>('model', { required: true }); const model = defineModel<Api.JobBatch.JobBatchSearchParams>('model', { required: true });
const keywords = ref<string>(model.value.jobName as string);
function reset() { function reset() {
keywords.value = ''; keywords.value = '';

View File

@ -251,7 +251,7 @@ async function handleTriggerJob(id: string) {
function goToBatch(jobId: string) { function goToBatch(jobId: string) {
const findItem = data.value.find(item => item.id === jobId)!; 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 { function body(): Api.Job.ExportJob {