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 @@
+
- {{ userInfo.name }}
+ {{ userInfo.username }}
@@ -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 = {
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),
'-------------------------+'
)
})