提交

pages/service/career-planning.vue

@@ -35,10 +35,14 @@
 
             <!-- 内容区域 -->
             <scroll-view scroll-y class="content-scroll">
-                <component 
-                    :is="currentComponent" 
+                <CareerRecommend 
+                    v-if="activeTab === 0"
+                    :current-job-id="currentJobId"
+                    :current-job-name="currentJobName"
                     @job-card-click="handleJobCardClick"
-                ></component>
+                />
+                <CareerPath v-else-if="activeTab === 1" />
+                <SkillDevelopment v-else />
             </scroll-view>
         </view>
 
@@ -50,9 +54,10 @@
 </template>
 
 <script setup>
-import { ref, inject, nextTick, onMounted, computed } from 'vue';
+import { ref, inject, nextTick, onMounted } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import { appUserInfo } from '@/apiRc/user/user.js';
+import { getJobSkillDetail } from '@/apiRc/jobSkill.js';
 import RemindPopup from './components/RemindPopup.vue';
 import PageHeader from './components/PageHeader.vue';
 import SkillDetailPopup from './components/SkillDetailPopup.vue';
@@ -76,12 +81,9 @@ const activeTab = ref(0);
 const selectedJobTitle = ref('');
 const selectedJobPossessedSkills = ref([]);
 const selectedJobImprovementSkills = ref([]);
