diff --git a/src/views/comprehensive/knzzGlApply/stu.vue b/src/views/comprehensive/knzzGlApply/stu.vue index 6a1de7d..94d92af 100644 --- a/src/views/comprehensive/knzzGlApply/stu.vue +++ b/src/views/comprehensive/knzzGlApply/stu.vue @@ -281,6 +281,10 @@ import { getDicts } from "@/api/system/dict/data"; import { listDisciplinaryApplication } from "@/api/routine/disciplinaryApplication"; import { getOwnStuScoreMajorRank } from "@/api/comprehensive/biyeapply"; +import { +listOwnScoreClassRank +} from "@/api/stuCQS/good/apply"; + import { listStu as listView, doEdit, doCancel, doReApply } from "@/api/comprehensive/knzzGlApply"; export default { @@ -522,23 +526,19 @@ export default { }, async fetchcjpm() { let loading = fullLoading(this); - let res = await getOwnStuScoreMajorRank().catch(error => { + let res = await listOwnScoreClassRank().catch(error => { + console.error("Error fetching score rank:", error); return { code: 500 }; }); loading.close(); - if (res.code === 200 && res.data) { - let data = res.data; - // 检查必要的字段是否存在 - if (data.majorRank !== undefined && data.majorCount !== undefined && data.majorCount > 0) { - let stuRank = Math.round(Math.round(data.majorRank / data.majorCount * 10000) / 100); - if (stuRank <= 30) { - return true; - } else { - this.$message.info("您的学业成绩未达到专业前30%"); - return false; - } + let data = res.data[0]; + if (res.code === 200 && data&& data.stuMajorRank != null && data.majorCount != null) { + + let stuRank = Math.round(Math.round(data.stuMajorRank / data.majorCount * 10000) / 100); + if (stuRank <= 30) { + return true; } else { - this.$message.info("专业排名数据不完整"); + this.$message.info("您的学业成绩未达到专业前30%"); return false; } }