Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
This commit is contained in:
		
						commit
						5c9af2b914
					
				| @ -88,7 +88,11 @@ export default class UdpClientByCenter { | ||||
|       //   time:dateFormat(new Date()),
 | ||||
|       //   PLC:`${TAG} getUDPudp rebind success`,
 | ||||
|       // })
 | ||||
|       this.udp && this.udp.on('message', this.message_1Fn); | ||||
|       const terType = this.retClass.terType | ||||
|       //TODO 临时处理过滤掉中心udp
 | ||||
|       if(localIpPort != '8800' && terType == 2){ | ||||
|         this.udp && this.udp.on('message', this.message_1Fn); | ||||
|       } | ||||
|     }).catch(err => { | ||||
|       //globalThis.closeHeartSocket=true
 | ||||
|       this.isWorking = false | ||||
| @ -105,12 +109,17 @@ export default class UdpClientByCenter { | ||||
|       address: this.localIp, port: parseInt(this.localIpPort), family: 1 | ||||
|     }); | ||||
|     promise.then(() => { | ||||
|       const localIpPort = this.localIpPort | ||||
|       this.isWorking = true | ||||
|       // this.writeLog({
 | ||||
|       //   time:dateFormat(new Date()),
 | ||||
|       //   PLC:`${TAG} getUDPudp bind success`,
 | ||||
|       // })
 | ||||
|       this.udp && this.udp.on('message', this.message_1Fn); | ||||
|       const terType = this.retClass.terType | ||||
|       //TODO 临时处理过滤掉中心udp
 | ||||
|       if(localIpPort != '8800' && terType == 2){ | ||||
|         this.udp && this.udp.on('message', this.message_1Fn); | ||||
|       } | ||||
|     }).catch(err => { | ||||
|       this.isWorking = false | ||||
|       console.info('surenjun err=>', JSON.stringify(err)) | ||||
|  | ||||
| @ -3747,7 +3747,7 @@ export default class Judge { | ||||
| 
 | ||||
|     //监听远程终止考试
 | ||||
|     globalThis.udpEvent.onStopExam(async () => { | ||||
|       const config392 = (this.judgeUI.judgeConfigObj['392'] || [20,'81']).split(','); | ||||
|       const config392 = (this.judgeUI.judgeConfigObj['392'] || '20,81').split(','); | ||||
|       this.setJudgeMark(config392[0]*1, config392[1], 2); | ||||
|     }) | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user