diff --git a/frontend/src/request/user.ts b/frontend/src/request/user.ts index 41d3e4f3c52b41abef2f6d35ee0c3c4694f73cc4..8362fae30f7ff856a1de904bc16888610255dcfd 100644 --- a/frontend/src/request/user.ts +++ b/frontend/src/request/user.ts @@ -70,3 +70,11 @@ export function deleteUser(data: any) { data }) } + +// 获取当前登录用户信息 +export function getCurrentUser() { + return request({ + url: '/user/info', + method: 'get' + }) +} \ No newline at end of file diff --git a/frontend/src/views/Home/Home.vue b/frontend/src/views/Home/Home.vue index 10a304b8b8162709be6a6537746cbc5cd3ac7e67..e4975e3a7169e7d0beb8645d82016cd1cfdfcea2 100644 --- a/frontend/src/views/Home/Home.vue +++ b/frontend/src/views/Home/Home.vue @@ -22,7 +22,7 @@ 修改密码 @@ -55,7 +55,7 @@ import Sidebar from "./components/Sidebar.vue"; import { directTo, updateSidebarItems } from "@/router/index"; import { platformVersion } from "@/request/basic" -import { logout } from "@/request/user"; +import { logout, getCurrentUser } from "@/request/user"; import { RespCodeOK } from "@/request/request"; import { type User, userStore } from "@/stores/user"; @@ -70,8 +70,7 @@ const version = ref({}) onMounted(() => { updateSidebarItems(); - - user.value = userStore().user + updateUserInfo(); platformVersion().then((resp: any) => { if (resp.code == RespCodeOK) { @@ -92,6 +91,20 @@ watchEffect(() => { user.value = userStore().user }) +function updateUserInfo() { + getCurrentUser().then((resp: any) => { + if (resp.code == RespCodeOK) { + userStore().user = { + name: resp.data.name, + } + } else { + ElMessage.error("failed to login:" + resp.msg) + } + }).catch((err) => { + ElMessage.error("get platform version failed:" + err) + }) +} + function handleLogout() { ElMessageBox.confirm('此操作将注销登录, 是否继续?', '提示', { confirmButtonText: '确定', @@ -157,6 +170,7 @@ function doLogout() { align-items: center; .route { + flex:1; display: flex; flex-direction: column; height: 100%; @@ -196,6 +210,7 @@ function doLogout() { span { height: 100%; + width: 100%; font-size: 20px; display: flex; align-items: center; diff --git a/frontend/src/views/Home/components/TagView.vue b/frontend/src/views/Home/components/TagView.vue index f3f99b963ab85977f49248df84a871caaa57c7da..abd6802c008eec44a2e56f73a7ed16c961e3a654 100644 --- a/frontend/src/views/Home/components/TagView.vue +++ b/frontend/src/views/Home/components/TagView.vue @@ -21,7 +21,7 @@ import { directTo } from "@/router"; const route = useRoute() -watch(() => { console.log("new route", route); return route.path }, () => { +watch(() => route.path, () => { // 避免添加重复tagview for (let i = 0; i < tagviewStore().taginfos.length; i++) { if (tagviewStore().taginfos[i].path === route.path) { diff --git a/frontend/src/views/Overview/Overview.vue b/frontend/src/views/Overview/Overview.vue index b2038900cdffc832649f4bca162b337e6d34d9c5..c42ebde9e40b3e267ef4d24a2a0e65295fd23930 100644 --- a/frontend/src/views/Overview/Overview.vue +++ b/frontend/src/views/Overview/Overview.vue @@ -59,7 +59,7 @@