diff --git a/src/components/FilterBar.vue b/src/components/FilterBar.vue index 8dd2c95..d89e175 100644 --- a/src/components/FilterBar.vue +++ b/src/components/FilterBar.vue @@ -183,7 +183,7 @@ onUnmounted(() => { diff --git a/src/components/ScoreForm.vue b/src/components/ScoreForm.vue index 03ccb1e..e633d20 100644 --- a/src/components/ScoreForm.vue +++ b/src/components/ScoreForm.vue @@ -42,6 +42,9 @@ const scores = ref({ english: '', // 英语 }) +// Dynamic sub-major scores +const subMajorScores = ref>({}) + // Errors state const errors = ref({ examType: '', @@ -54,6 +57,7 @@ const errors = ref({ chinese: '', english: '', }, + subMajorScores: {} as Record, }) // --- Computed Properties using Dict System --- @@ -85,15 +89,15 @@ function getSubMajorOptions() { switch (majorCategory.value) { case '表演类': return [ - { label: '服装表演', value: '服装表演' }, - { label: '戏剧影视导演', value: '戏剧影视导演' }, - { label: '戏剧影视表演', value: '戏剧影视表演' }, + { label: '服装表演', value: '服装表演', formKey: '服装表演' }, + { label: '戏剧影视导演', value: '戏剧影视导演', formKey: '戏剧影视导演' }, + { label: '戏剧影视表演', value: '戏剧影视表演', formKey: '戏剧影视表演' }, ] case '音乐类': return [ - { label: '音乐表演声乐', value: '音乐表演声乐', disabled: selectedSubMajors.value.includes('音乐表演器乐') }, - { label: '音乐表演器乐', value: '音乐表演器乐', disabled: selectedSubMajors.value.includes('音乐表演声乐') }, - { label: '音乐教育', value: '音乐教育' }, + { label: '音乐表演声乐', value: '音乐表演声乐', formKey: '音乐表演声乐', disabled: selectedSubMajors.value.includes('音乐表演器乐') }, + { label: '音乐表演器乐', value: '音乐表演器乐', formKey: '音乐表演器乐', disabled: selectedSubMajors.value.includes('音乐表演声乐') }, + { label: '音乐教育', value: '音乐教育', formKey: '音乐教育' }, ] default: return [] @@ -122,10 +126,35 @@ function handleMajorCategoryChange(val: any) { errors.value.majorCategory = '' } +function getSubMajorFormKey(subMajorValue: string): string { + const options = getSubMajorOptions() + const option = options.find(opt => opt.value === subMajorValue) + return option?.formKey || '' +} + function handleSubMajorChange(val: any) { // 可以在这里处理额外的逻辑 console.warn(val) errors.value.subMajors = '' + + // 获取当前选中的子专业选项 + const options = getSubMajorOptions() + const selectedOptions = options.filter(opt => val.includes(opt.value)) + + // 初始化新选中的子专业成绩输入框 + selectedOptions.forEach(opt => { + if (!subMajorScores.value[opt.formKey]) { + subMajorScores.value[opt.formKey] = '' + } + }) + + // 移除未选中的子专业成绩 + const currentFormKeys = selectedOptions.map(opt => opt.formKey) + Object.keys(subMajorScores.value).forEach(key => { + if (!currentFormKeys.includes(key)) { + delete subMajorScores.value[key] + } + }) } // --- Validation Logic --- @@ -209,6 +238,11 @@ function validateForm() { // --- Submit --- async function handleSubmit() { if (validateForm()) { + if (getSubMajorOptions().length == 0){ + selectedSubMajors.value = [] + subMajorScores.value = {} + } + // 组装数据 const formData: ScoreFormData = { examType: examType.value, @@ -224,7 +258,7 @@ async function handleSubmit() { subjectList: selectedElectives.value, professionalCategory: majorCategory.value, professionalCategoryChildren: selectedSubMajors.value, - professionalCategoryChildrenScore: {}, + professionalCategoryChildrenScore: subMajorScores.value, professionalScore: Number(scores.value.unified) || 0, culturalScore: Number(scores.value.culture) || 0, englishScore: Number(scores.value.english) || 0, @@ -262,6 +296,11 @@ function initForm() { scores.value.culture = info.culturalScore?.toString() || '' scores.value.chinese = info.chineseScore?.toString() || '' scores.value.english = info.englishScore?.toString() || '' + + // 回显子专业成绩 + if (info.professionalCategoryChildrenScore) { + subMajorScores.value = { ...info.professionalCategoryChildrenScore } + } } } @@ -297,6 +336,7 @@ defineExpose({ majorCategory.value = '' selectedSubMajors.value = [] scores.value = { unified: '', culture: '', chinese: '', english: '' } + subMajorScores.value = {} }, }) @@ -386,6 +426,30 @@ defineExpose({ 成绩输入 + +
+
+
+ + +
+ {{ errors.subMajorScores[getSubMajorFormKey(subMajor)] }} +
+
+
+
+
diff --git a/src/pages/major/[majorCode].vue b/src/pages/major/[majorCode].vue new file mode 100644 index 0000000..84d0976 --- /dev/null +++ b/src/pages/major/[majorCode].vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/pages/simulate.vue b/src/pages/simulate.vue index 4a83b16..b25f759 100644 --- a/src/pages/simulate.vue +++ b/src/pages/simulate.vue @@ -153,6 +153,7 @@ async function loadMore(reset = false) { const res = await getUserMajorList({ page: page.value, size: size.value, + keyword: currentKeyword.value, probability, batch: currentBatchTab.value, batch2: currentBatch2Tab.value, @@ -455,6 +456,7 @@ function handleDataChange(data: { keyword: string, filters: FilterState }) { console.warn('发起请求:', data.keyword, data.filters) currentKeyword.value = data.keyword currentFilters.value = data.filters + loadMore(true) } // 用于记录当前鼠标是否悬停在手柄上，悬停时该行的索引存入这里 diff --git a/src/typed-router.d.ts b/src/typed-router.d.ts index eaaeb70..a6b888e 100644 --- a/src/typed-router.d.ts +++ b/src/typed-router.d.ts @@ -26,6 +26,7 @@ declare module 'vue-router/auto-routes' { '/demo/pop-confirm': RouteRecordInfo<'/demo/pop-confirm', '/demo/pop-confirm', Record, Record>, '/dict-demo': RouteRecordInfo<'/dict-demo', '/dict-demo', Record, Record>, '/hi/[name]': RouteRecordInfo<'/hi/[name]', '/hi/:name', { name: ParamValue }, { name: ParamValue }>, + '/major/[majorCode]': RouteRecordInfo<'/major/[majorCode]', '/major/:majorCode', { majorCode: ParamValue }, { majorCode: ParamValue }>, '/majors': RouteRecordInfo<'/majors', '/majors', Record, Record>, '/privacy-policy': RouteRecordInfo<'/privacy-policy', '/privacy-policy', Record, Record>, '/README': RouteRecordInfo<'/README', '/README', Record, Record>,