From 492239f26928e4b8e93207f8eb6092cb806f2ee9 Mon Sep 17 00:00:00 2001 From: Kane Wang Date: Thu, 9 Nov 2023 19:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8vite=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=92=8C=E7=94=9F=E4=BA=A7=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/web/task_schedule/.env.development | 43 ++++++++++++- code/web/task_schedule/.env.production | 50 ++++++++++++++++ code/web/task_schedule/package-lock.json | 16 ++--- code/web/task_schedule/package.json | 4 +- .../web/task_schedule/src/utils/api/config.ts | 60 +++++++------------ code/web/task_schedule/src/utils/reward.ts | 2 + .../data/bi/TelsalerAttachingRateView.vue | 8 ++- .../views/data/bi/TelsalerRenewalRateView.vue | 42 ++++++++----- code/web/task_schedule/tsconfig.json | 4 +- .../archievement/bi/BIReportController.java | 3 +- ...ryTelsalerAttachingRateReportResponse.java | 7 ++- .../src/main/resources/log4j2.xml | 16 ++++- 12 files changed, 178 insertions(+), 77 deletions(-) create mode 100644 code/web/task_schedule/.env.production diff --git a/code/web/task_schedule/.env.development b/code/web/task_schedule/.env.development index 40c39f6..19697bf 100644 --- a/code/web/task_schedule/.env.development +++ b/code/web/task_schedule/.env.development @@ -7,7 +7,44 @@ # # Copyright (c) ${2022} by Kane, All Rights Reserved. ### -NODE_ENV = 'development' +NODE_ENV='development' VITE_URL_VALIDATE_ACCOUNT="http://222.76.244.118:11101/desktop_archievement_backend/account/query_staff_info.do" -VITE_URL_LOGIN = "http://222.76.244.118:11101/admin-system/account/p13_account_check" -VITE_URL_DEPARTMENT_ARCHIEVEMENT="http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_department_archievement.do" \ No newline at end of file +VITE_URL_LOGIN="http://222.76.244.118:11101/admin-system/account/p13_account_check" +VITE_URL_DEPARTMENT_ARCHIEVEMENT="http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_department_archievement.do" + +### URL相关 ########## +#登录 +VITE_URL_LOGIN="http://222.76.244.118:11101/admin-system/account/p13_account_check" +VITE_URL_LOGIN_CALLER="http://222.76.244.118:11101/desktop_archievement_backend/account/query_telsaler_info.do" + +#部门业绩查询 +VITE_URL_DEPARTMENT_ARCHIEVEMENT="http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_department_archievement.do" +#坐席业绩查询 +VITE_URL_CALLER_ARCHIEVEMENT="http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_caller_archievement.do" + +#排行榜 +VITE_URL_RANKINGLIST="http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_ranking_list.do" + + +## 奖项相关 ## +## 查询奖励项目 +VITE_URL_RWARD_PROJECTS="http://222.76.244.118:11101/desktop_archievement_backend/rewards/query_reward_projects.do" +## 查询获奖人员 +VITE_URL_REWARD_GAINERS="http://222.76.244.118:11101/desktop_archievement_backend/rewards/query_reward_gainers.do" +## 添加获奖人员 +VITE_URL_ADD_REWARD_TELSALER="http://222.76.244.118:11101/desktop_archievement_backend/rewards/add_telsaler_reward.do" +## 更新获奖人员 +VITE_URL_UPDATE_REWARD_TELSALER="http://222.76.244.118:11101/desktop_archievement_backend/rewards/update_telsaler_reward.do" +## 删除获奖人员 +VITE_URL_DEL_REWARD_TELSALER="http://222.76.244.118:11101/desktop_archievement_backend/rewards/delete_telsaler_reward.do" + +## 上传文件 +VITE_URL_UPLOAD_FILE="http://222.76.244.118:11101/desktop_archievement_backend/file/file-upload.do" +## 导入报表 +VITE_URL_IMPORT_REPORT="http://222.76.244.118:11101/desktop_archievement_backend/import_bi_data/excel.do" + +## 请求BI报表数据 +VITE_URL_BI_TELSALER_ATTACHINGRATE="http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_telsaler_attachingrate.do" +VITE_URL_BI_TELSALER_RENEWALRATE="http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_telsaler_renewalrate.do" +VITE_URL_BI_DEPARTMENT_ATTACHINGRATE="http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_department_attachingrate.do" +VITE_URL_BI_DEPARTMENT_RENEWALRATE="http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_department_renewalrate.do" \ No newline at end of file diff --git a/code/web/task_schedule/.env.production b/code/web/task_schedule/.env.production new file mode 100644 index 0000000..d38dd85 --- /dev/null +++ b/code/web/task_schedule/.env.production @@ -0,0 +1,50 @@ +### + # @Author: Kane + # @Date: 2023-03-14 23:46:12 + # @LastEditors: Kane + # @FilePath: /task_schedule/.env.production + # @Description: + # + # Copyright (c) ${2022} by Kane, All Rights Reserved. +### +NODE_ENV='production' +VITE_URL_VALIDATE_ACCOUNT="http://10.39.0.41:8081/desktop_archievement_backend/account/query_staff_info.do" +VITE_URL_LOGIN="http://10.39.0.41:8081/admin-system/account/p13_account_check" +VITE_URL_DEPARTMENT_ARCHIEVEMENT="http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_department_archievement.do" + +### URL相关 ########## +#登录 +VITE_URL_LOGIN="http://10.39.0.41:8081/admin-system/account/p13_account_check" +VITE_URL_LOGIN_CALLER="http://10.39.0.41:8081/desktop_archievement_backend/account/query_telsaler_info.do" + +#部门业绩查询 +VITE_URL_DEPARTMENT_ARCHIEVEMENT="http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_department_archievement.do" +#坐席业绩查询 +VITE_URL_CALLER_ARCHIEVEMENT="http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_caller_archievement.do" + +#排行榜 +VITE_URL_RANKINGLIST="http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_ranking_list.do" + + +## 奖项相关 ## +## 查询奖励项目 +VITE_URL_RWARD_PROJECTS="http://10.39.0.41:8081/desktop_archievement_backend/rewards/query_reward_projects.do" +## 查询获奖人员 +VITE_URL_REWARD_GAINERS="http://10.39.0.41:8081/desktop_archievement_backend/rewards/query_reward_gainers.do" +## 添加获奖人员 +VITE_URL_ADD_REWARD_TELSALER="http://10.39.0.41:8081/desktop_archievement_backend/rewards/add_telsaler_reward.do" +## 更新获奖人员 +VITE_URL_UPDATE_REWARD_TELSALER="http://10.39.0.41:8081/desktop_archievement_backend/rewards/update_telsaler_reward.do" +## 删除获奖人员 +VITE_URL_DEL_REWARD_TELSALER="http://10.39.0.41:8081/desktop_archievement_backend/rewards/delete_telsaler_reward.do" + +## 上传文件 +VITE_URL_UPLOAD_FILE="http://10.39.0.41:8081/desktop_archievement_backend/file/file-upload.do" +## 导入报表 +VITE_URL_IMPORT_REPORT="http://10.39.0.41:8081/desktop_archievement_backend/import_bi_data/excel.do" + +## 请求BI报表数据 +VITE_URL_BI_TELSALER_ATTACHINGRATE="http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_telsaler_attachingrate.do" +VITE_URL_BI_TELSALER_RENEWALRATE="http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_telsaler_renewalrate.do" +VITE_URL_BI_DEPARTMENT_ATTACHINGRATE="http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_department_attachingrate.do" +VITE_URL_BI_DEPARTMENT_RENEWALRATE="http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_department_renewalrate.do" \ No newline at end of file diff --git a/code/web/task_schedule/package-lock.json b/code/web/task_schedule/package-lock.json index f4fecc9..8ecad2b 100644 --- a/code/web/task_schedule/package-lock.json +++ b/code/web/task_schedule/package-lock.json @@ -22,10 +22,10 @@ "@babel/eslint-parser": "^7.22.15", "@rushstack/eslint-patch": "^1.5.1", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@vitejs/plugin-vue": "^4.4.0", + "@vitejs/plugin-vue": "^4.4.1", "@vue/cli-plugin-eslint": "^5.0.8", "@vue/eslint-config-typescript": "^12.0.0", - "axios": "^1.6.0", + "axios": "^1.6.1", "babel": "^6.23.0", "eslint-config-recommended": "^4.1.0", "eslint-config-standard-with-typescript": "^39.1.1", @@ -2041,9 +2041,9 @@ } }, "node_modules/@vitejs/plugin-vue": { - "version": "4.4.0", - "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.4.0.tgz", - "integrity": "sha512-xdguqb+VUwiRpSg+nsc2HtbAUSGak25DXYvpQQi4RVU1Xq1uworyoH/md9Rfd8zMmPR/pSghr309QNcftUVseg==", + "version": "4.4.1", + "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.4.1.tgz", + "integrity": "sha512-HCQG8VDFDM7YDAdcj5QI5DvUi+r6xvo9LgvYdk7LSkUNwdpempdB5horkMSZsbdey9Ywsf5aaU8kEPw9M5kREA==", "dev": true, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -3248,9 +3248,9 @@ } }, "node_modules/axios": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.0.tgz", - "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", + "version": "1.6.1", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.1.tgz", + "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==", "dev": true, "dependencies": { "follow-redirects": "^1.15.0", diff --git a/code/web/task_schedule/package.json b/code/web/task_schedule/package.json index 2d320c1..1d17214 100644 --- a/code/web/task_schedule/package.json +++ b/code/web/task_schedule/package.json @@ -23,10 +23,10 @@ "@babel/eslint-parser": "^7.22.15", "@rushstack/eslint-patch": "^1.5.1", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@vitejs/plugin-vue": "^4.4.0", + "@vitejs/plugin-vue": "^4.4.1", "@vue/cli-plugin-eslint": "^5.0.8", "@vue/eslint-config-typescript": "^12.0.0", - "axios": "^1.6.0", + "axios": "^1.6.1", "babel": "^6.23.0", "eslint-config-recommended": "^4.1.0", "eslint-config-standard-with-typescript": "^39.1.1", diff --git a/code/web/task_schedule/src/utils/api/config.ts b/code/web/task_schedule/src/utils/api/config.ts index 1201c1c..aed8a0a 100644 --- a/code/web/task_schedule/src/utils/api/config.ts +++ b/code/web/task_schedule/src/utils/api/config.ts @@ -8,59 +8,39 @@ * Copyright (c) ${2022} by Kane, All Rights Reserved. */ const API_URL = { - // URL_LOGIN: import.meta.env.VITE_URL_LOGIN, - // URL_LOGIN: "http://222.76.244.118:11101/admin-system/account/p13_account_check", - URL_LOGIN: "http://10.39.0.41:8081/admin-system/account/p13_account_check", - - // URL_LOGIN_CALLER: "http://localhost:8080/desktop_archievement_backend/account/query_telsaler_info.do", - // URL_LOGIN_CALLER: "http://222.76.244.118:11101/desktop_archievement_backend/account/query_telsaler_info.do", - URL_LOGIN_CALLER: "http://10.39.0.41:8081/desktop_archievement_backend/account/query_telsaler_info.do", - - // URL_DEPARTMENT_ARCHIEVEMENT: import.meta.env.VITE_URL_DEPARTMENT_ARCHIEVEMENT, - // URL_DEPARTMENT_ARCHIEVEMENT: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_department_archievement.do", - URL_DEPARTMENT_ARCHIEVEMENT: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_department_archievement.do", - - // URL_RANKINGLIST: "http://localhost:8080/desktop_archievement_backend/archievement/query_ranking_list.do", - // URL_RANKINGLIST: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_ranking_list.do", - URL_RANKINGLIST: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_ranking_list.do", + // 登录 + URL_LOGIN: import.meta.env.VITE_URL_LOGIN, + URL_LOGIN_CALLER: import.meta.env.VITE_URL_LOGIN_CALLER, + // 机构业绩 + URL_DEPARTMENT_ARCHIEVEMENT: import.meta.env.VITE_URL_DEPARTMENT_ARCHIEVEMENT, // 坐席业绩查询 - // URL_CALLER_ARCHIEVEMENT: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/query_caller_archievement.do", - URL_CALLER_ARCHIEVEMENT: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/query_caller_archievement.do", + URL_CALLER_ARCHIEVEMENT: import.meta.env.VITE_URL_CALLER_ARCHIEVEMENT, + + // 排行榜 + URL_RANKINGLIST: import.meta.env.VITE_URL_RANKINGLIST, /** 奖项相关 **/ // 查询奖励项目 - // 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_RWARD_PROJECTS: import.meta.env.VITE_URL_RWARD_PROJECTS, // 查询获奖人员 - URL_REWARD_GAINERS: "http://10.39.0.41:8081/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", + URL_REWARD_GAINERS: import.meta.env.VITE_URL_REWARD_GAINERS, // 添加获奖人员 - URL_ADD_REWARD_TELSALER: "http://10.39.0.41:8081/desktop_archievement_backend/rewards/add_telsaler_reward.do", - // URL_ADD_REWARD_TELSALER: "http://222.76.244.118:11101/desktop_archievement_backend/rewards/add_telsaler_reward.do", + URL_ADD_REWARD_TELSALER: import.meta.env.VITE_URL_ADD_REWARD_TELSALER, // 更新获奖人员 - URL_UPDATE_REWARD_TELSALER: "http://10.39.0.41:8081/desktop_archievement_backend/rewards/update_telsaler_reward.do", - // URL_ADD_REWARD_TELSALER: "http://222.76.244.118:11101/desktop_archievement_backend/rewards/update_telsaler_reward.do", + URL_UPDATE_REWARD_TELSALER: import.meta.env.VITE_URL_UPDATE_REWARD_TELSALER, // 删除获奖人员 - URL_DEL_REWARD_TELSALER: "http://10.39.0.41:8081/desktop_archievement_backend/rewards/delete_telsaler_reward.do", - // URL_ADD_REWARD_TELSALER: "http://222.76.244.118:11101/desktop_archievement_backend/rewards/delete_telsaler_reward.do", + URL_DEL_REWARD_TELSALER: import.meta.env.VITE_URL_DEL_REWARD_TELSALER, // 上传文件 - URL_UPLOAD_FILE: "http://10.39.0.41:8081/desktop_archievement_backend/file/file-upload.do", - // URL_UPLOAD_FILE: "http://222.76.244.118:11101/desktop_archievement_backend/file/file-upload.do", + URL_UPLOAD_FILE: import.meta.env.VITE_URL_UPLOAD_FILE, // 导入报表 - URL_IMPORT_REPORT: "http://10.39.0.41:8081/desktop_archievement_backend/import_bi_data/excel.do", - // URL_IMPORT_REPORT: "http://222.76.244.118:11101/desktop_archievement_backend/import_bi_data/excel.do", + URL_IMPORT_REPORT: import.meta.env.VITE_URL_IMPORT_REPORT, // 请求BI报表数据 - // URL_BI_TELSALER_ATTACHINGRATE: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_telsaler_attachingrate.do", - // URL_BI_TELSALER_RENEWALRATE: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_telsaler_renewalrate.do", - // URL_BI_DEPARTMENT_ATTACHINGRATE: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_department_attachingrate.do", - // URL_BI_DEPARTMENT_RENEWALRATE: "http://10.39.0.41:8081/desktop_archievement_backend/archievement/bi_department_renewalrate.do", - - URL_BI_TELSALER_ATTACHINGRATE: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_telsaler_attachingrate.do", - URL_BI_TELSALER_RENEWALRATE: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_telsaler_renewalrate.do", - URL_BI_DEPARTMENT_ATTACHINGRATE: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_department_attachingrate.do", - URL_BI_DEPARTMENT_RENEWALRATE: "http://222.76.244.118:11101/desktop_archievement_backend/archievement/bi_department_renewalrate.do", + URL_BI_TELSALER_ATTACHINGRATE: import.meta.env.VITE_URL_BI_TELSALER_ATTACHINGRATE, + URL_BI_TELSALER_RENEWALRATE: import.meta.env.VITE_URL_BI_TELSALER_RENEWALRATE, + URL_BI_DEPARTMENT_ATTACHINGRATE: import.meta.env.VITE_URL_BI_DEPARTMENT_ATTACHINGRATE, + URL_BI_DEPARTMENT_RENEWALRATE: import.meta.env.VITE_URL_BI_DEPARTMENT_RENEWALRATE, }; export { API_URL }; diff --git a/code/web/task_schedule/src/utils/reward.ts b/code/web/task_schedule/src/utils/reward.ts index f03c005..3917930 100644 --- a/code/web/task_schedule/src/utils/reward.ts +++ b/code/web/task_schedule/src/utils/reward.ts @@ -170,6 +170,8 @@ function addRewardTelsaler( data: AddRewardTelsalerRequest, handler: any ): void message: "", }; + console.log( "URL：", API_URL.URL_ADD_REWARD_TELSALER ); + instance.request({ method: "post", url: API_URL.URL_ADD_REWARD_TELSALER, diff --git a/code/web/task_schedule/src/views/data/bi/TelsalerAttachingRateView.vue b/code/web/task_schedule/src/views/data/bi/TelsalerAttachingRateView.vue index 1e264a1..c0904ca 100644 --- a/code/web/task_schedule/src/views/data/bi/TelsalerAttachingRateView.vue +++ b/code/web/task_schedule/src/views/data/bi/TelsalerAttachingRateView.vue @@ -123,7 +123,7 @@ import { queryBITelsalerAttachingRateData } from "@/utils/BIReport.js"; import BiDataUploadView from "@/views/data/bi/BiDataUploadView.vue"; -import { ElMessageBox } from "element-plus"; +import { ElMessageBox, ElMessage } from "element-plus"; interface UI { @@ -169,6 +169,11 @@ export default { if ( response.success ) { ui.BITelsalerAttachingRateData = response.records; + + ElMessage({ + message: "更新成功", + type: "success", + }); } else { @@ -213,6 +218,7 @@ export default { const refresh = (): void => { + console.log( import.meta.env.VITE_TEST ); queryBITelsalerAttachingRateData( queryBITelsalerAttachingRateDataHandler ); }; diff --git a/code/web/task_schedule/src/views/data/bi/TelsalerRenewalRateView.vue b/code/web/task_schedule/src/views/data/bi/TelsalerRenewalRateView.vue index cdc41b8..9085941 100644 --- a/code/web/task_schedule/src/views/data/bi/TelsalerRenewalRateView.vue +++ b/code/web/task_schedule/src/views/data/bi/TelsalerRenewalRateView.vue @@ -38,25 +38,41 @@ align="center" > + > + + + > + + + > + + + > + +
records = + List records = mapper.queryBITelsalerAttachingRate(); response.setSuccess( true ); diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/bi/QueryTelsalerAttachingRateReportResponse.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/bi/QueryTelsalerAttachingRateReportResponse.java index 3a00193..f7ff352 100644 --- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/bi/QueryTelsalerAttachingRateReportResponse.java +++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/archievement/bi/QueryTelsalerAttachingRateReportResponse.java @@ -10,6 +10,7 @@ package com.cpic.xim.web.controllers.archievement.bi; import java.util.ArrayList; +import java.util.List; import com.cpic.xim.mybatis.pojo.BITelsalerAttachingRateRecord; import com.cpic.xim.web.controllers.QueryResponse; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class QueryTelsalerAttachingRateReportResponse extends QueryResponse { @JsonProperty("records") - ArrayList records; + List records; public QueryTelsalerAttachingRateReportResponse( boolean success, String message, ArrayList records ) @@ -33,12 +34,12 @@ public class QueryTelsalerAttachingRateReportResponse extends QueryResponse this.records = null; } - public ArrayList getRecords() + public List getRecords() { return records; } - public void setRecords( ArrayList records ) + public void setRecords( List records ) { this.records = records; } diff --git a/code/后端/desktop_archievement_backend/src/main/resources/log4j2.xml b/code/后端/desktop_archievement_backend/src/main/resources/log4j2.xml index 6817bea..53164ab 100644 --- a/code/后端/desktop_archievement_backend/src/main/resources/log4j2.xml +++ b/code/后端/desktop_archievement_backend/src/main/resources/log4j2.xml @@ -4,7 +4,7 @@ - [%t][%level][%d{HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n @@ -15,13 +15,25 @@ + + + [%t][%level][%d{HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n + + + + + + + - + +