diff --git a/api/task.js b/api/task.js index 812d983..4d15292 100644 --- a/api/task.js +++ b/api/task.js @@ -5,17 +5,21 @@ /** * 获取任务列表 * @param {Object} params 请求参数 + * @param {string} params.ownerId 所属人id * @param {boolean} params.overdue 是否获取逾期任务 * @param {number[]} params.statusList 任务状态列表,4对应已完成 * @param {string} params.expireTimeStart 过期时间开始范围(格式:yyyy-MM-dd HH:mm:ss) * @param {string} params.expireTimeEnd 过期时间结束范围(格式:yyyy-MM-dd HH:mm:ss) * @returns {Promise} 返回任务列表 */ -export const getTaskList = ({ overdue, statusList, expireTimeStart, expireTimeEnd }) => { +export const getTaskList = ({ownerId, overdue, statusList, expireTimeStart, expireTimeEnd }) => { const queryParams = []; if (overdue !== undefined) { queryParams.push(`overdue=${overdue}`); } + if (ownerId !== undefined) { + queryParams.push(`ownerId=${ownerId}`); + } if (statusList !== undefined && Array.isArray(statusList) && statusList.length > 0) { // 将数组转换为逗号分隔的字符串,例如 [4] => "4" 或 [1,2,3] => "1,2,3" queryParams.push(`statusList=${statusList.join(',')}`); diff --git a/pages/task/list/index.vue b/pages/task/list/index.vue index a9b4555..bf16e65 100644 --- a/pages/task/list/index.vue +++ b/pages/task/list/index.vue @@ -85,6 +85,8 @@ import { getStatusText, getTaskStatusType, getTaskStatusStyle } from '@/utils/ta import { getTaskList } from '@/api'; import { useTaskStore } from '@/store/task'; import {truncateText} from "@/utils/textSolve/truncateText"; +import {useUserStore} from "@/store/user"; + // 获取页面参数 @@ -321,17 +323,21 @@ const loadTaskList = async () => { try { loading.value = true; let res; - + + let userId= useUserStore().getUserInfo.user.userId + let privateView= useUserStore().privateView + let ownerId = userId && privateView ? userId:'' // 根据状态类型调用不同的接口 if (statusFilter.value === 'completed') { - res = await getTaskList({ statusList: [4] }); + res = await getTaskList({ statusList: [4], ownerId: ownerId }); } else if (statusFilter.value === 'overdue') { - res = await getTaskList({ overdue: true }); + res = await getTaskList({ overdue: true, ownerId: ownerId }); } else if (statusFilter.value === 'pending') { - res = await getTaskList({ statusList: [2] }); + res = await getTaskList({ statusList: [2], ownerId: ownerId }); } else if (statusFilter.value === 'imminent') { const dateRange = getImminentDateRange(); - res = await getTaskList({ + res = await getTaskList({ + ownerId: ownerId, statusList: [2], expireTimeStart: dateRange.expireTimeStart, expireTimeEnd: dateRange.expireTimeEnd