From d0c9383bf8420f85a8b237d4b46211ae80ac9dd8 Mon Sep 17 00:00:00 2001 From: Kane Date: Tue, 9 May 2023 22:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20=E4=BF=9D=E5=AD=98=E5=9D=90=E5=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/web/task_schedule/src/test/test.ts | 4 ++-- .../src/types/cpicxim/Department.ts | 17 +++++++++++++++ .../src/{data => types}/cpicxim/StaffInfo.ts | 0 .../src/types/cpicxim/TelSaler.ts | 21 +++++++++++++++++++ code/web/task_schedule/src/utils/account.ts | 4 ++-- .../web/task_schedule/src/utils/api/config.ts | 4 ++-- .../src/utils/api/localStorage.ts | 2 +- .../task_schedule/src/utils/api/request.ts | 2 +- .../task_schedule/src/utils/archievement.ts | 3 ++- .../src/views/DesktopArchievement.vue | 9 +++++++- code/web/task_schedule/src/views/Login.vue | 12 +++++++++-- .../account/StaffInfoQueryController.java | 2 ++ 12 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 code/web/task_schedule/src/types/cpicxim/Department.ts rename code/web/task_schedule/src/{data => types}/cpicxim/StaffInfo.ts (100%) create mode 100644 code/web/task_schedule/src/types/cpicxim/TelSaler.ts diff --git a/code/web/task_schedule/src/test/test.ts b/code/web/task_schedule/src/test/test.ts index 5bf3020..a35038f 100644 --- a/code/web/task_schedule/src/test/test.ts +++ b/code/web/task_schedule/src/test/test.ts @@ -8,6 +8,6 @@ * Copyright (c) ${2022} by Kane, All Rights Reserved. */ -import { loginTestCaller } from "./requestTest.js"; +// import { loginTestCaller } from "./requestTest.js"; -loginTestCaller(); +// loginTestCaller(); diff --git a/code/web/task_schedule/src/types/cpicxim/Department.ts b/code/web/task_schedule/src/types/cpicxim/Department.ts new file mode 100644 index 0000000..e3bc06b --- /dev/null +++ b/code/web/task_schedule/src/types/cpicxim/Department.ts @@ -0,0 +1,17 @@ +/* + * @Author: Kane + * @Date: 2023-05-09 22:03:26 + * @LastEditors: Kane + * @FilePath: /task_schedule/src/data/cpicxim/Department.ts + * @Description: 部门数据结构 + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ + +interface Department +{ + departmentName: string; + departmentCode: string; +}; + +export { type Department }; diff --git a/code/web/task_schedule/src/data/cpicxim/StaffInfo.ts b/code/web/task_schedule/src/types/cpicxim/StaffInfo.ts similarity index 100% rename from code/web/task_schedule/src/data/cpicxim/StaffInfo.ts rename to code/web/task_schedule/src/types/cpicxim/StaffInfo.ts diff --git a/code/web/task_schedule/src/types/cpicxim/TelSaler.ts b/code/web/task_schedule/src/types/cpicxim/TelSaler.ts new file mode 100644 index 0000000..9b061bb --- /dev/null +++ b/code/web/task_schedule/src/types/cpicxim/TelSaler.ts @@ -0,0 +1,21 @@ +/* + * @Author: Kane + * @Date: 2023-05-09 22:18:04 + * @LastEditors: Kane + * @FilePath: /task_schedule/src/types/cpicxim/TelSaler.ts + * @Description: 坐席类型 + * + * Copyright (c) ${2022} by Kane, All Rights Reserved. + */ + +interface TelSaler +{ + telSalerCode: string; + telSalerName: string; + teamCode: string; + teamName: string; + departmentCode: string; + departmentName: string; +}; + +export { type TelSaler }; diff --git a/code/web/task_schedule/src/utils/account.ts b/code/web/task_schedule/src/utils/account.ts index e7c629c..421b80b 100644 --- a/code/web/task_schedule/src/utils/account.ts +++ b/code/web/task_schedule/src/utils/account.ts @@ -36,8 +36,8 @@ interface RequestResult interface LoginCallerResult extends RequestResult { - tele_saler_code: string; - tele_saler_name: string; + tel_saler_code: string; + tel_saler_name: string; team_code: string; team_name: string; department_code: string; diff --git a/code/web/task_schedule/src/utils/api/config.ts b/code/web/task_schedule/src/utils/api/config.ts index 1fac678..a5061b2 100644 --- a/code/web/task_schedule/src/utils/api/config.ts +++ b/code/web/task_schedule/src/utils/api/config.ts @@ -10,8 +10,8 @@ export 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_CALLER: "http://localhost:8080/desktop_archievement_backend/account/query_telsaler_info.do", - + // 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_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", }; diff --git a/code/web/task_schedule/src/utils/api/localStorage.ts b/code/web/task_schedule/src/utils/api/localStorage.ts index 02e51d6..eda78ad 100644 --- a/code/web/task_schedule/src/utils/api/localStorage.ts +++ b/code/web/task_schedule/src/utils/api/localStorage.ts @@ -7,7 +7,7 @@ * * Copyright (c) ${2022} by Kane, All Rights Reserved. */ -import { StaffInfo } from "../../data/cpicxim/StaffInfo.js"; +import { StaffInfo } from "../../types/cpicxim/StaffInfo.js"; const STUFF_ITEM = "stuff_info"; const CALLER_ITEM = "call_info"; diff --git a/code/web/task_schedule/src/utils/api/request.ts b/code/web/task_schedule/src/utils/api/request.ts index 9113c06..e989643 100644 --- a/code/web/task_schedule/src/utils/api/request.ts +++ b/code/web/task_schedule/src/utils/api/request.ts @@ -13,7 +13,7 @@ import axios, { type AxiosInstance } from "axios"; const service: AxiosInstance = axios.create( { baseURL: "", - timeout: 10000, + timeout: 5000, } ); diff --git a/code/web/task_schedule/src/utils/archievement.ts b/code/web/task_schedule/src/utils/archievement.ts index cbfec72..603a4ae 100644 --- a/code/web/task_schedule/src/utils/archievement.ts +++ b/code/web/task_schedule/src/utils/archievement.ts @@ -9,6 +9,7 @@ */ import { service as instance } from "./api/request.js"; import { API_URL } from "./api/config.js"; +import { type Department } from "@/types/cpicxim/Department.js"; // import { type AxiosResponse } from "axios"; interface Archievement @@ -28,7 +29,7 @@ interface Archievement * 获取部门业绩数据，并调用回调函数进行渲染。 * @param render 用于给组件更新数据的回调函数 */ -function queryDepartmentArchievement( render: any ): void +function queryDepartmentArchievement( departmentInfo: Department, render: any ): void { instance.request({ method: "post", diff --git a/code/web/task_schedule/src/views/DesktopArchievement.vue b/code/web/task_schedule/src/views/DesktopArchievement.vue index d7421c9..81b5bd3 100644 --- a/code/web/task_schedule/src/views/DesktopArchievement.vue +++ b/code/web/task_schedule/src/views/DesktopArchievement.vue @@ -61,6 +61,7 @@ import { useRouter } from "vue-router"; import { getCallerInfo } from "@/utils/api/localStorage.js"; import { ElMessage } from "element-plus"; import { type Archievement, queryDepartmentArchievement } from "@/utils/archievement.js"; +import { type Department } from "@/types/cpicxim/Department"; import ArchievementChart from "@/components/ArchievementChartComponent.vue"; import ArchievementCompleteRateComponent from "@/components/ArchievementCompleteRateComponent.vue"; import HonorListComponent from "@/components/HonorListComponent.vue"; @@ -146,7 +147,13 @@ export default { onBeforeMount(() => { - queryDepartmentArchievement( renderData ); + const deparmentInfo:Department = + { + departmentCode: "QDI", + departmentName: "续保业务部", + }; + + queryDepartmentArchievement( deparmentInfo, renderData ); }); return { ui, getTotalArchievement, renderData, logoutDesktopArchievement, }; diff --git a/code/web/task_schedule/src/views/Login.vue b/code/web/task_schedule/src/views/Login.vue index 3ce1743..069a603 100644 --- a/code/web/task_schedule/src/views/Login.vue +++ b/code/web/task_schedule/src/views/Login.vue @@ -70,7 +70,7 @@ import { useRouter } from "vue-router"; import { saveStaffInfo, getUserType, saveUserType, getCallerInfo, saveCallerInfo } from "@/utils/api/localStorage"; import { login, loginCaller, type LoginCallerInfo, type LoginCallerResult } from "@/utils/account"; import { ElMessage } from "element-plus"; -import { StaffInfo } from "@/data/cpicxim/StaffInfo"; +import { StaffInfo } from "@/types/cpicxim/StaffInfo"; export default { name: "LoginPage", @@ -168,6 +168,7 @@ export default { telsaler_code: ui.account, }; + // debugger; // 登录 loginCaller( loginInfo ) // 调用接口成功 @@ -200,7 +201,14 @@ export default { // 调用接口失败 .catch(( error ) => { - console.log( `登录失败，返回信息：${error}` ); + const message = `登录失败，返回信息：${error}`; + + console.log( message ); + + ElMessage({ + message, + type: "error", + }); }); } }; diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/StaffInfoQueryController.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/StaffInfoQueryController.java index bd90b79..7ca579a 100644 --- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/StaffInfoQueryController.java +++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/account/StaffInfoQueryController.java @@ -11,6 +11,7 @@ package com.cpic.xim.web.controllers.account; import java.sql.SQLException; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -20,6 +21,7 @@ import com.cpic.xim.utils.account.TeleSalerInfo; @Controller +//@CrossOrigin @RequestMapping( "/account" ) public class StaffInfoQueryController {