更新

5 months ago · 058221633a
parent 0d469d9cc1
commit 058221633a
3 changed files with 3818 additions and 4958 deletions
--- a/package.json
+++ b/package.json
@ -25,11 +25,6 @@
    "axios": "^1.6.8",
    "d3": "^5.16.0",
    "echarts": "^5.5.0",
-<<<<<<< HEAD
-    "element-plus": "^2.6.0",
-    "jwt-decode": "^4.0.0",
-=======
->>>>>>> f6dea2720fd0ad6ab62f53607d894cd0c406cb6d
    "echarts-liquidfill": "^3.1.0",
    "element-plus": "^2.6.0",
    "form-data": "^4.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@ -12,6 +12,7 @@ import { ref, onMounted } from 'vue'
 import { toRaw } from 'vue'
 const userStore = useUserStore()
 // const info = userStore.getUserInfo()
+// userStore.userInfo
 // console.log(info)
 const username = ref()
 const data = ref(null)