diff --git a/src/layouts/cid.vue b/src/layouts/cid.vue index c884ce77..64bc5750 100644 --- a/src/layouts/cid.vue +++ b/src/layouts/cid.vue @@ -31,8 +31,8 @@ watch( onMounted(async () => { await getAllDictDataFun(); + await getRoleDisciplineFun(); getUserPermissionsFun(); - getRoleDisciplineFun(); loading.value = false; }); diff --git a/src/layouts/default.vue b/src/layouts/default.vue index ad2a68dd..d9ee352b 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -31,8 +31,8 @@ const loading = ref(true); onMounted(async () => { await getAllDictDataFun(); + await getRoleDisciplineFun(); getUserPermissionsFun(); - getRoleDisciplineFun(); loading.value = false; }); diff --git a/src/tenants/yian/layout.vue b/src/tenants/yian/layout.vue index b42b0f19..018627a3 100644 --- a/src/tenants/yian/layout.vue +++ b/src/tenants/yian/layout.vue @@ -13,8 +13,8 @@ const loading = ref(true); onMounted(async () => { await getAllDictDataFun(); + await getRoleDisciplineFun(); getUserPermissionsFun(); - getRoleDisciplineFun(); loading.value = false; }); diff --git a/src/utils/common.ts b/src/utils/common.ts index 25437ab0..8971c455 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -41,15 +41,14 @@ export const getUserPermissionsFun = () => { }); }; -export const getRoleDisciplineFun = () => { +export const getRoleDisciplineFun = async () => { const params = { paramName: 'ROLE_DISCIPLINE', }; - querySystemParamConfigureApi(params).then((res: any) => { - if (res.code === 200) { - localStorage.setItem('ROLE_DISCIPLINE', JSON.stringify(res.data.values)); - } - }); + const res: any = await querySystemParamConfigureApi(params); + if (res.code === 200) { + localStorage.setItem('ROLE_DISCIPLINE', JSON.stringify(res.data.values)); + } }; /** diff --git a/src/utils/roleDiscipline.ts b/src/utils/roleDiscipline.ts index a4bbe3cd..d2bc72f6 100644 --- a/src/utils/roleDiscipline.ts +++ b/src/utils/roleDiscipline.ts @@ -24,7 +24,6 @@ export const getDisciplineByRole = (roleCodes: string | string[]) => { const uniqueDisciplines = Array.from(new Set(allDisciplines)); const uniqueSimulationType = Array.from(new Set(allSimulationType)); return { simulationType: uniqueSimulationType, discipline: uniqueDisciplines }; - // return { simulationType: [], discipline: [] }; } catch (error) { console.error('获取失败:', error); return { simulationType: [], discipline: [] };