From 999c43e5019b8a535455b8e68716f24a708d6953 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 13 Aug 2025 17:10:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.3' into feature/v5.0/5.0.3

---
 src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index c8e910a..d7941d3 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -24,8 +24,7 @@
             </el-tooltip-copy>
           </template>
         </el-table-column>
-				<el-table-column prop="dept_name" label="所属部门" width="200" align="center" />
-				<el-table-column prop="device_names" label="所属机巢" />
+				<el-table-column prop="device_names" label="所属机巢" show-overflow-tooltip/>
 				<el-table-column prop="ai_type_str" label="关联算法" show-overflow-tooltip align="center" />
 				<el-table-column label="任务状态" align="center">
 					<template #default="scope">
@@ -70,6 +69,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="cycle_time_value" label="任务时间" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="创建部门" width="200" align="center" />
 				<el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
 				<el-table-column label="操作" width="200" align="center">
 					<template #default="scope">

--
Gitblit v1.9.3