diff --git a/frontend/src/global/defines.ts b/frontend/src/global/defines.ts index aba9e13e7917eb4c347140bc84af257479392639..2a64f5f6499fa077ef954b51bd6acaaec6fc63d1 100644 --- a/frontend/src/global/defines.ts +++ b/frontend/src/global/defines.ts @@ -1,5 +1,7 @@ // cookie定义 -export const CookieAuthToken = "token" +// TODO: use simple token name +// export const CookieAuthToken = "token" +export const CookieAuthToken = "Admin-Token" diff --git a/frontend/src/request/overview.ts b/frontend/src/request/overview.ts new file mode 100644 index 0000000000000000000000000000000000000000..d0eb9e2eb0a546d3169d29fafd1ae004328fb0d7 --- /dev/null +++ b/frontend/src/request/overview.ts @@ -0,0 +1,9 @@ +import request from './request'; + +// 获取机器集群概览信息 +export function machinesOverview() { + return request({ + url: '/overview/info', + method: 'get', + }); +} \ No newline at end of file diff --git a/frontend/src/request/request.ts b/frontend/src/request/request.ts index 150670d6d431e0437b6ed383be2561bb56d66a52..e26ac1af2000cc8235b78e54b2eaf43f1f6d7778 100644 --- a/frontend/src/request/request.ts +++ b/frontend/src/request/request.ts @@ -1,4 +1,4 @@ -import axios from 'axios'; +import axios, { type AxiosRequestConfig } from 'axios'; // 公共定义 @@ -30,11 +30,17 @@ instance.interceptors.response.use( }, (error) => { // 处理响应错误 - return Promise.reject(error); + if (error.response.data) { + return error.response.data; + } + return { + code: error.response.status, + msg: error.response.statusText, + } } ); // 封装通用的request函数 -export default function request(config: any) { +export default function request(config: AxiosRequestConfig) { return instance(config); } \ No newline at end of file diff --git a/frontend/src/request/user.ts b/frontend/src/request/user.ts index 7a64a91877faadc207c8d8fa93b3b2558a82ac72..1f83280ec4799fb0d2504e90a72d5f205b6347d4 100644 --- a/frontend/src/request/user.ts +++ b/frontend/src/request/user.ts @@ -1,4 +1,5 @@ import request from './request'; + // 用户登录 export function loginByEmail(data: any) { return request({ @@ -7,6 +8,7 @@ export function loginByEmail(data: any) { data, }); } + // 获取全部用户信息 export function getUsers(data: any) { return request({ @@ -15,6 +17,7 @@ export function getUsers(data: any) { params: data, }); } + // 按邮箱查找用户 export function searchUser(data: any, paged: any) { return request({ diff --git a/frontend/src/views/Home/Home.vue b/frontend/src/views/Home/Home.vue index 3ef6a34dd082e18d9c63a89ba56a66e78d160dcc..47afce49c86d4b36e6aa73a5604d14944ede8305 100644 --- a/frontend/src/views/Home/Home.vue +++ b/frontend/src/views/Home/Home.vue @@ -74,7 +74,7 @@ onMounted(() => { ElMessage.error("failed to login:" + resp.msg) } }).catch((err) => { - ElMessage.error("get platform version failed:", err) + ElMessage.error("get platform version failed:" + err) }) }) diff --git a/frontend/src/views/Overview/Overview.vue b/frontend/src/views/Overview/Overview.vue index 290289da28c8b56bcdbc09904c0da159b29575c6..b2038900cdffc832649f4bca162b337e6d34d9c5 100644 --- a/frontend/src/views/Overview/Overview.vue +++ b/frontend/src/views/Overview/Overview.vue @@ -5,7 +5,7 @@
欢迎您:{{ user.name }} 所属部门:{{ user.department }} - 您的身份:{{ user.roleID === "1"? "超级管理员" : "普通用户" }} + 您的身份:{{ user.roleID === "1" ? "超级管理员" : "普通用户" }}
在线机器 -

{{ normal }}

+

{{ overview.normal }}

离线机器 -

{{ offline }}

+

{{ overview.offline }}

未分配机器 -

{{ free }}

+

{{ overview.free }}

@@ -60,16 +60,15 @@