From 5e609f41af9d6bb0c0df472c5f499e37d60adf6b Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Tue, 19 Apr 2022 16:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/layout/components/layout-header.vue |  5 ++++-
 admin/src/store/modules/user.ts               |  4 +++-
 admin/src/views/setting/system/cache.vue      | 11 +++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/admin/src/layout/components/layout-header.vue b/admin/src/layout/components/layout-header.vue
index af21fdc0..894d9f52 100644
--- a/admin/src/layout/components/layout-header.vue
+++ b/admin/src/layout/components/layout-header.vue
@@ -3,10 +3,11 @@
         <!-- <input class="search-input" placeholder="请输入搜索内容…" type="text" /> -->
         <div class="admin-info flex flex-center m-l-40">
             <el-avatar :size="40" :src="userInfo.avatar"></el-avatar>
+
             <div class="m-l-10">
                 <el-dropdown trigger="hover" @command="handleCommand">
                     <div class="flex flex-center">
-                        {{ userInfo.name }}
+                        {{ userInfo.username }}
                         <el-icon class="el-icon--right"><arrow-down /></el-icon>
                     </div>
                     <template #dropdown>
@@ -33,6 +34,8 @@ export default defineComponent({
     setup() {
         const { store, router } = useAdmin()
         const userInfo = computed(() => store.getters.userInfo)
+        console.log(userInfo, 'userInfo')
+
         const handleCommand = (command: string) => {
             switch (command) {
                 case 'logout':
diff --git a/admin/src/store/modules/user.ts b/admin/src/store/modules/user.ts
index fadd1884..d0111378 100644
--- a/admin/src/store/modules/user.ts
+++ b/admin/src/store/modules/user.ts
@@ -18,7 +18,9 @@ const user: Module<UserModule, any> = {
             cache.set(TOKEN, data)
         },
         setUser(state, data) {
-            state.user = data
+            console.log(data, 'data____')
+
+            state.user = data.user
         }
     },
     actions: {
diff --git a/admin/src/views/setting/system/cache.vue b/admin/src/views/setting/system/cache.vue
index 661472df..f061e265 100644
--- a/admin/src/views/setting/system/cache.vue
+++ b/admin/src/views/setting/system/cache.vue
@@ -199,9 +199,16 @@ const getSystemCache = async () => {
             formData.value.dbSize = res.dbSize || ''
 
             statisticalData.commandChartOption.series[0].data = res.commandStats
-            statisticalData.memoryChartOption.series[0].data = res.info.used_memory_human
+
+            statisticalData.memoryChartOption.series[0].data[0].value = (
+                res.info.used_memory /
+                1024 /
+                1024
+            ).toFixed(2)
+            statisticalData.memoryChartOption.series[0].detail.formatter = '{value}' + 'M'
+            console.log(res.info.used_memory_human, '-------------------------+')
             console.log(
-                statisticalData.memoryChartOption.series[0].data,
+                (res.info.used_memory / 1024 / 1024).toFixed(2),
                 '-------------------------+'
             )
         })