Compare commits

..

No commits in common. "f71297583b076a8200c872a97c63c870f38dab4a" and "fc43decbb7b8ae9763cabebf85b5f329d62f8663" have entirely different histories.

2 changed files with 8 additions and 10 deletions

View File

@ -38,7 +38,6 @@ struct Index {
// 考试模式 1:白考,2:夜考,3:增驾(模拟灯光未考),4:增驾(模拟灯光已考),5:满分学习 // 考试模式 1:白考,2:夜考,3:增驾(模拟灯光未考),4:增驾(模拟灯光已考),5:满分学习
private mode: number = 1 private mode: number = 1
private isYkkf: boolean = false private isYkkf: boolean = false
private mockLight: boolean = false
async aboutToDisappear() { async aboutToDisappear() {
clearInterval(this.mileageTimer) clearInterval(this.mileageTimer)
@ -259,7 +258,6 @@ struct Index {
} }
//真实监管下发的项目 //真实监管下发的项目
let kStringArr: string[] = (currentParams.kString?.split(',') || []).filter(item => item); let kStringArr: string[] = (currentParams.kString?.split(',') || []).filter(item => item);
this.mockLight = kStringArr.includes("41700")
console.info('surenjun kStringArr', JSON.stringify(kStringArr)) console.info('surenjun kStringArr', JSON.stringify(kStringArr))
let isInExam = kStringArr.length > 0; let isInExam = kStringArr.length > 0;
@ -1171,7 +1169,7 @@ struct Index {
} }
//只做一次的项目已经做过,后续不能人工触发 //只做一次的项目已经做过,后续不能人工触发
if (param307.includes(projectCode)) { if (param307.includes(projectCode) && this.mode !== 5) {
if (this.mode === 2) { if (this.mode === 2) {
return !(ykType == '3' || ykType == '4' || projectType == '3' || projectType == '4') return !(ykType == '3' || ykType == '4' || projectType == '3' || projectType == '4')
} else { } else {

View File

@ -416,12 +416,12 @@ export default class Judge {
if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) { if (examSubject == 3 && (param342 == 0 || param342 == 2) && (param302 != 6 || param302 != 7 || param302 != 8)) {
if (param512[7] != 0) { if (param512[7] != 0) {
// clearTimeout(this.deductedPopShowTimer) clearTimeout(this.deductedPopShowTimer)
// this.judgeUI.isDeductedPopShow = false this.judgeUI.isDeductedPopShow = false
// avPlayer.playAudio(['voice/综合评判.mp3']) avPlayer.playAudio(['voice/综合评判.mp3'])
// this.judgeUI.isDeductedPopShow = true this.judgeUI.isDeductedPopShow = true
// this.judgeUI.defaultTabIndex = 1 this.judgeUI.defaultTabIndex = 1
// this.isEndTip = true this.isEndTip = true
} }
} else { } else {
await examJudgeEndExam() await examJudgeEndExam()
@ -810,7 +810,7 @@ export default class Judge {
sczb: (sczb === undefined || sczb == 0) ? 0 : 1, sczb: (sczb === undefined || sczb == 0) ? 0 : 1,
sczbkf: kfdm, sczbkf: kfdm,
// 大车是否模拟灯光参数 // 大车是否模拟灯光参数
dmndg: judgeUI.mockLight, dmndg: judgeUI.mode === 3 || judgeUI.mode === 5,
// 是否满分学习 // 是否满分学习
mfxx: judgeUI.mode === 5, mfxx: judgeUI.mode === 5,
// 是否增驾 // 是否增驾