Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management

张含笑

2025-09-01 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b

 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">
@@ -104,7 +104,7 @@
   /> -->
   <!-- 历史任务详情 -->
   <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJodInfoId="rowData.id"
      :batchNo="rowData.batch_no" />
      :batchNo="rowData.batch_no" :jobId="jobId"/>
   <CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
      @refresh="getJobList" />
</template>
@@ -166,10 +166,12 @@

// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
let rowData = ref({})
const jobId = ref('')
const handleDetail = row => {
   if (!row.device_sns.length) return ElMessage.warning('没有device_sns')
   if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度')
   rowData.value = row ? row : {}
jobId.value = rowData.value?.job_id
   if (row.status === 2 || row.status === 1) {
      // isShowCurrentTaskDetails.value = true
      // 跳转大屏当前任务详情