diff --git a/README.md b/README.md
index 9469e13..aa564e4 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ vue-element-perfect 是一个后台前端解决方案,它使用了最新的前
## 分支管理
- master 技术采用 vite + vue3.0 + Typescript + pinia
+- vue-admin-simple 简易版本
- vite-vuex vite + vue3.0 + Typescript + vuex
- vue-i18n 语言切换版本
- webpack 技术采用 webpack + vue3.0 + Typescript + vuex
diff --git a/public/vite.svg b/public/vite.svg
deleted file mode 100644
index e7b8dfb..0000000
--- a/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/404_images/404_bg.png b/src/assets/404_images/404_bg.png
new file mode 100644
index 0000000..1d34d79
Binary files /dev/null and b/src/assets/404_images/404_bg.png differ
diff --git a/src/layout/Header/components/Avatar.vue b/src/layout/Header/components/Avatar.vue
index da26bdc..ba9613a 100644
--- a/src/layout/Header/components/Avatar.vue
+++ b/src/layout/Header/components/Avatar.vue
@@ -1,5 +1,5 @@
-
+
{{userInfo.username}}
@@ -9,10 +9,18 @@
-
- 修改密码
-
- 退出登录
+
+ {{currentRoles==='admin'?'当前角色':'切换角色'}}:管理员
+
+
+ {{currentRoles==='other'?'当前角色':'切换角色'}}:普通用户
+
+
+ 修改密码
+
+
+ 退出登录
+
@@ -28,11 +36,33 @@ import {computed, ref} from "vue";
import AvatarLogo from '@/assets/image/avatar.png'
import {useUserStore} from "@/store/modules/user"
import {useTagsViewStore} from "@/store/modules/tagsView"
+import {usePermissionStore} from "@/store/modules/permission"
import PersonalDialog from './PersonalDialog.vue'
const router = useRouter()
const UserStore = useUserStore()
const TagsViewStore = useTagsViewStore()
+const PermissionStore = usePermissionStore()
+
+const currentRoles = computed({
+ get() {
+ return UserStore.roles[0]
+ },
+ set(val) {
+ ;(async () => {
+ await UserStore.getInfo([val])
+ router.push({
+ path:'/'
+ })
+ location.reload()
+ })()
+ },
+})
+
+const switchRolesAction = (type:string)=>{
+ if(type===currentRoles.value) return
+ currentRoles.value = currentRoles.value==='admin'?'other':'admin'
+}
// 用户信息
const userInfo = computed(() => UserStore.userInfo)
@@ -48,6 +78,7 @@ const logOut = async () => {
await UserStore.logout()
await router.push({path: '/login'})
TagsViewStore.clearVisitedView()
+ PermissionStore.clearRoutes()
ElMessage({
type: "success",
message: "退出登录成功!"
@@ -55,15 +86,8 @@ const logOut = async () => {
})
.catch(() => {})
}
-const commandAction = (key: number) => {
- switch (key) {
- case 1:
- logOut()
- break
- case 2:
- person.value.show()
- break
- }
+const modifyPassword = ()=>{
+ person.value.show()
}
diff --git a/src/layout/Header/index.vue b/src/layout/Header/index.vue
index 30ab6d8..fb000b8 100644
--- a/src/layout/Header/index.vue
+++ b/src/layout/Header/index.vue
@@ -2,7 +2,7 @@
-
+
-
-
diff --git a/src/views/error/403.vue b/src/views/errorPages/403.vue
similarity index 99%
rename from src/views/error/403.vue
rename to src/views/errorPages/403.vue
index 889025e..47f0683 100644
--- a/src/views/error/403.vue
+++ b/src/views/errorPages/403.vue
@@ -43,9 +43,8 @@