diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts index a2a0f04..ab43aa7 100644 --- a/src/api/jyh/index.ts +++ b/src/api/jyh/index.ts @@ -362,12 +362,10 @@ export function uploadImage(file: File) { // 获取字典 export function basicDict(data) { - return axios.request({ - url: '/gateway/basic/dict/children/list', - method: 'POST', + + return request({ + url: `dict/children/list`, + method: 'post', data: data, - headers: { - Authorization: 'Bearer ' + localStorage.getItem('access_token') - } }); } diff --git a/src/components/AdvanceSearch/index.vue b/src/components/AdvanceSearch/index.vue index 6508732..65a498d 100644 --- a/src/components/AdvanceSearch/index.vue +++ b/src/components/AdvanceSearch/index.vue @@ -102,7 +102,8 @@ const props = defineProps({ } }); const emit = defineEmits(['submit', 'cancel', 'update:modelValue']); -const languageList = ref([]); +// const languageList = ref([]); +const languageList = globalInfo.languageList; const formData = ref({ ...props.modelValue }); @@ -152,7 +153,7 @@ const getLanguageList = async () => { languageList.value = res.data.data; } }; -getLanguageList(); +// getLanguageList(); onMounted(() => { const _searchForm = localStorage.getItem('searchForm'); diff --git a/src/router/interceptor.ts b/src/router/interceptor.ts index 4eb708b..1ef6644 100644 --- a/src/router/interceptor.ts +++ b/src/router/interceptor.ts @@ -52,7 +52,6 @@ export const injectRouter = (router) => { // 判断命名空间类型 const globalStore = useGlobalInfoStore(); globalStore.setNamespaceType(-1); // 重置namespaceType,防止非组织路由请求组织信息 - debugger globalStore.setLanguageList(); if (to.meta.pageType === 'userOrOrg') { const { namespace } = to.params; diff --git a/src/stores/Global/index.ts b/src/stores/Global/index.ts index 7769c54..0ed9e34 100644 --- a/src/stores/Global/index.ts +++ b/src/stores/Global/index.ts @@ -86,6 +86,15 @@ export const useGlobalInfoStore = defineStore('globalInfo', () => { const res = await basicDict({ parentId: 184 }); + if(res.data.code===200) { + languageList.value = res.data.data.map(i=>{ + return { + id: i.id, + label: i.dictKey, + value: i.dictValue + } + }) + } }; const updateHeaderSearch = (data: any) => { @@ -148,6 +157,7 @@ export const useGlobalInfoStore = defineStore('globalInfo', () => { setGlobalTheme, updateHeaderSearch, industryList, - setLanguageList + setLanguageList, + languageList }; }); diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue index fe1c9d5..8f50d35 100644 --- a/src/views/Jyh/Search/Components/OssQuery.vue +++ b/src/views/Jyh/Search/Components/OssQuery.vue @@ -250,8 +250,9 @@ const countryVisible = ref(false); const orgVisible = ref(false); const allTableData = ref([]); const tableData = ref([]); -const languageList = ref([]); +// const languageList = ref([]); const globalInfo = useGlobalInfoStore(); +const languageList = globalInfo.languageList; const headerSearch = ref(globalInfo.headerSearch); const industryList = ref(globalInfo.industryList); const newFormData = ref({ @@ -518,7 +519,7 @@ const getLanguageList = async () => { }; onMounted(async () => { - await getLanguageList(); + // await getLanguageList(); newFormData.value.softwareName = route.query.softwareName || ''; newFormData.value.searchType = route.query.searchType || ''; newFormData.value.softwareVersion = route.query.softwareVersion || '';