fix: 1.499参数修改; 2.科目二sbbm字段读取优化
This commit is contained in:
		
							parent
							
								
									f9beb54a28
								
							
						
					
					
						commit
						e36b0f018b
					
				| @ -538,14 +538,14 @@ export default class Judge { | |||||||
|   // 调代理接口是否断网了
 |   // 调代理接口是否断网了
 | ||||||
|   private isJudgeDisConnect: boolean; |   private isJudgeDisConnect: boolean; | ||||||
|   // 项目开始接口同步
 |   // 项目开始接口同步
 | ||||||
|   beginProject = async (ksxm) => { |   beginProject = async (ksxm,xmxh?:string) => { | ||||||
|     const carInfo = globalThis.carInfo; |     const carInfo = globalThis.carInfo; | ||||||
|     const { examSubject,plateNo } = carInfo; |     const { examSubject,plateNo } = carInfo; | ||||||
|     const {judgeUI,fileLog,getSbbm,xmxh,filePath} = this; |     const {judgeUI,fileLog,getSbbm,filePath} = this; | ||||||
|     const {lsh,idCard,serialNumber,projectsObj,ksdd,kslx,xldm} = judgeUI |     const {lsh,idCard,serialNumber,projectsObj,ksdd,kslx,xldm} = judgeUI | ||||||
|     const time = await getCurrentTime(); |     const time = await getCurrentTime(); | ||||||
|     const project = projectsObj[ksxm] |     const project = projectsObj[ksxm] | ||||||
|     const sbxh = getSbbm(ksxm, xmxh) |     const sbxh = getSbbm(ksxm, xmxh || this.xmxh) | ||||||
|     const data = { |     const data = { | ||||||
|       //系统类别   接口序列号             接口标识
 |       //系统类别   接口序列号             接口标识
 | ||||||
|       xtlb: '17', jkxlh: serialNumber, jkid: '17C52', |       xtlb: '17', jkxlh: serialNumber, jkid: '17C52', | ||||||
| @ -572,15 +572,15 @@ export default class Judge { | |||||||
|     promptWxCode('17C52', code) |     promptWxCode('17C52', code) | ||||||
|   } |   } | ||||||
|   // 项目结束接口同步
 |   // 项目结束接口同步
 | ||||||
|   endProject = async (ksxm) => { |   endProject = async (ksxm,xmxh?:string) => { | ||||||
|     const carInfo = globalThis.carInfo; |     const carInfo = globalThis.carInfo; | ||||||
|     const deviceNo = globalThis.deviceNo; |     const deviceNo = globalThis.deviceNo; | ||||||
|     const { examSubject,plateNo,carNo } = carInfo; |     const { examSubject,plateNo,carNo } = carInfo; | ||||||
|     const {judgeUI,fileLog,getSbxh,xmxh,getSbbm,filePath} = this; |     const {judgeUI,fileLog,getSbxh,getSbbm,filePath} = this; | ||||||
|     const {lsh,idCard,serialNumber,projectsObj,cdsbInfoObj,ksdd,kslx,xldm,} = judgeUI |     const {lsh,idCard,serialNumber,projectsObj,cdsbInfoObj,ksdd,kslx,xldm,} = judgeUI | ||||||
|     const time = await getCurrentTime(); |     const time = await getCurrentTime(); | ||||||
|     const project = projectsObj[ksxm] |     const project = projectsObj[ksxm] | ||||||
|     const sbxh = examSubject == 3 ? undefined : getSbbm(ksxm, xmxh) |     const sbxh = examSubject == 3 ? undefined : getSbbm(ksxm, xmxh || this.xmxh) | ||||||
| 
 | 
 | ||||||
|     const data = { |     const data = { | ||||||
|       xtlb: '17', jkxlh: serialNumber, jkid: '17C55', |       xtlb: '17', jkxlh: serialNumber, jkid: '17C55', | ||||||
| @ -1066,7 +1066,7 @@ export default class Judge { | |||||||
|         if (!isEnd) { |         if (!isEnd) { | ||||||
|           judgeTask.addTask(async () => { |           judgeTask.addTask(async () => { | ||||||
|             console.info(judgeTag, `项目开始-${xmdm}-${projectsObj[xmdm].name}`) |             console.info(judgeTag, `项目开始-${xmdm}-${projectsObj[xmdm].name}`) | ||||||
|             await beginProject(xmdm) |             await beginProject(xmdm,xmxh) | ||||||
|           }, { |           }, { | ||||||
|             isDelay: true |             isDelay: true | ||||||
|           }) |           }) | ||||||
| @ -1095,7 +1095,7 @@ export default class Judge { | |||||||
|           if (!projectIsEnd) { |           if (!projectIsEnd) { | ||||||
|             judgeTask.addTask(async () => { |             judgeTask.addTask(async () => { | ||||||
|               console.info(judgeTag, `项目结束-${xmdm}-${projectsObj[xmdm].name}`) |               console.info(judgeTag, `项目结束-${xmdm}-${projectsObj[xmdm].name}`) | ||||||
|               await endProject(xmdm); |               await endProject(xmdm,xmxh) | ||||||
|               this.xmmcSingleCode = 0; |               this.xmmcSingleCode = 0; | ||||||
|               this.xmmcEndCode = undefined; |               this.xmmcEndCode = undefined; | ||||||
|             }, { |             }, { | ||||||
| @ -1714,7 +1714,7 @@ export default class Judge { | |||||||
|   // 检测差分状态
 |   // 检测差分状态
 | ||||||
|   checkDwzt = async (type) => { |   checkDwzt = async (type) => { | ||||||
|     const {avPlayer} = this; |     const {avPlayer} = this; | ||||||
|     const judgeConfig = this.judgeUI.judgeConfig; |     const config499 = this.judgeUI.judgeConfigObj['499']; | ||||||
|     switch (type) { |     switch (type) { | ||||||
|       case 0: |       case 0: | ||||||
|         this.judgeUI.isDwztRight = true; |         this.judgeUI.isDwztRight = true; | ||||||
| @ -1722,10 +1722,17 @@ export default class Judge { | |||||||
| 
 | 
 | ||||||
|       case 1: |       case 1: | ||||||
|         this.judgeUI.dwztErrorVisible = true; |         this.judgeUI.dwztErrorVisible = true; | ||||||
|  |         clearInterval(this.judgeUI.timer); | ||||||
|  |         clearInterval(globalThis.judgeTimer) | ||||||
|         avPlayer.playAudio([`voice/差分状态异常.mp3`], true) |         avPlayer.playAudio([`voice/差分状态异常.mp3`], true) | ||||||
|         setTimeout(() => { |         setTimeout(() => { | ||||||
|           router.back() |           try { | ||||||
|         }, 3000) |             this.checkExamIsEnd(true); | ||||||
|  |           } catch (e) { | ||||||
|  |             this.closeAllFiles() | ||||||
|  |             router.back() | ||||||
|  |           } | ||||||
|  |         }, config499 * 1000) | ||||||
|         break; |         break; | ||||||
| 
 | 
 | ||||||
|       case 2: |       case 2: | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user