diff --git a/src/components/ProjectSelector/index.vue b/src/components/ProjectSelector/index.vue index c25cd88..f9e7c3f 100644 --- a/src/components/ProjectSelector/index.vue +++ b/src/components/ProjectSelector/index.vue @@ -21,7 +21,7 @@ import { useUserStore } from '@/store/modules/user'; const userStore = useUserStore(); const projects = computed(() => [ - { id: '', name: '全部工程项目' }, // 添加空选项 + // { id: '', name: '全部工程项目' }, // 添加空选项 ...userStore.projects ]); @@ -37,17 +37,11 @@ watch( ); const handleSelect = (projectId: string) => { - const oldId = userStore.getSelectedProjectFromStorage() - console.log(projectId,oldId.id); - - if (projectId!=oldId.id) { - location.reload() - } const selectedProject = projects.value.find((p) => p.id === projectId); if (selectedProject) { userStore.setSelectedProject(selectedProject); + location.reload() } - }; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index cf8f9d5..57a6c68 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -136,7 +136,6 @@ export const useUserStore = defineStore('user', () => { setAvatar, setProjects, setSelectedProject, - getSelectedProjectFromStorage, projects, selectedProject }; diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue index 3bc79fb..2658040 100644 --- a/src/views/project/contractor/index.vue +++ b/src/views/project/contractor/index.vue @@ -172,6 +172,7 @@ const { queryParams, form, rules } = toRefs(data); /** 查询分包单位列表 */ const getList = async () => { loading.value = true; + const res = await listContractor(queryParams.value); contractorList.value = res.rows; total.value = res.total;