From 22a23b05b25e4b5c616f65989ac0ca16324f4c29 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:23:41 +0800
Subject: [PATCH] Merge branch 'dev' into test
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index b76722b..516ba77 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/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;
+
});
};
// 状态文字
--
Gitblit v1.9.3