diff --git a/src/api/match/project.js b/src/api/match/project.js index 73d3bce..15777bc 100644 --- a/src/api/match/project.js +++ b/src/api/match/project.js @@ -8,7 +8,7 @@ import { http } from '../../utils/request'; * @param {Object} params - 查询参数 * @param {number} [params.EventId] - 赛事ID * @param {string} [params.ProjectName] - 项目名称 (模糊查询) - * @param {number} [params.ProjectTypeId] - 项目类型ID + * @param {number} [params.ProjectType] - 项目类型 * @param {number} [params.PageNo] - 当前页码 * @param {number} [params.PageSize] - 页码容量 */ @@ -21,7 +21,7 @@ export const projectPageGet = (params) => { * @param {Object} data - 项目信息 * @param {number} data.eventId - 赛事ID * @param {string} data.name - 项目名称 - * @param {number} data.projectTypeId - 项目类型ID + * @param {number} data.projectType - 项目类型 * @param {number} data.completionCount - 完成人数 * @param {number} data.fee - 费用 * @param {number} data.durationMinutes - 时长(分钟) @@ -44,7 +44,7 @@ export const projectAddPost = (data) => { * @param {number} data.id - 项目ID * @param {number} data.eventId - 赛事ID * @param {string} data.name - 项目名称 - * @param {number} data.projectTypeId - 项目类型ID + * @param {number} data.projectType - 项目类型 * @param {number} data.completionCount - 完成次数/达标次数 * @param {number} data.fee - 费用 * @param {number} data.durationMinutes - 时长(分钟) diff --git a/src/components/ProTable/hooks/useTable.ts b/src/components/ProTable/hooks/useTable.ts index f4d8938..0cf700d 100644 --- a/src/components/ProTable/hooks/useTable.ts +++ b/src/components/ProTable/hooks/useTable.ts @@ -93,7 +93,13 @@ export const useTable = ( for (let key in state.searchParam) { // * 某些情况下参数为 false/0 也应该携带参数 if (state.searchParam[key] || state.searchParam[key] === false || state.searchParam[key] === 0) { - nowSearchParam[key] = state.searchParam[key]; + // 处理日期范围参数:如果是数组,拆分为 StartTime 和 EndTime + if (Array.isArray(state.searchParam[key]) && state.searchParam[key].length === 2) { + nowSearchParam['StartTime'] = state.searchParam[key][0]; + nowSearchParam['EndTime'] = state.searchParam[key][1]; + } else { + nowSearchParam[key] = state.searchParam[key]; + } } } Object.assign(state.totalParam, nowSearchParam, isPageable ? pageParam.value : {}); diff --git a/src/utils/request.ts b/src/utils/request.ts index 1a0ac94..0e9dc24 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -79,10 +79,11 @@ service.interceptors.response.use( ElMessage.error('无权访问'); return response; } - // 处理规范化结果错误 + // 处理规范化结果错误 if (res.statusCode !== 200) { var message = JSON.stringify(res.errors); ElMessage.error(message); + return Promise.reject(new Error(res.errors || 'Request failed')); } return response; }, diff --git a/src/views/match/manage/Steps/Step3ProjectConfig.vue b/src/views/match/manage/Steps/Step3ProjectConfig.vue index 9c2b72f..e48faf8 100644 --- a/src/views/match/manage/Steps/Step3ProjectConfig.vue +++ b/src/views/match/manage/Steps/Step3ProjectConfig.vue @@ -128,7 +128,7 @@ -