Merge branch 'main' of http://47.122.70.237:3000/harmony_car/harmony_vehicle_terminal
This commit is contained in:
		
						commit
						077c58fdef
					
				| @ -499,8 +499,7 @@ struct JudgePage { | ||||
|         TXT3: decodeURIComponent(systemParm.txt3 || ""), | ||||
|       }) | ||||
|     }) | ||||
|     dConsole.info(JudgeTag, '考试项目', JSON.stringify(this.ddxkKsxmArr)) | ||||
|     dConsole.log(JudgeTag, "考试项目", this.projects) | ||||
|     dConsole.log(JudgeTag, "考试项目", JSON.stringify(this.projects)) | ||||
|     if (!this.projects.length) { | ||||
|       Prompt.showToast({ | ||||
|         message: '读取数据库信息失败,请重新联网更新!', | ||||
|  | ||||
| @ -190,7 +190,7 @@ export default struct JudgeAndProjectComponent { | ||||
|                   ListItem() { | ||||
|                     Text(project.name) { | ||||
|                     } | ||||
|                     .fontColor(this.getProjectColor(project)) | ||||
|                     .fontColor(this.getProjectColor(Reflect.get(this.projectsObj,project.projectCode))) | ||||
|                     .margin({ bottom: 2 }) | ||||
|                     .fontSize(24) | ||||
|                   }.margin({ bottom: 2 }) | ||||
|  | ||||
| @ -1095,14 +1095,6 @@ export default class Judge { | ||||
|         const project: ProjectInfo = Reflect.get(projectsObj, xmdm) | ||||
|         const code = project.projectCodeCenter; | ||||
|         const isEnd = project.isEnd; | ||||
|       // const kmCode = getKmProjectVoice(code, 1, judgeConfigObj, lane, xmxh) | ||||
|       // if (!ignoreVoiceCodeArr.includes(code)) { | ||||
|       //   if(examSubject == 2 && ((xmdm == 0 && f == 2) || (xmdm == 1 && s == 2) || xmdm == 3)){ | ||||
|       //     //倒出入库、桩考\进项目语音控制 | ||||
|       //   }else{ | ||||
|       //     kmCode && avPlayer.playAudio([`voice/${kmCode}.mp3`],true) | ||||
|       //   } | ||||
|       // } | ||||
|         setTimeout(() => { | ||||
|           if (Reflect.get(param512, 7) != 0) { | ||||
|             clearTimeout(this.deductedPopShowTimer) | ||||
| @ -1124,7 +1116,7 @@ export default class Judge { | ||||
|             isDelay: true | ||||
|           }) | ||||
|           project.isUpload = true; | ||||
|           Reflect.set(this.judgeUI.projects, xmdm, project) | ||||
|           // Reflect.set(this.judgeUI.projectsObj, xmdm, project) | ||||
|         } | ||||
|         break; | ||||
| 
 | ||||
| @ -1158,7 +1150,7 @@ export default class Judge { | ||||
|           }, (Reflect.get(param512!, 5) || 0) * 1000) | ||||
|         } | ||||
|         project.isEnd = true; | ||||
|         Reflect.set(this.judgeUI.projects, xmdm, project) | ||||
|         // Reflect.set(this.judgeUI.projectsObj, xmdm, project) | ||||
|         break; | ||||
|       } | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user