-
-// 当前组件
-const currentComponent = computed(() => {
-    const components = [CareerRecommend, CareerPath, SkillDevelopment];
-    return components[activeTab.value];
-});
+const isLoadingJobSkill = ref(false);
+const currentJobId = ref(null);
+const currentJobName = ref('');
 
 // 打开弹窗
 function openRemindPopup() {
@@ -105,30 +107,57 @@ function openRemindPopup() {
 // 获取提醒信息的接口
 async function getRemindInfo() {
     try {
-        // 接口已准备好，但暂时不使用（按用户要求）
-        // const response = await appUserInfo();
-        // if (response && response.code === 200) {
-        //     const data = response.data || {};
-        //     const jobTitles = data.jobTitles || [];
-        //     const appSkillsList = data.appSkillsList || [];
-        //     
-        //     remindList.value = [];
-        //     if (!jobTitles || jobTitles.length === 0) {
-        //         remindList.value.push('求职期望;');
-        //     }
-        //     
-        //     if (remindList.value.length > 0) {
-        //         openRemindPopup();
-        //         return;
-        //     }
-        // }
-        
-        // 暂时使用测试数据显示弹窗
-        remindList.value = ['求职期望;'];
-        openRemindPopup();
+        const response = await appUserInfo();
+        if (response && response.code === 200) {
+            const data = response.data || {};
+            const reminders = [];
+
+            currentJobId.value = data?.jobId ?? data?.currentJobId ?? null;
+            currentJobName.value = data?.jobName ?? data?.currentJobName ?? '';
+
+            if (Array.isArray(data.remindList) && data.remindList.length > 0) {
+                reminders.push(
+                    ...data.remindList
+                        .filter(item => typeof item === 'string' && item.trim().length > 0)
+                        .map(item => item.trim())
+                );
+            } else {
+                const jobTitles = Array.isArray(data.jobTitles) ? data.jobTitles : [];
+                const appSkillsList = Array.isArray(data.appSkillsList) ? data.appSkillsList : [];
+
+                if (!currentJobName.value && jobTitles.length > 0) {
+                    currentJobName.value = jobTitles[0];
+                }
+
+                if (jobTitles.length === 0) {
+                    reminders.push('请完善求职期望');
+                }
+
+                if (appSkillsList.length === 0) {
+                    reminders.push('请完善技能信息');
+                }
+            }
+
+            if (reminders.length === 0) {
+                reminders.push('暂无待完善信息');
+            }
+
+            remindList.value = reminders;
+            if (!currentJobName.value) {
+                currentJobName.value = '前端开发工程师';
+            }
+            openRemindPopup();
+            return;
+        }
+
+        throw new Error('接口返回异常');
     } catch (error) {
         console.error('获取提醒信息失败:', error);
-        remindList.value = ['求职期望;'];
+        currentJobId.value = null;
+        if (!currentJobName.value) {
+            currentJobName.value = '前端开发工程师';
+        }
+        remindList.value = ['获取提醒信息失败，请稍后重试'];
         openRemindPopup();
     }
 }
@@ -166,12 +195,105 @@ function handleMoreClick() {
     console.log('更多点击');
 }
 
+function normalizeSkillLevel(score) {
+    const numericScore = Number(score);
+    if (Number.isNaN(numericScore)) {
+        return 0;
+    }
+    const rounded = Math.round(numericScore);
+    return Math.max(1, Math.min(6, rounded));
+}
+
+function splitSkillListByScore(skills = []) {
+    if (!Array.isArray(skills) || skills.length === 0) {
+        return {
+            possessed: [],
+            improvement: []
+        };
+    }
+
+    const sorted = [...skills].sort((a, b) => (Number(b.skillScore) || 0) - (Number(a.skillScore) || 0));
+    const midpoint = Math.ceil(sorted.length / 2);
+    const mapSkill = (item) => ({
+        name: item?.skillName || '',
+        level: normalizeSkillLevel(item?.skillScore)
+    });
+
+    return {
+        possessed: sorted.slice(0, midpoint).map(mapSkill),
+        improvement: sorted.slice(midpoint).map(mapSkill)
+    };
+}
+
 // 处理职位卡片点击
-function handleJobCardClick(job) {
-    selectedJobTitle.value = job.title || '';
-    selectedJobPossessedSkills.value = job.possessedSkills || [];
-    selectedJobImprovementSkills.value = job.improvementSkills || [];
-    skillDetailPopup.value?.open();
+async function handleJobCardClick(job) {
+    if (!job) {
+        return;
+    }
+
+    selectedJobTitle.value = job.title || job.jobName || '';
+    selectedJobPossessedSkills.value = [];
+    selectedJobImprovementSkills.value = [];
+
+    if (isLoadingJobSkill.value) {
+        return;
+    }
+
+    isLoadingJobSkill.value = true;
+    uni.showLoading({
+        title: '加载中...',
+        mask: true
+    });
+
+    const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
+    const params = {};
+    if (job?.jobId) {
+        params.jobId = job.jobId;
+    }
+    if (job?.title) {
+        params.jobName = job.title;
+    } else if (job?.jobName) {
+        params.jobName = job.jobName;
+    }
+
+    try {
+        const response = await getJobSkillDetail(params);
+        const skillList = Array.isArray(response?.data) ? response.data : [];
+        const { possessed, improvement } = splitSkillListByScore(skillList);
+
+        if (possessed.length === 0 && improvement.length === 0) {
+            if (fallbackSkills.length === 0) {
+                uni.showToast({
+                    title: '暂无技能数据',
+                    icon: 'none'
+                });
+                return;
+            }
+            const fallbackSplit = splitSkillListByScore(fallbackSkills);
+            selectedJobPossessedSkills.value = fallbackSplit.possessed;
+            selectedJobImprovementSkills.value = fallbackSplit.improvement;
+        } else {
+            selectedJobPossessedSkills.value = possessed;
+            selectedJobImprovementSkills.value = improvement;
+        }
+        skillDetailPopup.value?.open();
+    } catch (error) {
+        console.error('获取职位技能详情失败:', error);
+        if (fallbackSkills.length > 0) {
+            const fallbackSplit = splitSkillListByScore(fallbackSkills);
+            selectedJobPossessedSkills.value = fallbackSplit.possessed;
+            selectedJobImprovementSkills.value = fallbackSplit.improvement;
+            skillDetailPopup.value?.open();
+        } else {
+            uni.showToast({
+                title: '获取技能信息失败',
+                icon: 'none'
+            });
+        }
+    } finally {
+        isLoadingJobSkill.value = false;
+        uni.hideLoading();
+    }
 }
 
 // 处理技能弹出层关闭