diff --git a/code/web/task_schedule/.eslintrc.cjs b/code/web/task_schedule/.eslintrc.cjs index 68579df..227c0ba 100644 --- a/code/web/task_schedule/.eslintrc.cjs +++ b/code/web/task_schedule/.eslintrc.cjs @@ -157,7 +157,7 @@ module.exports = { "space-in-parens": ["error", "always", { exceptions: ["{}", "[]", "()", "empty",], },], "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", - "@typescript-eslint/no-explicit-any": "warn", + "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/indent": ["error", 4,], "@typescript-eslint/no-extra-semi": "off", "@typescript-eslint/no-inferrable-types": "off", diff --git a/code/web/task_schedule/src/utils/api/config.ts b/code/web/task_schedule/src/utils/api/config.ts index 75cdba7..3877c9e 100644 --- a/code/web/task_schedule/src/utils/api/config.ts +++ b/code/web/task_schedule/src/utils/api/config.ts @@ -31,4 +31,7 @@ export const API_URL = { // 查询奖励项目 // URL_RWARD_PROJECTS: "http://222.76.244.118:11101/desktop_archievement_backend/rewards/query_reward_projects.do" URL_RWARD_PROJECTS: "http://10.39.0.41:8081/desktop_archievement_backend/rewards/query_reward_projects.do", + // 查询获奖人员 + // URL_REWARD_GAINERS: "http://{{生产地址}}/desktop_archievement_backend/rewards/query_reward_gainers.do" + URL_REWARD_GAINERS: "http://222.76.244.118:11101/desktop_archievement_backend/rewards/query_reward_gainers.do", }; diff --git a/code/web/task_schedule/src/utils/reward.ts b/code/web/task_schedule/src/utils/reward.ts index b71cd2d..a580e0d 100644 --- a/code/web/task_schedule/src/utils/reward.ts +++ b/code/web/task_schedule/src/utils/reward.ts @@ -3,7 +3,7 @@ * @Date: 2023-09-11 09:59:00 * @LastEditors: Kane * @FilePath: /task_schedule/src/utils/reward.ts - * @Description: + * @Description: 奖励相关的API * * Copyright (c) ${2022} by Kane, All Rights Reserved. */ @@ -21,7 +21,7 @@ interface RewardProjectResponse { success: boolean; message: string; - rewardList: RewardProject[]; + rewardList: RewardProject[] | null; } interface RewardGainer @@ -33,6 +33,13 @@ interface RewardGainer rewardProjectName: string; } +interface RewardGainerResponse +{ + success: boolean; + message: string; + gainerList: RewardGainer[]; +} + /** * 请求奖项清单 * @param handler 用于处理请求数据的回调函数; @@ -44,6 +51,12 @@ function requestRewardPorjectsList( handler: any ): void return; } + const rewardResponse: RewardProjectResponse = { + success: false, + message: "", + rewardList: [], + }; + instance.request({ url: API_URL.URL_RWARD_PROJECTS, method: "post", @@ -52,15 +65,60 @@ function requestRewardPorjectsList( handler: any ): void .then(( response: AxiosResponse ): void => { const data = response.data ?? {}; - const success = data.success ?? false; - const message = data.message ?? ""; - const rewardProjectList = checkRewardProjects( data.rewardList ?? []); + rewardResponse.success = data.success ?? false; + rewardResponse.message = data.message ?? ""; + rewardResponse.rewardList = checkRewardProjects( data.rewardList ?? []); + + handler( rewardResponse, null ); }) .catch(( error: any ): void => { console.log( error ); - handler( null, error ); + rewardResponse.success = false; + + handler( rewardResponse, error ); + }); +} + +/** + * + * @param handler + */ +function requestRewardGainers( handler: any ): void +{ + if ( handler === undefined || handler === null ) + { + return; + } + + const rewardResponse: RewardGainerResponse = { + success: false, + message: "", + gainerList: [], + }; + + instance.request({ + url: API_URL.URL_REWARD_GAINERS, + method: "post", + }) + .then(( response: AxiosResponse ): void => + { + const data = response.data ?? {}; + + rewardResponse.success = data.success; + rewardResponse.message = data.message; + rewardResponse.gainerList = data.gainerList; + + handler( rewardResponse, null ); + }) + .catch(( error: any ): void => + { + console.log( error ); + + rewardResponse.success = false; + + handler( rewardResponse, error ); }); } @@ -88,9 +146,34 @@ function checkRewardProjects( data: any[]): RewardProject[] | null return rewardList; } +function checkRewardGainers( gainers: any[]): RewardGainer[] | null +{ + const gainerList: RewardGainer[] = []; + + if ( !( gainers instanceof Array )) + { + return null; + } + + gainers.forEach(( item: RewardGainer ): void => + { + const gainer: RewardGainer = { + acquiredDate: item.acquiredDate ?? "", + callerName: item.callerName ?? "", + callerCode: item.callerCode ?? "", + rewardProjectCode: item.rewardProjectCode ?? "", + rewardProjectName: item.rewardProjectName ?? "", + }; + }); + + return gainerList; +} + export { type RewardProject, type RewardGainer, type RewardProjectResponse, - requestRewardPorjectsList + type RewardGainerResponse, + requestRewardPorjectsList, + requestRewardGainers }; diff --git a/code/web/task_schedule/src/views/DataManagement.vue b/code/web/task_schedule/src/views/DataManagement.vue index 4d4b463..8e86b0f 100644 --- a/code/web/task_schedule/src/views/DataManagement.vue +++ b/code/web/task_schedule/src/views/DataManagement.vue @@ -39,52 +39,46 @@ /> -
- - XXX - -
- - 新增 - - - 删除 - -
- - - - - -