Compare commits

..

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

4 changed files with 7 additions and 10 deletions

View File

@ -60,7 +60,7 @@ export const getMessageHeartbeat = async (msg) => {
const {fourInOneScreen:{gpsDigit}} = judgeConfig const {fourInOneScreen:{gpsDigit}} = judgeConfig
const asclshArr = stringToASC(fillZero( const asclshArr = stringToASC(fillZero(
globalThis.singlePlay globalThis.singlePlay
? '0000000000000' ? '1111111111111'
: globalThis.lsh, : globalThis.lsh,
13)); 13));
const ascksyhArr = stringToASC(fillZero(examSubject == 2 ? '0000000000000':'1111111111111', 13)) const ascksyhArr = stringToASC(fillZero(examSubject == 2 ? '0000000000000':'1111111111111', 13))

View File

@ -26,7 +26,7 @@ import { examJudgeVersion } from './judgeSDK/api';
@Component @Component
struct Index { struct Index {
@State carNum: string = '' @State carNum: string = ''
@State version: string = '2025.04.28.01' @State version: string = '2025.04.25.01'
@State judgeVersion: string = '' @State judgeVersion: string = ''
@State url: string = '' @State url: string = ''
@State hasAuth: boolean = false; @State hasAuth: boolean = false;

View File

@ -260,8 +260,7 @@ 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") this.mockLight = kStringArr.includes("41700")
console.log("lixiao mockLight", this.mockLight) console.info('surenjun kStringArr', JSON.stringify(kStringArr))
console.info('lixiao kStringArr', JSON.stringify(kStringArr))
let isInExam = kStringArr.length > 0; let isInExam = kStringArr.length > 0;
const {isTrajectoryOpen} = judgeConfig const {isTrajectoryOpen} = judgeConfig
@ -312,7 +311,7 @@ struct Index {
allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '') allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '')
} else if (this.mode == 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) { } else if (this.mode == 5 && no1 == 3 && no2 == Number(carNo) && no3 == 63) {
// 满分学习项目 // 满分学习项目
let data = decodeURI(systemParm.txt1)?.split("^") let data = decodeURI(systemParm.txt1)?.split("^").filter(item => item)
allItems = data[0]?.split(",") || [] allItems = data[0]?.split(",") || []
} }
if (no1 == 6) { if (no1 == 6) {
@ -322,7 +321,7 @@ struct Index {
return return
} }
// 模拟夜间驾驶 // 模拟夜间驾驶
if (!this.mockLight && no2 == 41) { if (this.mode !== 3 && this.mode !== 5 && no2 == 41) {
return return
} }
let isRequired = allItems.includes(no2 + '') let isRequired = allItems.includes(no2 + '')
@ -919,8 +918,7 @@ struct Index {
showBack: false, showBack: false,
scaleNum: 1.8, scaleNum: 1.8,
msgStr: this.judge.plcStr || '', msgStr: this.judge.plcStr || '',
// showTrajectory: globalThis.singlePlay ? true : (this.syssetParam623), showTrajectory: globalThis.singlePlay ? true : (this.syssetParam623),
showTrajectory: true,
}).margin({ top: 100 }) }).margin({ top: 100 })
Row() { Row() {
@ -1254,11 +1252,10 @@ struct Index {
const projectName = this.artSubject3Projects[index]; const projectName = this.artSubject3Projects[index];
const projectCode = this.artSubject3ProjectsCodesArr[index]; const projectCode = this.artSubject3ProjectsCodesArr[index];
const type = this.projectsObj[projectCode].type const type = this.projectsObj[projectCode].type
const ykType = this.projectsObj[projectCode].ykType
if (type == '2') { if (type == '2') {
return projectName return projectName
} }
return (type == '3' || type == '4' || ykType == '3' || ykType == '4') ? `${projectName}_red` : `${projectName}_green`; return (type == '3' || type == '4') ? `${projectName}_red` : `${projectName}_green`;
} }
// 获取是否能进行人工评判 // 获取是否能进行人工评判
getIsManualKf = () => { getIsManualKf = () => {