xgxt_sd/zhxg_pc
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改自治区奖学金的获取体测接口

Browse Source
This commit is contained in:
陈十三
2025-10-11 17:15:30 +08:00
parent 5f3e6e8a49
commit e6d3ba305a
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CYJS-APP Submodule

Submodule CYJS-APP added at e8aceb16e9

46
src/views/comprehensive/knzzZzqApply/stu.vue
View File

@@ -250,7 +250,7 @@
import { boolImg, CheckImgExists, isEmpty, fullLoading } from "@/api/helpFunc"; import { boolImg, CheckImgExists, isEmpty, fullLoading } from "@/api/helpFunc";
import { getTokenKeySessionStorage as getToken } from "@/utils/auth"; import { getTokenKeySessionStorage as getToken } from "@/utils/auth";
import {listOwnSportScore} from "@/api/comprehensive/biyeapply"; import {selectTestStu} from "@/api/stuCQS/info-fill/sportTest";
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { listDisciplinaryApplication } from "@/api/routine/disciplinaryApplication"; import { listDisciplinaryApplication } from "@/api/routine/disciplinaryApplication";
import { getOwnStuScoreMajorRank } from "@/api/comprehensive/biyeapply"; import { getOwnStuScoreMajorRank } from "@/api/comprehensive/biyeapply";
@@ -395,7 +395,7 @@ export default {
async checkAllConditions() { async checkAllConditions() {
try { try {
const [sportResult, disciplinaryResult, scoreResult] = await Promise.all([ const [sportResult, disciplinaryResult, scoreResult] = await Promise.all([
this.fetchSportScoreData(), this.fetchTestScoreData(),
this.fetchcfwjc(), this.fetchcfwjc(),
this.fetchcjpm() this.fetchcjpm()
]); ]);
@@ -405,27 +405,27 @@ export default {
this.applyV = false; this.applyV = false;
} }
}, },
async fetchSportScoreData() { async fetchTestScoreData() {
const res = await listOwnSportScore().catch(() => { const res = await selectTestStu().catch(() => {
this.$message.info("体能测试数据获取失败"); this.$message.info("体能测试数据获取失败");
return { code: 500, data: [] }; return { code: 500, rows: [] };
}); });
if (res.code === 200 && res.data && res.data.length > 1) { if (res.code === 200 && res.rows && res.rows.length > 0) {
const sportScore = res.data[res.data.length - 1].sportScore; const testScore = res.rows[res.rows.length - 1].testScore;
if (sportScore >= 60) { if (testScore >= 60) {
return true; return true;
} else if (sportScore === 0) { } else if (testScore === 0) {
this.$message.info("当前学年没有您的体能成绩"); this.$message.info("没有您的体能成绩");
return false; return false;
} else { } else {
this.$message.info("您的体能成绩不达标"); this.$message.info("您的体能成绩不达标");
return false; return false;
} }
} else { } else {
this.$message.info("请先完成体能测试"); this.$message.info("请先完成体能测试");
return false; return false;
} }
}, },
async fetchcfwjc() { async fetchcfwjc() {
try { try {
const response1 = await getDicts('rt_penalty_status'); const response1 = await getDicts('rt_penalty_status');