From 2b470f0c3c3e024aeae200900bc012a9a16c75a2 Mon Sep 17 00:00:00 2001 From: lixiao <932184220@qq.com> Date: Tue, 18 Mar 2025 10:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=80=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/pages/Judge.ets | 29 ++++++++++++++------ entry/src/main/ets/pages/UserInfo.ets | 32 ++-------------------- entry/src/main/ets/pages/judgeSDK/judge.ts | 5 ++-- 3 files changed, 25 insertions(+), 41 deletions(-) diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 26a5d4ba..6ca1b3e2 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -37,6 +37,7 @@ import systemDateTime from '@ohos.systemDateTime'; struct Index { // 考试模式 1:白考,2:夜考,3:增驾（模拟灯光未考）,4:增驾（模拟灯光已考）,5:满分学习 private mode: number = 1 + private mfxxn: boolean = false async aboutToDisappear() { clearInterval(this.mileageTimer) @@ -274,19 +275,30 @@ struct Index { const txt1 = decodeURI(systemParm.txt1) const txt2 = decodeURI(systemParm.txt2) //获取当前考车的no2 - if (no1 == 3 && no3 == 1) { - if (txt1 === carName) { - carNo = no2 + '' - this.carlist = carNo - } + if (no1 == 3 && no3 == 1 && txt1 === carName) { + carNo = no2 + '' + this.carlist = carNo } //获取及格分数线 - if (no1 == 3 && no3 == 3 && Number(carNo) === no2) { + console.log("lixiao passingScore", carNo, carName, txt1, this.passingScore) + if (no1 == 3 && no3 == 3 && Number(carNo) == no2) { this.passingScore = Number(txt1) || 0; } //根据车型获取应行驶里程数 - if (no1 == 3 && no3 == 15 && Number(carNo) === no2) { - this.examMileage = ((decodeURI(systemParm.txt1)) || '').split('^')[0]; + if (no1 == 3 && no3 == 15 && Number(carNo) == no2) { + let mileage = (decodeURI(systemParm.txt1) || '').split('^') + if(this.mode === 1) { + this.examMileage = mileage[1] + } else if(this.mode === 2) { + this.examMileage = mileage[2] + } else { + this.examMileage = mileage[0] + } + } + if (this.mode === 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) { + let data = decodeURI(systemParm.txt1)?.split("^").filter(item => item) + this.examMileage = data[0] || this.examMileage + this.mfxxn = data[1] !== "1" } //获取当前考车的考试项目 if (this.mode === 2) { @@ -309,6 +321,7 @@ struct Index { if (no2 == 13 && this.mode === 1) { isRequired = false } + console.log("lixiao must", name, isRequired) const currentProject: Project = { name, abbreviation: decodeURI(systemParm.txt3), diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 0b8a5783..a05d67fa 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -6,7 +6,6 @@ import AccountTable from '../common/database/tables/AccountTable'; import USER from '../common/constants/USER'; import { dateFormat, getCurrentHourTime, getCurrentTime, string2Bytes } from '../common/utils/tools'; import FaceCompare from './compontents/FaceCompare'; -// import { initJudgeUdp } from '../common/utils/UdpJudge' import { writeObjectOut } from '../api/judge'; import testNapi from '@ohos.idcard'; import common from '@ohos.app.ability.common'; @@ -110,7 +109,6 @@ struct UserInfo { if (this.ksksLimit) { return } - console.log('routerParamrouterParam') try { await this.checkSignal() this.faceCompareSucess = 0 @@ -136,7 +134,6 @@ struct UserInfo { this.stopDeviceById() return } - console.log('this.FaceOpenStatuethis.FaceOpenStatue', this.FaceOpenStatue) if (this.FaceOpenStatue != '0') { // 同一学员连续第二次考试时不再验证身份 if (this.currentUser.kssycs == '1' && this.systemParam.Param830Str == '1') { @@ -175,7 +172,7 @@ struct UserInfo { private labelBlocks = [ { label: '考生姓名', key: 'xm' }, { label: '身份证号', key: 'sfzmhm' }, - { label: ' 流 水 号 ', key: 'lsh' }, + { label: '流 水 号 ', key: 'lsh' }, { label: '考试路线', key: 'ksxl' }, { label: '待考次数', key: 'kssycs' }, { label: '考试员名', key: 'ksy2' }, @@ -437,8 +434,6 @@ struct UserInfo { } async getExamMode(kStringArr: string[]) { - // this.mode = 2 - // return // @ts-ignore // 满分学习 if (this.currentUser.czlx === 1) { @@ -702,7 +697,7 @@ struct UserInfo { const param = `${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}${globalThis.carInfo.carId}${globalThis.carInfo.examinationRoomId}${globalThis.username}` try { getExaminationStudentInfo(param).then(async (res) => { - console.log("temp log ", JSON.stringify(res)) + console.log("lixiao student", JSON.stringify(res)) this.errorDialog.close() setTimeout(() => { this.updateTimeLimit = false @@ -754,7 +749,6 @@ struct UserInfo { listData.ksmjzp = this.photo + listData.ksmjzp }) - // await upDateTableByArray('USERLIST', this.list || []) console.log("temp list", JSON.stringify(this.list)) await sqlInsertCommonFn("USERLIST", this.list || []) @@ -786,28 +780,6 @@ struct UserInfo { this.currentUser = EmptyCandidateObject } - - // const flag=dataList.filter((res)=>{ - // return res.sfzmhm==this.currentUser.sfzmhm - // }).length?true:false - // if(!this.currentUser.sfzmhm||this.currentUser.kssycs=='0'||!flag){ - // if (this.dataList.length) { - // setTimeout(()=>{ - // this.currentUser = this.dataList[0] - // this.currentUser.ksy2= globalThis.kgxm - // globalThis.lsh=this.currentUser.lsh - // },200) - // console.log('this.currentUser1',JSON.stringify(this.currentUser)) - // } else { - // this.currentUser = EmptyCandidateObject - // } - // } - - - // this.lsh = this.currentUser.lsh - // globalThis.lsh = this.lsh - // globalThis.ksyh = this.currentUser.ksy1sfzmhm - //364 绕车一周评判时机(1-开始考试后判 2-开始考试前判) if (this.systemParam.Param364 == '2') { this.isBoardPrePareSetPopupOpen = true; diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts index 25844b6b..7e31b604 100644 --- a/entry/src/main/ets/pages/judgeSDK/judge.ts +++ b/entry/src/main/ets/pages/judgeSDK/judge.ts @@ -806,13 +806,12 @@ export default class Judge { sczb: (sczb === undefined || sczb == 0) ? 0 : 1, sczbkf: kfdm, // 大车是否模拟灯光参数 - // dmndg: this.judgeUI.mode === 3, - dmndg: false, + dmndg: this.judgeUI.mode === 3 || this.judgeUI.mode === 5, // dmndg: this.judgeUI.mode === 3, // 是否满分学习 mfxx: this.judgeUI.mode === 5, // TODO 满分学习是否扣分参数 - mfxxn: false, + mfxxn: this.judgeUI.mfxxn, zeng: this.judgeUI.mode === 3 || this.judgeUI.mode === 4 } console.info(judgeTag, '5.获取开始考试数据完成')