Compare commits
2 Commits
cb86c2b903
...
0855162b43
| Author | SHA1 | Date | |
|---|---|---|---|
| 0855162b43 | |||
| 3b013f451c |
@ -28,12 +28,12 @@ export default class EntryAbility extends UIAbility {
|
|||||||
globalThis.examinerInfo = {}
|
globalThis.examinerInfo = {}
|
||||||
globalThis.deviceNo = '';
|
globalThis.deviceNo = '';
|
||||||
globalThis.hasAuth = false
|
globalThis.hasAuth = false
|
||||||
// globalThis.version = '2022.08.13.01'
|
globalThis.version = '2022.08.13.01'//洛阳
|
||||||
// globalThis.judgeVersion = '2022.12.05.1'
|
globalThis.judgeVersion = '2022.12.05.1'
|
||||||
// globalThis.version = '2022.12.05.1'
|
// globalThis.version = '2022.12.05.1'
|
||||||
// globalThis.judgeVersion = '2022.08.13.01'
|
// globalThis.judgeVersion = '2022.08.13.01'
|
||||||
globalThis.version = '2024.11.22.14'//济南
|
// globalThis.version = '2024.11.22.14'//济南
|
||||||
globalThis.judgeVersion = '2024.11.22.14'
|
// globalThis.judgeVersion = '2024.11.22.14'
|
||||||
globalThis.videoVersion= '1.0'
|
globalThis.videoVersion= '1.0'
|
||||||
// globalThis.version = '2023.12.13.01'
|
// globalThis.version = '2023.12.13.01'
|
||||||
// globalThis.judgeVersion = '2023.09.30.1'
|
// globalThis.judgeVersion = '2023.09.30.1'
|
||||||
|
|||||||
@ -294,7 +294,7 @@ export default class Judge {
|
|||||||
//处理评判过程回调
|
//处理评判过程回调
|
||||||
handleRealExam = async (strData, callBack) => {
|
handleRealExam = async (strData, callBack) => {
|
||||||
let examData: EXAMDATA = JSON.parse(strData);
|
let examData: EXAMDATA = JSON.parse(strData);
|
||||||
const {getDqxmStr,getKfStr,goJudgeVoice,setMndg,avPlayer,judgeUI} = this;
|
const {getDqxmStr,getKfStr,goJudgeVoice,setMndg,avPlayer,fileLog,judgeUI} = this;
|
||||||
const {carzt,xmks,kf,event,xmjs,xmqx,ksjs,sound,mndg,lane} = examData
|
const {carzt,xmks,kf,event,xmjs,xmqx,ksjs,sound,mndg,lane} = examData
|
||||||
const param512 = (judgeUI.judgeConfigObj['512'] || '').split(',');
|
const param512 = (judgeUI.judgeConfigObj['512'] || '').split(',');
|
||||||
//获取项目结束、项目开始代码
|
//获取项目结束、项目开始代码
|
||||||
@ -379,6 +379,9 @@ export default class Judge {
|
|||||||
//考试结束
|
//考试结束
|
||||||
case 5:
|
case 5:
|
||||||
this.ksjs = ksjs;
|
this.ksjs = ksjs;
|
||||||
|
await fileLog.setExamJudgeData({
|
||||||
|
method: 'examjudgeEndExam',
|
||||||
|
})
|
||||||
break;
|
break;
|
||||||
|
|
||||||
//项目取消
|
//项目取消
|
||||||
@ -756,78 +759,79 @@ export default class Judge {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 校验考试是否结束
|
// 校验考试是否结束
|
||||||
checkExamIsEnd = async (isManual?: boolean) => {
|
checkExamIsEnd =
|
||||||
const {judgeUI,avPlayer,isExamEnd,isEndTip} = this;
|
async (isManual?: boolean) => {
|
||||||
const {isAllProjectsEnd,examSubject,singlePlay,totalScore,judgeConfigObj,passingScore} = judgeUI;
|
const {judgeUI,avPlayer,isExamEnd,isEndTip} = this;
|
||||||
|
const {isAllProjectsEnd,examSubject,singlePlay,totalScore,judgeConfigObj,passingScore} = judgeUI;
|
||||||
|
|
||||||
if (isExamEnd) {
|
if (isExamEnd) {
|
||||||
return
|
return
|
||||||
}
|
|
||||||
//及格分
|
|
||||||
let passingGrade = passingScore
|
|
||||||
if (isManual) {
|
|
||||||
if (isAllProjectsEnd) {
|
|
||||||
// 考试合格
|
|
||||||
if (totalScore >= passingGrade) {
|
|
||||||
// 考试合格
|
|
||||||
await examJudgeEndExam();
|
|
||||||
this.isExamEnd = true
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// 考试不合格
|
|
||||||
await examJudgeEndExam()
|
|
||||||
this.isExamEnd = true
|
|
||||||
}
|
}
|
||||||
this.isManual = true
|
//及格分
|
||||||
|
let passingGrade = passingScore
|
||||||
} else {
|
if (isManual) {
|
||||||
//单机模式
|
|
||||||
if (singlePlay) {
|
|
||||||
console.info(judgeTag + ' isAllProjectsEnd => ',isAllProjectsEnd)
|
|
||||||
if (isAllProjectsEnd) {
|
if (isAllProjectsEnd) {
|
||||||
|
// 考试合格
|
||||||
|
if (totalScore >= passingGrade) {
|
||||||
|
// 考试合格
|
||||||
|
await examJudgeEndExam();
|
||||||
|
this.isExamEnd = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 考试不合格
|
||||||
await examJudgeEndExam()
|
await examJudgeEndExam()
|
||||||
this.isExamEnd = true
|
this.isExamEnd = true
|
||||||
}
|
}
|
||||||
|
this.isManual = true
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
const param302 = judgeConfigObj['302'];
|
//单机模式
|
||||||
const param342 = judgeConfigObj['342'];
|
if (singlePlay) {
|
||||||
const param512 = (judgeConfigObj['512'] || '').split(',');
|
console.info(judgeTag + ' isAllProjectsEnd => ',isAllProjectsEnd)
|
||||||
//成绩不合格
|
if (isAllProjectsEnd) {
|
||||||
if (totalScore < passingGrade) {
|
|
||||||
//科目三不合格报靠边停车
|
|
||||||
if(examSubject == 3 && param302 ==1){
|
|
||||||
avPlayer.playAudio([`voice/考试结束.mp3`]);
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await examJudgeEndExam()
|
|
||||||
this.isExamEnd = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
//成绩合格
|
|
||||||
if (isAllProjectsEnd && totalScore >= passingGrade && !isEndTip) {
|
|
||||||
|
|
||||||
//考试合格自动退出
|
|
||||||
if(examSubject == 3 && param302 == 4){
|
|
||||||
await examJudgeEndExam()
|
await examJudgeEndExam()
|
||||||
this.isExamEnd = true
|
this.isExamEnd = true
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) {
|
const param302 = judgeConfigObj['302'];
|
||||||
if(param512[7] != 0){
|
const param342 = judgeConfigObj['342'];
|
||||||
avPlayer.playAudio(['voice/综合评判.mp3'])
|
const param512 = (judgeConfigObj['512'] || '').split(',');
|
||||||
this.judgeUI.isDeductedPopShow = true
|
//成绩不合格
|
||||||
this.judgeUI.defaultTabIndex = 1
|
if (totalScore < passingGrade) {
|
||||||
this.isEndTip = true
|
//科目三不合格报靠边停车
|
||||||
|
if(examSubject == 3 && param302 ==1){
|
||||||
|
avPlayer.playAudio([`voice/考试结束.mp3`]);
|
||||||
|
return
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
await examJudgeEndExam()
|
await examJudgeEndExam()
|
||||||
this.isExamEnd = true
|
this.isExamEnd = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
//成绩合格
|
||||||
|
if (isAllProjectsEnd && totalScore >= passingGrade && !isEndTip) {
|
||||||
|
|
||||||
|
//考试合格自动退出
|
||||||
|
if(examSubject == 3 && param302 == 4){
|
||||||
|
await examJudgeEndExam()
|
||||||
|
this.isExamEnd = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) {
|
||||||
|
if(param512[7] != 0){
|
||||||
|
avPlayer.playAudio(['voice/综合评判.mp3'])
|
||||||
|
this.judgeUI.isDeductedPopShow = true
|
||||||
|
this.judgeUI.defaultTabIndex = 1
|
||||||
|
this.isEndTip = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await examJudgeEndExam()
|
||||||
|
this.isExamEnd = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// 处理考试结束
|
// 处理考试结束
|
||||||
public handEndExam = async (ksjs: KSJS) => {
|
public handEndExam = async (ksjs: KSJS) => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user