diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index f8fe6b11..a9dd1627 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -1173,10 +1173,8 @@ struct Index { } //项目已经做过,后续不能人工触发 - if (this.mode !== 2) { - if (param307.includes(projectCode) && (projectType == '3' || projectType == '4')) { - return false - } + if (param307.includes(projectCode) && (projectType == '3' || projectType == '4')) { + return false } //319不为0,或者387不为1,里程不够时,靠边停车项目不能触发 diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 732ec87d..1e9a3fb5 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -753,7 +753,18 @@ export default class Judge { const {sczb,kfdm} = currentParams; const {isExam} = this; const judgeUI = this.judgeUI - const {projects,carType,kssycs,isDdxk,isYkkf,ddxkTime,projectsCenterObj,ddxkKsxmArr,ddxkKfArr,passingScore} = judgeUI; + const { + projects, + carType, + kssycs, + isDdxk, + isYkkf, + ddxkTime, + projectsCenterObj, + ddxkKsxmArr, + ddxkKfArr, + passingScore + } = judgeUI; const beginInfo = { kgid: '012', kgxm: decodeURI(examinerName || ''), @@ -1125,7 +1136,7 @@ export default class Judge { judgeTask.addTask(async () => { console.info(judgeTag, '考试结束 start') globalThis.isJudge = false; - await handEndExam(ksjs) + await handEndExam() }) clearInterval(globalThis.judgeTimer) break @@ -1219,18 +1230,15 @@ export default class Judge { } // 处理考试结束 - public handEndExam = async (ksjs: KSJS) => { + public handEndExam = async () => { this.judgeUI.loadingPopupVisible = true; this.judgeUI.endPopupVisible = false; this.judgeUI.isDeductedPopShow = false; - const {qjjl,dcjl} = ksjs - const {judgeUI,endExam,handleSEP,kfArr,avPlayer,judgeTask,isManual,closeAllFiles} = this; + const {judgeUI,endExam,handleSEP,avPlayer,isManual,closeAllFiles} = this; const {judgeConfigObj,examSubject,isAllProjectsEnd,totalScore,passingScore} = judgeUI; - //计算考试分数 - // this.judgeUI.totalScore = isAllProjectsEnd ? totalScore : 0; + const singlePlay = globalThis.singlePlay const param302 = judgeConfigObj['302']; - // globalThis.windowClass.setWindowSystemBarEnable(['navigation']) //自动退出待验证并且不合格 if (!isManual && examSubject == 3 && (param302 == 1 || (singlePlay && param302 == 2)) && totalScore < passingScore) { @@ -1276,7 +1284,7 @@ export default class Judge { } // 考试结束 - public endExam = async (isManual?: Boolean) => { + public endExam = async () => { const carInfo = globalThis.carInfo; const singlePlay = globalThis.singlePlay const { examSubject ,plateNo} = carInfo; @@ -1284,11 +1292,8 @@ export default class Judge { judgeUI, ksjs, getPhoto, - uploadProgressData, - uploadDisConnectData, avPlayer, kfArr, - judgeTask, filePath, closeAllFiles } = this; @@ -1359,6 +1364,7 @@ export default class Judge { } } if (examSubject == 3) { + console.log(judgeTag, "exam end",isAllProjectsEnd); if (isAllProjectsEnd) { if (totalScore < passingScore) { voiceURL = `voice/${kssycs == 1 ? 'exam_no_pass_finish' : 'exam_no_pass'}.mp3` @@ -1677,7 +1683,7 @@ export default class Judge { if (type == 3 || type == 4) { allEndProjectsNum += 1; } - if (isRequired) { + if (isRequired && projectKey != '11') { projectNum += 1; if (type == 3 || type == 4) { endProjectsNum += 1;