修复了部分问题
This commit is contained in:
wangzhongjie
parent
6f76677c3e
commit
db2ab39168
@ -98,7 +98,7 @@ struct UserInfo {
|
||||
if (singlePlay) {
|
||||
return ''
|
||||
} else {
|
||||
const { filePhoto } = this;
|
||||
const {filePhoto} = this;
|
||||
const photoBase64 = await filePhoto.getPhoto();
|
||||
return photoBase64
|
||||
}
|
||||
@ -119,7 +119,7 @@ struct UserInfo {
|
||||
this.ksksLimit = true
|
||||
|
||||
if (globalThis.singlePlay) {
|
||||
const { examSubject } = globalThis.carInfo;
|
||||
const {examSubject} = globalThis.carInfo;
|
||||
this.currentUser.id = '0'
|
||||
await upDateTableByArray('USER', [this.currentUser])
|
||||
router.pushUrl({
|
||||
@ -204,6 +204,7 @@ struct UserInfo {
|
||||
if (!globalThis.singlePlay) {
|
||||
// @ts-ignore
|
||||
if (routerParam.type != 1) {
|
||||
console.info('surenjun', 'Judge返回到UserInfo界面')
|
||||
// @ts-ignore
|
||||
this.list = await getSyncData('USERLIST')
|
||||
// @ts-ignore
|
||||
@ -212,39 +213,62 @@ struct UserInfo {
|
||||
console.log('useruser1,', JSON.stringify(data))
|
||||
|
||||
const user = data[0]
|
||||
if (user && Number(user.kssycs)) {
|
||||
let flag = false
|
||||
this.list.forEach(res => {
|
||||
if (res.sfzmhm == user.sfzmhm) {
|
||||
flag = true
|
||||
res.kssycs = user.kssycs
|
||||
this.getCurrentStudent(res.sfzmhm)
|
||||
}
|
||||
})
|
||||
if (!flag) {
|
||||
this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
|
||||
}
|
||||
} else if (user && (user.kssycs == '0' || user.kssycs == '')) {
|
||||
console.log('datadatadatadata')
|
||||
if (!Number(user.kssycs)) {
|
||||
this.list = this.list.filter(res => {
|
||||
return res.sfzmhm != user.sfzmhm
|
||||
})
|
||||
this.pageIndex = 0
|
||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||
if (this.dataList.length) {
|
||||
setTimeout(() => {
|
||||
this.currentUser = this.dataList[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
}, 200)
|
||||
} else {
|
||||
this.currentUser = EmptyCandidateObject
|
||||
}
|
||||
}
|
||||
this.pageIndex = 0
|
||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||
if (this.dataList.length) {
|
||||
setTimeout(() => {
|
||||
this.currentUser = this.dataList[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
}, 200)
|
||||
} else {
|
||||
this.currentUser = EmptyCandidateObject
|
||||
globalThis.lsh = '1111111111111'
|
||||
}
|
||||
this.list.forEach((res, index) => {
|
||||
res.id = index.toString()
|
||||
})
|
||||
await upDateTableByArray('USERLIST', this.list || [])
|
||||
|
||||
// if(this.)
|
||||
// if (user && Number(user.kssycs)) {
|
||||
//
|
||||
// let flag = false
|
||||
// this.list.forEach(res => {
|
||||
// if (res.sfzmhm == user.sfzmhm) {
|
||||
// flag = true
|
||||
// res.kssycs = user.kssycs
|
||||
// this.getCurrentStudent(res.sfzmhm)
|
||||
// }
|
||||
// })
|
||||
// if (!flag) {
|
||||
// this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
|
||||
// globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111'
|
||||
// }
|
||||
// } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
|
||||
// console.log('datadatadatadata')
|
||||
// this.list = this.list.filter(res => {
|
||||
// return res.sfzmhm != user.sfzmhm
|
||||
// })
|
||||
// this.pageIndex = 0
|
||||
// this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||
// if (this.dataList.length) {
|
||||
// setTimeout(() => {
|
||||
// this.currentUser = this.dataList[0]
|
||||
// this.currentUser.ksy2 = globalThis.kgxm
|
||||
// globalThis.lsh = this.currentUser.lsh
|
||||
// }, 200)
|
||||
// } else {
|
||||
// this.currentUser = EmptyCandidateObject
|
||||
// globalThis.lsh = '1111111111111'
|
||||
// }
|
||||
// }
|
||||
|
||||
} else {
|
||||
await this.getExaminationStudentInfoFn()
|
||||
}
|
||||
@ -312,7 +336,7 @@ struct UserInfo {
|
||||
|
||||
globalThis.lsh = res.lsh
|
||||
globalThis.ksyh = res.ksy1sfzmhm
|
||||
const { examSubject } = globalThis.carInfo;
|
||||
const {examSubject} = globalThis.carInfo;
|
||||
// this.currentUser.kszp=this.photo+res.kszp
|
||||
// this.currentUser.ksmjzp=this.photo+this.currentUser.ksmjzp
|
||||
if (globalThis.singlePlay) {
|
||||
@ -339,7 +363,6 @@ struct UserInfo {
|
||||
setTimeout(() => {
|
||||
this.currentUser = this.list[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
}, 200)
|
||||
|
||||
@ -637,19 +660,15 @@ struct UserInfo {
|
||||
this.ksksLimit = false
|
||||
// this.isBoardPrePareSetPopupOpen=true
|
||||
this.isFirstBoardPrePareSetPopupBtnShow = false
|
||||
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow,
|
||||
this.isBoardPrePareSetPopupOpen)
|
||||
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow, this.isBoardPrePareSetPopupOpen)
|
||||
this.startExam = false
|
||||
// await upDateTableByArray('USER', [])
|
||||
// await upDateTableByArray('USERLIST', [])
|
||||
// await DB.clearTable('USER')
|
||||
// await DB.clearTable('USERLIST')
|
||||
|
||||
this.type = '2'
|
||||
this.errorDialog.open()
|
||||
this.updateTimeLimit = true
|
||||
const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId +
|
||||
globalThis.carInfo.examinationRoomId +
|
||||
globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
|
||||
const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
|
||||
try {
|
||||
getExaminationStudentInfo(param).then(async (res) => {
|
||||
console.log("temp log ", JSON.stringify(res))
|
||||
@ -719,23 +738,24 @@ struct UserInfo {
|
||||
return res.kssycs == '1'
|
||||
})
|
||||
if (this.dataList.length) {
|
||||
if (user.length) {
|
||||
setTimeout(() => {
|
||||
this.currentUser = user[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||
}, 200)
|
||||
} else {
|
||||
setTimeout(() => {
|
||||
this.currentUser = this.dataList[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
}, 200)
|
||||
}
|
||||
// if (user.length) {
|
||||
// setTimeout(() => {
|
||||
// this.currentUser = user[0]
|
||||
// this.currentUser.ksy2 = globalThis.kgxm
|
||||
// globalThis.lsh = this.currentUser.lsh
|
||||
// globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||
// }, 200)
|
||||
// } else {
|
||||
setTimeout(() => {
|
||||
this.currentUser = this.dataList[0]
|
||||
this.currentUser.ksy2 = globalThis.kgxm
|
||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||
globalThis.lsh = this.currentUser.lsh
|
||||
}, 200)
|
||||
// }
|
||||
} else {
|
||||
this.currentUser = EmptyCandidateObject
|
||||
globalThis.lsh = '1111111111111'
|
||||
}
|
||||
|
||||
|
||||
@ -800,8 +820,7 @@ struct UserInfo {
|
||||
return
|
||||
}
|
||||
console.log('JsonJson', JSON.stringify(this.currentUser))
|
||||
const param =
|
||||
`<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
|
||||
const param = `<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
|
||||
console.log('carNo1111', param)
|
||||
|
||||
examinationStuAbsent(param).then(res => {
|
||||
@ -837,7 +856,7 @@ struct UserInfo {
|
||||
return
|
||||
}
|
||||
const carInfo = globalThis.carInfo;
|
||||
const { carId, examinationRoomId } = carInfo;
|
||||
const {carId,examinationRoomId} = carInfo;
|
||||
const examItems = await getExaminationItem({
|
||||
time: getCurrentTime(),
|
||||
carId,
|
||||
@ -859,7 +878,7 @@ struct UserInfo {
|
||||
globalThis.statue = 4
|
||||
this.stepFlag = true
|
||||
const carInfo = globalThis.carInfo;
|
||||
const { carId, examinationRoomId } = carInfo;
|
||||
const {carId,examinationRoomId} = carInfo;
|
||||
let examItems = { getExaminationItemRsp: { body: { ykxx: '' } } };
|
||||
if (!globalThis.singlePlay) {
|
||||
//获取已考项目
|
||||
@ -877,7 +896,7 @@ struct UserInfo {
|
||||
|
||||
avPlayer.playAudio([`voice/监管通信中.mp3`], false, async () => {
|
||||
console.info('surenjun', '播放结束开始考试接口调用')
|
||||
const { code, keystr, message } = await this.beginExam() || {};
|
||||
const {code,keystr,message} = await this.beginExam() || {};
|
||||
console.info('surenjun', '开始考试接口调用结束')
|
||||
// console.info('surenjun',code +'')
|
||||
//@ts-ignore TODO code转换
|
||||
@ -914,8 +933,8 @@ struct UserInfo {
|
||||
|
||||
// 检测车门、熄火信号
|
||||
async checkSignal(): Promise<boolean> {
|
||||
const { isCheckFireOpen } = judgeConfig
|
||||
const { systemParam, isBoardPrePareSetPopupOpen } = this;
|
||||
const {isCheckFireOpen} = judgeConfig
|
||||
const {systemParam,isBoardPrePareSetPopupOpen} = this;
|
||||
const Param803Str = systemParam.Param803Str
|
||||
if (Param803Str === '') {
|
||||
return true
|
||||
@ -1020,8 +1039,8 @@ struct UserInfo {
|
||||
// 开始考试
|
||||
async beginExam() {
|
||||
const carInfo = globalThis.carInfo;
|
||||
const { carId, examinationRoomId } = carInfo;
|
||||
const { examSubject, plateNo } = carInfo;
|
||||
const {carId,examinationRoomId} = carInfo;
|
||||
const { examSubject,plateNo } = carInfo;
|
||||
const date = new Date()
|
||||
globalThis.startHourTime = await getCurrentHourTime()
|
||||
const photoBase64 = await this.getPhoto();
|
||||
@ -1125,13 +1144,11 @@ struct UserInfo {
|
||||
}
|
||||
.width(165 * this.ratio)
|
||||
.height(85 * this.ratio)
|
||||
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') :
|
||||
$r('app.media.userboxbg'))
|
||||
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg'))
|
||||
.backgroundImageSize({ width: '100%', height: '100%' })
|
||||
.onClick(() => {
|
||||
console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
|
||||
if ((this.isExamStart && !globalThis.singlePlay && this.systemParam.Param341) ||
|
||||
(this.startExam && this.systemParam.Param364 == '2')) {
|
||||
if (this.startExam && this.systemParam.Param364 == '2') {
|
||||
return
|
||||
}
|
||||
this.currentUser = EmptyCandidateObject
|
||||
@ -1205,6 +1222,9 @@ struct UserInfo {
|
||||
// .commStyle()
|
||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
|
||||
.margin({ bottom: 12 * this.ratio })
|
||||
.onClick(() => {
|
||||
globalThis.judgeUdp.askVoice()
|
||||
})
|
||||
|
||||
// Image($r('app.media.gx_btn'))
|
||||
// .commStyle()
|
||||
@ -1226,17 +1246,14 @@ struct UserInfo {
|
||||
.onClick(() => {
|
||||
// this.avPlayer.playAudio(['button_media.wav'])
|
||||
// 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考
|
||||
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') ||
|
||||
this.systemParam.Param770Str == '1') {
|
||||
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') {
|
||||
return
|
||||
}
|
||||
this.ksksLimit = true
|
||||
this.qkFlag = true
|
||||
})
|
||||
|
||||
if (this.isBoardPrePareSetPopupOpen &&
|
||||
(this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') &&
|
||||
!this.isFirstBoardPrePareSetPopupBtnShow) {
|
||||
if (this.isBoardPrePareSetPopupOpen && (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') && !this.isFirstBoardPrePareSetPopupBtnShow) {
|
||||
//上车准备
|
||||
// Image($r('app.media.sczb_btn')).commStyle()
|
||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user