Merge branch 'dev' into test

罗广辉

2025-04-21 22a23b05b25e4b5c616f65989ac0ca16324f4c29

 src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -35,7 +35,7 @@
                  <span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
               </template>
            </el-table-column>
        <el-table-column prop="begin_time" label="任务时间" />
        <el-table-column prop="create_time" label="任务时间" />
        <el-table-column prop="creator_name" label="创建人" />
        <el-table-column label="操作" >
          <template #default="scope">
@@ -94,6 +94,7 @@
    if (res.data.code !== 0) return;
    jobListData.value = res.data.data.records;
    total.value = res.data.data.total;
    
  });
};
// 状态文字