Compare commits

..

No commits in common. "0855162b434fcf4efac9c2c61ad07905d1668418" and "cb86c2b903c98e929089a2308febc0c1ef411c82" have entirely different histories.

2 changed files with 60 additions and 64 deletions

View File

@ -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'

View File

@ -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,fileLog,judgeUI} = this; const {getDqxmStr,getKfStr,goJudgeVoice,setMndg,avPlayer,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,9 +379,6 @@ export default class Judge {
//考试结束 //考试结束
case 5: case 5:
this.ksjs = ksjs; this.ksjs = ksjs;
await fileLog.setExamJudgeData({
method: 'examjudgeEndExam',
})
break; break;
//项目取消 //项目取消
@ -759,8 +756,7 @@ export default class Judge {
} }
// 校验考试是否结束 // 校验考试是否结束
checkExamIsEnd = checkExamIsEnd = async (isManual?: boolean) => {
async (isManual?: boolean) => {
const {judgeUI,avPlayer,isExamEnd,isEndTip} = this; const {judgeUI,avPlayer,isExamEnd,isEndTip} = this;
const {isAllProjectsEnd,examSubject,singlePlay,totalScore,judgeConfigObj,passingScore} = judgeUI; const {isAllProjectsEnd,examSubject,singlePlay,totalScore,judgeConfigObj,passingScore} = judgeUI;