0930
This commit is contained in:
@ -32,19 +32,11 @@
|
||||
<el-option label="待执行" value="1"></el-option>
|
||||
<el-option label="执行中" value="4"></el-option>
|
||||
<el-option label="已延期" value="2"></el-option>
|
||||
|
||||
<el-option label="已完成" value="5"></el-option>
|
||||
<el-option label="失败" value="3"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="filter-item">
|
||||
<el-select v-model="planType" placeholder="全部计划">
|
||||
<el-option label="每日巡检计划" value="1"></el-option>
|
||||
<!-- 对应接口testPlanId -->
|
||||
<el-option label="每周巡检计划" value="2"></el-option>
|
||||
<el-option label="每月巡检计划" value="3"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
|
||||
<div class="filter-item">
|
||||
<el-select v-model="executor" placeholder="执行人">
|
||||
<el-option label="全部人员" value="all"></el-option>
|
||||
@ -706,14 +698,14 @@ const getExperimentPlanList = async () => {
|
||||
const getTaskList = async () => {
|
||||
try {
|
||||
loading.value = true;
|
||||
// 1. 构造接口请求参数(严格匹配createDept结构)
|
||||
// 1. 构造接口请求参数(严格匹配返回的JSON数据结构)
|
||||
const requestParams = {
|
||||
pageNum: currentPage.value,
|
||||
pageSize: pageSize.value,
|
||||
projectId: 1, // 项目ID(必需字段,需从全局状态/路由获取真实值)
|
||||
status: taskStatus.value || undefined, // 任务状态(为空不传递)
|
||||
testPlanId: planType.value || undefined, // 关联计划ID(筛选条件)
|
||||
person: executor.value === 'all' ? undefined : executor.value // 执行人ID(筛选条件)
|
||||
projectId: 1, // 项目ID(必需字段)
|
||||
status: taskStatus.value || undefined, // 任务状态(对应JSON中的status字段)
|
||||
testPlanId: planType.value || undefined, // 关联计划ID(对应JSON中的testPlanId字段)
|
||||
person: executor.value === 'all' ? undefined : executor.value // 执行人ID(对应JSON中的person字段)
|
||||
};
|
||||
|
||||
// 2. 调用接口(已引入的syrenwulist函数)
|
||||
@ -1124,9 +1116,9 @@ const handleAction = async (task) => {
|
||||
case '3': // 失败 → 重试(状态改为1)
|
||||
updateParams.status = '1';
|
||||
// 清空失败相关字段,使用适合各字段数据类型的默认值
|
||||
updateParams.failReason = '';
|
||||
updateParams.failTime = ''; // 时间类型字段使用null
|
||||
updateParams.failPhase = ''; // 整数类型字段使用0
|
||||
updateParams.failReason = null;
|
||||
updateParams.failTime = null; // 时间类型字段使用null
|
||||
updateParams.failPhase = null; // 整数类型字段使用0
|
||||
|
||||
// 将失败的步骤状态改回2(未完成)
|
||||
if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) {
|
||||
|
||||
Reference in New Issue
Block a user