feat: 模拟灯光相关特性优化
This commit is contained in:
parent
2ff07dd2fb
commit
4c6f25ee3a
@ -566,7 +566,7 @@ struct Index {
|
||||
//上车准备&起步都开始时
|
||||
if (this.syssetParam386 == '3'
|
||||
&& (this.projectsObj[1].type == '2' || this.projectsObj[1].type == '3')
|
||||
&& this.projectsObj[2].type == '2'
|
||||
&& (this.projectsObj[2].type !== '1' && this.projectsObj[2].type !== undefined)
|
||||
&& !this.syssetParam386ET3
|
||||
) {
|
||||
this.judge.rmndg = 2;
|
||||
|
||||
@ -1182,7 +1182,7 @@ export default class Judge {
|
||||
const time = await getCurrentTime();
|
||||
const project = getProjectInfo(ksxm);
|
||||
//科目三夜间行驶.模拟灯光、上车准备出现非本项目的扣分,ksxm需转换为为当前进行的项目
|
||||
const checkProjects = ['17', '41', '1'];
|
||||
const checkProjects = ['1', '41', '17'];
|
||||
//获取正在进行的项目
|
||||
const inProjects = Reflect.ownKeys(projectsObj).filter(projectKey => projectsObj[projectKey].type == 2);
|
||||
|
||||
@ -1192,7 +1192,8 @@ export default class Judge {
|
||||
commonKsxm = projectCode
|
||||
}
|
||||
})
|
||||
|
||||
console.info(judgeTag, 'commonKsxm=>' + commonKsxm)
|
||||
console.info(judgeTag, 'project=>' + project)
|
||||
const data = {
|
||||
xtlb: '17', jkxlh: serialNumber, jkid: '17C53',
|
||||
drvexam: {
|
||||
@ -1202,7 +1203,7 @@ export default class Judge {
|
||||
? (commonKsxm
|
||||
? (projectsObj[commonKsxm].projectCodeCenter)
|
||||
: (examSubject == 3 ? 30000 : (xmmcEndCode == undefined ? 10000 : xmmcEndCode)))
|
||||
: (commonKsxm || project.projectCodeCenter),
|
||||
: (projectsObj[commonKsxm]?.projectCodeCenter || project.projectCodeCenter),
|
||||
kfxm: kf.markcatalog,
|
||||
kfxmmx: `${ksxm},${kf.markserial}`,
|
||||
sfzmhm: idCard,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user