From 53569bb514ad7dabba6d09a06455c6f6709ca3e4 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Wed, 27 Dec 2023 16:01:13 +0800
Subject: [PATCH] add user info request and display

---
 frontend/src/request/user.ts                  |  8 +++++++
 frontend/src/views/Home/Home.vue              | 23 +++++++++++++++----
 .../src/views/Home/components/TagView.vue     |  2 +-
 frontend/src/views/Overview/Overview.vue      |  6 ++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/frontend/src/request/user.ts b/frontend/src/request/user.ts
index 41d3e4f..8362fae 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 10a304b..e4975e3 100644
--- a/frontend/src/views/Home/Home.vue
+++ b/frontend/src/views/Home/Home.vue
@@ -22,7 +22,7 @@
                             </el-icon>
                             <el-popover placement="bottom" trigger="click">
                                 <template #reference>
-                                    <span> hello {{ user.name }}!</span>
+                                    <span>hello {{ user.name }}!</span>
                                 </template>
                                 <el-button>修改密码</el-button>
                             </el-popover>
@@ -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<VersionInfo>({})
 
 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 f3f99b9..abd6802 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 b203890..c42ebde 100644
--- a/frontend/src/views/Overview/Overview.vue
+++ b/frontend/src/views/Overview/Overview.vue
@@ -59,7 +59,7 @@
 </template>
   
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, onMounted, watchEffect } from "vue";
 import { ElMessage } from 'element-plus';
 import DepartChart from "./components/DepartChart.vue";
 
@@ -69,6 +69,10 @@ import { RespCodeOK } from "@/request/request";
 
 const user = ref<User>({})
 
+watchEffect(() => {
+    user.value = userStore().user
+})
+
 let tooltips = ref([
     {
         id: 1,
-- 
Gitee