From 42e7814f816bedba1a0ef8e8f8fb3df1f495c9db Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:27:58 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into feature/v9.0/9.0.1
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 6b34eeb..e79c353 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -17,7 +17,7 @@
</el-tooltip-copy>
</template>
</el-table-column>
- <el-table-column prop="name" label="任务编号" width="160">
+ <el-table-column prop="name" label="任务名称" width="160">
<template #default="scope">
<el-tooltip-copy :content="scope.row.name" :showCopyText="true">
{{scope.row.name}}
@@ -100,10 +100,10 @@
<!-- <CurrentTaskDetails
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
- :wayLineJodInfoId="rowData.id"
+ :wayLineJobInfoId="rowData.id"
/> -->
<!-- 历史任务详情 -->
- <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJodInfoId="rowData.id"
+ <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJobInfoId="rowData.id"
:batchNo="rowData.batch_no" :jobId="jobId"/>
<CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
@refresh="getJobList" />
--
Gitblit v1.9.3