feat：评判优化
This commit is contained in:
parent
d2d13502c3
commit
9ba033954b
@ -43,11 +43,11 @@ export default class EntryAbility extends UIAbility {
|
||||
// globalThis.judgeVersion = '2023.07.10.1'
|
||||
|
||||
/***************** 杭州科目二 ******************/
|
||||
globalThis.version = '2024.11.22.44'
|
||||
globalThis.judgeVersion = '2024.11.22.44'
|
||||
globalThis.version = '2022 03 14 01'
|
||||
globalThis.judgeVersion = '2022 03 17 1'
|
||||
|
||||
/***********************************/
|
||||
// globalThis.version = '2023.12.13.01'//济南
|
||||
/****************** 济南科目三 *****************/
|
||||
// globalThis.version = '2023.12.13.01'//济南科目三
|
||||
// globalThis.judgeVersion = '2023.09.30.1'
|
||||
globalThis.videoVersion= '1.0'
|
||||
|
||||
|
||||
@ -102,17 +102,17 @@ struct Index {
|
||||
const carInfo = result[0] || {};
|
||||
this.carName = decodeURI(carInfo.carclass)
|
||||
this.carType = carInfo.kscx
|
||||
this.carinfoArrr.push({
|
||||
this.carinfoArr.push({
|
||||
CARID: carInfo.carid,
|
||||
IPADDR: '',
|
||||
CARCLASS: decodeURI(carInfo.carclass),
|
||||
KSCX: carInfo.kscx,
|
||||
CARNAME: decodeURI(carInfo.carclass),
|
||||
CARNAME: decodeURI(carInfo.carname),
|
||||
FLAG: carInfo.flag,
|
||||
BK1: carInfo.bk1,
|
||||
BK2: carInfo.bk2,
|
||||
})
|
||||
console.info('surenjun =>carinfoArrr',JSON.stringify( this.carinfoArrr))
|
||||
console.info('surenjun =>carinfoArrr',JSON.stringify( this.carinfoArr))
|
||||
}
|
||||
|
||||
// 获取考生信息
|
||||
@ -189,7 +189,7 @@ struct Index {
|
||||
}
|
||||
//科目三应行驶距离参数
|
||||
if (sys.v_no == '303') {
|
||||
this.examMileage = sys.v_value + '';
|
||||
this.examMileage = this.examMileage == '0'?(sys.v_value + ''): this.examMileage;
|
||||
}
|
||||
|
||||
//364 绕车一周评判时机(1-开始考试后判 2-开始考试前判)
|
||||
@ -259,13 +259,17 @@ struct Index {
|
||||
if (txt1 === carName) {
|
||||
carNo = no2
|
||||
this.carlist = carNo
|
||||
console.info('surenjun carNo => ',carNo)
|
||||
}
|
||||
}
|
||||
|
||||
//获取及格分数线
|
||||
if(no1 == 3 && no3 == 3 && carNo === no2){
|
||||
this.passingScore = Number(txt1) || 0;
|
||||
}
|
||||
//根据车型获取应行驶里程数
|
||||
if(no1 == 3 && no3 ==15 && carNo === no2){
|
||||
this.examMileage = ((decodeURI(systemParm.txt1)) || '').split('^')[0];
|
||||
}
|
||||
//获取当前考车的考试项目
|
||||
if (carNo !== '' && no1 == 3 && no2 == carNo && no3 == 10) {
|
||||
allItems = decodeURIComponent(systemParm.txt1).split(',').filter(txt => txt !== '')
|
||||
@ -1287,7 +1291,7 @@ struct Index {
|
||||
//科目三评判初始化数据
|
||||
@State systemparmArr: SYSTEMPARMARR[] = []
|
||||
@State mapPointItemArr: MAPITEMPOINTITEM[] = []
|
||||
@State carinfoArrr: CARINFO[] = []
|
||||
@State carinfoArr: CARINFO[] = []
|
||||
@State mapPointArr: MAPPOINT[] = []
|
||||
//手动项目是否在进行中
|
||||
@State isManualProjectIn: boolean = false;
|
||||
|
||||
@ -231,7 +231,7 @@ export default class Judge {
|
||||
const carInfo = globalThis.carInfo;
|
||||
const { examSubject,plateNo,carId } = carInfo;
|
||||
const judgeUI = this.judgeUI
|
||||
const {projectsObj,itemInfoObj,markRuleListObj,carType,carName,systemparmArr} = judgeUI
|
||||
const {projectsObj,itemInfoObj,markRuleListObj,carType,carName,systemparmArr,carinfoArr} = judgeUI
|
||||
const examType = examSubject == 2 ? 'km2' : 'km3'
|
||||
|
||||
let allitems = [];
|
||||
@ -262,7 +262,8 @@ export default class Judge {
|
||||
mark: Reflect.ownKeys(markRuleListObj).map(ruleKey => (markRuleListObj[ruleKey])) || testMarkRules,
|
||||
sysset: judgeUI.judgeConfig,
|
||||
itemInfoObj,
|
||||
carlist:judgeUI.carlist
|
||||
carlist:judgeUI.carlist,
|
||||
carinfo: carinfoArr,
|
||||
};
|
||||
let km3Config = {}
|
||||
|
||||
@ -532,9 +533,7 @@ export default class Judge {
|
||||
kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true)
|
||||
}
|
||||
}
|
||||
if(param512[7] != 0){
|
||||
this.judgeUI.isDeductedPopShow = true
|
||||
}
|
||||
setTimeout(()=>{if(param512[7] != 0){this.judgeUI.isDeductedPopShow = true}},200)
|
||||
//项目已考不上传监管信息
|
||||
if (!isEnd) {
|
||||
judgeTask.addTask(async () => {
|
||||
@ -1416,9 +1415,8 @@ export default class Judge {
|
||||
//获取科目三的评判初始化配置
|
||||
getKm3JudgeInitConfig = async () => {
|
||||
const {judgeUI,getModelData} = this;
|
||||
const {carinfoArrr,mapPointArr,mapPointItemArr} = judgeUI;
|
||||
const {mapPointArr,mapPointItemArr} = judgeUI;
|
||||
return {
|
||||
carinfo: carinfoArrr,
|
||||
map_point: mapPointArr,
|
||||
map_point_item: mapPointItemArr,
|
||||
//科目三暂时为空
|
||||
@ -1538,7 +1536,7 @@ export default class Judge {
|
||||
const bytes = await this.getMessageHeartbeat();
|
||||
bytes && globalThis.judgeUdp.send(bytes)
|
||||
|
||||
}, 50)
|
||||
}, 200)
|
||||
|
||||
globalThis.judgeTimer = judgeTimer;
|
||||
}
|
||||
|
||||
@ -440,25 +440,25 @@ export function sendRed(){
|
||||
}
|
||||
|
||||
export const defaultJudgeConfigObj = {
|
||||
//结束考试方式 0-不合格继续 1-考试不合格报靠边停车 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出
|
||||
//结束考试方式 0-不合格继续 1-考试不合格报靠边停车 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出
|
||||
302:'5',
|
||||
332:'',
|
||||
//是否能进行人工操作 0-不能人工评判 1-不能人工进项目 3-都不能
|
||||
//是否能进行人工操作 0-不能人工评判 1-不能人工进项目 3-都不能
|
||||
342:'',
|
||||
//有项目未结束时可以靠边停车 0-否 1-是
|
||||
//有项目未结束时可以靠边停车 0-否 1-是
|
||||
343:'1',
|
||||
//考试未结束且有扣分，是否可以退出
|
||||
//考试未结束且有扣分，是否可以退出
|
||||
344:'0',
|
||||
//直线行驶中是否可以进其它项目 0-否 1-是
|
||||
//直线行驶中是否可以进其它项目 0-否 1-是
|
||||
348:'0',
|
||||
//车上是否能点结束考试 0:否 1:是
|
||||
//车上是否能点结束考试 0:否 1:是
|
||||
353:'0',
|
||||
//是否启动断电续考 0:否 1:是
|
||||
//是否启动断电续考 0:否 1:是
|
||||
369:'1',
|
||||
//是否显示应考里程
|
||||
//是否显示应考里程
|
||||
375:'0',
|
||||
//里程不够允许手工点靠边停车
|
||||
//里程不够允许手工点靠边停车
|
||||
387:'0',
|
||||
//监管模式有扣分续考（0-否++1-是+把上次未考完的扣分带下来重新考试）
|
||||
//监管模式有扣分续考（0-否++1-是+把上次未考完的扣分带下来重新考试）
|
||||
432:'1'
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user