diff --git a/el-admin/src/router/index.js b/el-admin/src/router/index.js index f2b41fa..50abe98 100644 --- a/el-admin/src/router/index.js +++ b/el-admin/src/router/index.js @@ -1,9 +1,6 @@ import { createRouter, createWebHashHistory } from 'vue-router' -import { - usePinia -} from '@/stores/index.js' -import { ref, watch } from 'vue'; + import Login from '../views/Login.vue' import Index from '../views/Index.vue' @@ -72,31 +69,16 @@ const router = createRouter({ ] }) -// 动态添加额外的路由 -function addDynamicRoutes(list) { - // 通过某种条件判断是否需要添加额外的路由 - // list.forEach(function(v,i){ - //console.log(v.url) - router.addRoute({ - path: '/a', - name: 'a', - component: HealthCalendar - }) - // }) - - -} +import { + GetAdminBaseMenuList +} from "@/api/api.js"; + + -let pinia +router.beforeEach(async (to, from ) => { + -router.beforeEach(async (to, from) => { - pinia = usePinia() - console.log(pinia.userMenu) - watch(() => pinia.userMenu, (newValue, oldValue) => { - console.log('值发生变化', newValue); - addDynamicRoutes(newValue) - }); }) diff --git a/el-admin/src/stores/index.js b/el-admin/src/stores/index.js index fcbf7e5..eac9e1a 100644 --- a/el-admin/src/stores/index.js +++ b/el-admin/src/stores/index.js @@ -1,4 +1,4 @@ -import { ref, computed } from 'vue' +import { ref } from 'vue' import { defineStore } from 'pinia' export const usePinia = defineStore('usePinia', () => { @@ -8,11 +8,7 @@ export const usePinia = defineStore('usePinia', () => { theme.value=v } -//用户菜单 - const userMenu=ref([]) - const setUserMenu=(v)=>{ - userMenu.value=v - } - return { theme,themeChange,userMenu,setUserMenu} + + return { theme,themeChange} }) diff --git a/el-admin/src/views/AppointmentMngr/HealthCalendar.vue b/el-admin/src/views/AppointmentMngr/HealthCalendar.vue index 43921bf..2cbe716 100644 --- a/el-admin/src/views/AppointmentMngr/HealthCalendar.vue +++ b/el-admin/src/views/AppointmentMngr/HealthCalendar.vue @@ -28,7 +28,7 @@ 星期 - {{ item.label }} + {{ item.label }} 搜索 @@ -88,7 +88,7 @@ - {{ item.label }} + {{ item.label }} @@ -144,7 +144,6 @@