diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue index f6143d0..a785958 100644 --- a/src/components/HeaderSearch/index.vue +++ b/src/components/HeaderSearch/index.vue @@ -36,7 +36,7 @@ const show = ref(false); const fuse = ref(); const headerSearchSelectRef = ref(); const router = useRouter(); -const routes = computed(() => usePermissionStore().routes); +const routes = computed(() => usePermissionStore().getRoutes()); const click = () => { show.value = !show.value; @@ -149,7 +149,7 @@ watch(show, (value) => { } }); -watch(searchPool, (list) => { +watch(searchPool, (list: Router) => { initFuse(list); }); diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 6b7a39b..ae5cd45 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -81,14 +81,14 @@ const imageUploadRef = ref(); watch( () => props.modelValue, - async (val) => { + async (val: string) => { if (val) { // 首先将值转为数组 let list: OssVO[] = []; if (Array.isArray(val)) { list = val as OssVO[]; } else { - const res = await listByIds(val as string); + const res = await listByIds(val); list = res.data; } // 然后将数组转为对象数组 diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 6b416d4..c41177e 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -43,7 +43,7 @@ const router = useRouter(); // 主题颜色 const theme = computed(() => settingsStore.theme); // 所有的路由信息 -const routers = computed(() => permissionStore.topbarRouters); +const routers = computed(() => permissionStore.getTopbarRoutes()); // 顶部显示菜单 const topMenus = computed(() => { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index b7c6ef0..2b38a4e 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -12,8 +12,9 @@