Compare commits

..

No commits in common. "ef0390bbb34f970fae1c2ccb476cc57b9bc6a883" and "4b5b5e7c293a62603c43c9c4d108d7a92ca2d3c3" have entirely different histories.

2 changed files with 46 additions and 7 deletions

View File

@ -25,6 +25,7 @@ export async function getDeviceInfo(context) {
const fileData=JSON.parse(data)
globalThis.deviceNo = fileData.deviceName
console.log('globalThis.deviceNo', globalThis.deviceNo)
// getCarInfo()
resolve(fileData.deviceName)
}
})
@ -44,6 +45,7 @@ export async function getCarInfo() {
} else {
globalThis.carInfo = res.obtainCarExamInfoRsp.body
console.log('globalThis.carInfo2222', JSON.stringify(res));
// globalThis.carInfo.carId=res.obtainCarExamInfoRsp.body.carId
globalThis.carInfo.plateNo = decodeURIComponent(globalThis.carInfo.plateNo)
}
return res

View File

@ -413,14 +413,8 @@ struct Index {
this.loading = true
console.log("sql 1111")
getSingleCenterTable(param).then(async (ret) => {
getSingleCenterTable(param).then((ret) => {
if (ret) {
const result = await getSyncData('ES_CARINFO')
const carInfo = result[0] || {};
if (carInfo.kscx == 'A2') {
// A2牵引车2号导航仪
await getUDPGps2(this.context, false)
}
getSyncData('MA_SYSSET').then(data => {
console.log('datadata', JSON.stringify(data))
// @ts-ignore
@ -447,6 +441,47 @@ struct Index {
}
})
// workerInstance.postMessage(param);
// workerInstance.onmessage = (e: MessageEvents): void => {
// console.log("baoyihu after postMessage :", JSON.stringify(e.data));
// // @ts-ignore
// let workData: WorkData = e.data;
// this.loading = false
// if (workData.isComplete) {
// if(globalThis.singlePlay){
// router.pushUrl({
// url: 'pages/UserInfo',
// }, router.RouterMode.Single)
// return
// }
// getSyncData('MA_SYSSET').then(data => {
// console.log('datadata', JSON.stringify(data))
// // @ts-ignore
// data.forEach(sys => {
// //判断是否能点开始考试
// if(sys.v_no === '854'){
// globalThis.param854Str=sys.v_value
// }
// if (sys.v_no === '824'&&decodeURIComponent(sys.v_value)=='0') {
// // this.Param612Str= decodeURIComponent(sys.v_value)
// router.pushUrl({
// url:'pages/CarCheck',
// params: {
// 'fromIndex':true
// }
// }, router.RouterMode.Single)
// }else{
// router.pushUrl({
// url: 'pages/ExaminerLogin',
// }, router.RouterMode.Single)
// }
// })
// });
//
// }
// workerInstance.terminate();
//
// }
}
async heartMsg() {
@ -539,6 +574,8 @@ struct Index {
// deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress + '/PLC/')
//设置plc udp 同步requesthost
await getUDP(this.context, false)
// A2牵引车2号导航仪
await getUDPGps2(this.context, false)
this.loading = false
await getDeviceInfo(this.context)