From 94439fddaa3f1dc971a66320cdf26e1bf2e330fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= <francis_fh@163.com>
Date: Thu, 12 Mar 2026 23:23:18 +0800
Subject: [PATCH] 11

---
 .../new-filter-page/new-filter-page.vue       | 25 ++++--
 stores/useDictStore.js                        | 79 +++++++++++--------
 2 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/components/new-filter-page/new-filter-page.vue b/components/new-filter-page/new-filter-page.vue
index f685d7b..12c9550 100644
--- a/components/new-filter-page/new-filter-page.vue
+++ b/components/new-filter-page/new-filter-page.vue
@@ -108,7 +108,8 @@
 <script setup>
 import { ref, reactive, onBeforeMount } from 'vue';
 import useDictStore from '@/stores/useDictStore';
-const { getTransformChildren } = useDictStore();
+const dictStore = useDictStore();
+const { getTransformChildren } = dictStore;
 
 const props = defineProps({
     show: Boolean,
@@ -151,12 +152,24 @@ const experienceOptions = ref([]);
 const scaleOptions = ref([]);
 const jobTypeOptions = ref([]);
 
+// 加载状态
+const loading = ref(true);
+
 // 初始化获取数据
-onBeforeMount(() => {
-    educationOptions.value = getTransformChildren('education', '学历要求').options || [];
-    experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
-    scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
-    jobTypeOptions.value = getJobTypeData();
+onBeforeMount(async () => {
+    try {
+        // 先获取字典数据
+        await dictStore.getDictData();
+        // 再初始化选项数据
+        educationOptions.value = getTransformChildren('education', '学历要求').options || [];
+        experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
+        scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
+        jobTypeOptions.value = getJobTypeData();
+    } catch (error) {
+        console.error('获取字典数据失败:', error);
+    } finally {
+        loading.value = false;
+    }
 });
 
 // 处理选项选择
diff --git a/stores/useDictStore.js b/stores/useDictStore.js
index eeead1d..622d3fc 100644
--- a/stores/useDictStore.js
+++ b/stores/useDictStore.js
@@ -42,39 +42,50 @@ const useDictStore = defineStore("dict", () => {
         noticeType: []
     })
     // political_affiliation
-    const getDictData = async (dictType, dictName) => {
-        try {
-            if (dictType && dictName) {
-                return getDictSelectOption(dictType).then((data) => {
-                    state[dictName] = data
-                    return data
-                })
-            }
-            const [education, experience, area, scale, sex, affiliation, nature, noticeType] =
-            await Promise.all([
-                getDictSelectOption('education'),
-                getDictSelectOption('experience'),
-                getDictSelectOption('area', true),
-                getDictSelectOption('scale'),
-                getDictSelectOption('app_sex'),
-                getDictSelectOption('political_affiliation'),
-                getDictSelectOption('company_nature'),
-                getDictSelectOption('sys_notice_type'),
-            ]);
-
-            state.education = education;
-            state.experience = experience;
-            state.area = area;
-            state.scale = scale;
-            state.sex = sex;
-            state.affiliation = affiliation;
-            state.nature = nature
-            state.noticeType = noticeType
-            complete.value = true
-            getIndustryDict() // 获取行业
-        } catch (error) {
-            console.error('Error fetching dictionary data:', error);
-        }
+    const getDictData = async (dictType, dictName) => {
+        try {
+            if (dictType && dictName) {
+                return getDictSelectOption(dictType).then((data) => {
+                    state[dictName] = data
+                    return data
+                })
+            }
+            const [education, experience, area, scale, sex, affiliation, nature, noticeType] = 
+            await Promise.all([
+                getDictSelectOption('education'),
+                getDictSelectOption('experience'),
+                getDictSelectOption('area', true),
+                getDictSelectOption('scale'),
+                getDictSelectOption('app_sex'),
+                getDictSelectOption('political_affiliation'),
+                getDictSelectOption('company_nature'),
+                getDictSelectOption('sys_notice_type'),
+            ]);
+
+            state.education = education;
+            state.experience = experience;
+            state.area = area;
+            state.scale = scale;
+            state.sex = sex;
+            state.affiliation = affiliation;
+            state.nature = nature
+            state.noticeType = noticeType
+            complete.value = true
+            getIndustryDict() // 获取行业
+        } catch (error) {
+            console.error('Error fetching dictionary data:', error);
+            // 确保即使出错也能返回空数组
+            if (!dictType && !dictName) {
+                state.education = [];
+                state.experience = [];
+                state.area = [];
+                state.scale = [];
+                state.sex = [];
+                state.affiliation = [];
+                state.nature = [];
+                state.noticeType = [];
+            }
+        }
     };
 
     async function getIndustryDict() {
@@ -129,7 +140,7 @@ const useDictStore = defineStore("dict", () => {
             return {
                 label: title,
                 key: key || dictType,
-                options: state[dictType],
+                options: state[dictType] || [],
             }
         }
         return null