修复了部分问题
This commit is contained in:
parent
6f76677c3e
commit
db2ab39168
@ -204,6 +204,7 @@ struct UserInfo {
|
|||||||
if (!globalThis.singlePlay) {
|
if (!globalThis.singlePlay) {
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
if (routerParam.type != 1) {
|
if (routerParam.type != 1) {
|
||||||
|
console.info('surenjun', 'Judge返回到UserInfo界面')
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.list = await getSyncData('USERLIST')
|
this.list = await getSyncData('USERLIST')
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@ -212,23 +213,11 @@ struct UserInfo {
|
|||||||
console.log('useruser1,', JSON.stringify(data))
|
console.log('useruser1,', JSON.stringify(data))
|
||||||
|
|
||||||
const user = data[0]
|
const user = data[0]
|
||||||
if (user && Number(user.kssycs)) {
|
if (!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')
|
|
||||||
this.list = this.list.filter(res => {
|
this.list = this.list.filter(res => {
|
||||||
return res.sfzmhm != user.sfzmhm
|
return res.sfzmhm != user.sfzmhm
|
||||||
})
|
})
|
||||||
|
}
|
||||||
this.pageIndex = 0
|
this.pageIndex = 0
|
||||||
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
|
||||||
if (this.dataList.length) {
|
if (this.dataList.length) {
|
||||||
@ -239,12 +228,47 @@ struct UserInfo {
|
|||||||
}, 200)
|
}, 200)
|
||||||
} else {
|
} else {
|
||||||
this.currentUser = EmptyCandidateObject
|
this.currentUser = EmptyCandidateObject
|
||||||
}
|
globalThis.lsh = '1111111111111'
|
||||||
}
|
}
|
||||||
this.list.forEach((res, index) => {
|
this.list.forEach((res, index) => {
|
||||||
res.id = index.toString()
|
res.id = index.toString()
|
||||||
})
|
})
|
||||||
await upDateTableByArray('USERLIST', this.list || [])
|
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 {
|
} else {
|
||||||
await this.getExaminationStudentInfoFn()
|
await this.getExaminationStudentInfoFn()
|
||||||
}
|
}
|
||||||
@ -339,7 +363,6 @@ struct UserInfo {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.currentUser = this.list[0]
|
this.currentUser = this.list[0]
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
this.currentUser.ksy2 = globalThis.kgxm
|
||||||
|
|
||||||
globalThis.lsh = this.currentUser.lsh
|
globalThis.lsh = this.currentUser.lsh
|
||||||
}, 200)
|
}, 200)
|
||||||
|
|
||||||
@ -637,19 +660,15 @@ struct UserInfo {
|
|||||||
this.ksksLimit = false
|
this.ksksLimit = false
|
||||||
// this.isBoardPrePareSetPopupOpen=true
|
// this.isBoardPrePareSetPopupOpen=true
|
||||||
this.isFirstBoardPrePareSetPopupBtnShow = false
|
this.isFirstBoardPrePareSetPopupBtnShow = false
|
||||||
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow,
|
console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow, this.isBoardPrePareSetPopupOpen)
|
||||||
this.isBoardPrePareSetPopupOpen)
|
|
||||||
this.startExam = false
|
this.startExam = false
|
||||||
// await upDateTableByArray('USER', [])
|
// await upDateTableByArray('USER', [])
|
||||||
// await upDateTableByArray('USERLIST', [])
|
// await upDateTableByArray('USERLIST', [])
|
||||||
// await DB.clearTable('USER')
|
|
||||||
// await DB.clearTable('USERLIST')
|
|
||||||
this.type = '2'
|
this.type = '2'
|
||||||
this.errorDialog.open()
|
this.errorDialog.open()
|
||||||
this.updateTimeLimit = true
|
this.updateTimeLimit = true
|
||||||
const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId +
|
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>`
|
||||||
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 {
|
try {
|
||||||
getExaminationStudentInfo(param).then(async (res) => {
|
getExaminationStudentInfo(param).then(async (res) => {
|
||||||
console.log("temp log ", JSON.stringify(res))
|
console.log("temp log ", JSON.stringify(res))
|
||||||
@ -719,23 +738,24 @@ struct UserInfo {
|
|||||||
return res.kssycs == '1'
|
return res.kssycs == '1'
|
||||||
})
|
})
|
||||||
if (this.dataList.length) {
|
if (this.dataList.length) {
|
||||||
if (user.length) {
|
// if (user.length) {
|
||||||
setTimeout(() => {
|
// setTimeout(() => {
|
||||||
this.currentUser = user[0]
|
// this.currentUser = user[0]
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
// this.currentUser.ksy2 = globalThis.kgxm
|
||||||
globalThis.lsh = this.currentUser.lsh
|
// globalThis.lsh = this.currentUser.lsh
|
||||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
// globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||||
}, 200)
|
// }, 200)
|
||||||
} else {
|
// } else {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.currentUser = this.dataList[0]
|
this.currentUser = this.dataList[0]
|
||||||
this.currentUser.ksy2 = globalThis.kgxm
|
this.currentUser.ksy2 = globalThis.kgxm
|
||||||
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
globalThis.ksyh = this.currentUser.ksy1sfzmhm
|
||||||
globalThis.lsh = this.currentUser.lsh
|
globalThis.lsh = this.currentUser.lsh
|
||||||
}, 200)
|
}, 200)
|
||||||
}
|
// }
|
||||||
} else {
|
} else {
|
||||||
this.currentUser = EmptyCandidateObject
|
this.currentUser = EmptyCandidateObject
|
||||||
|
globalThis.lsh = '1111111111111'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -800,8 +820,7 @@ struct UserInfo {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('JsonJson', JSON.stringify(this.currentUser))
|
console.log('JsonJson', JSON.stringify(this.currentUser))
|
||||||
const param =
|
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>`
|
||||||
`<?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)
|
console.log('carNo1111', param)
|
||||||
|
|
||||||
examinationStuAbsent(param).then(res => {
|
examinationStuAbsent(param).then(res => {
|
||||||
@ -1125,13 +1144,11 @@ struct UserInfo {
|
|||||||
}
|
}
|
||||||
.width(165 * this.ratio)
|
.width(165 * this.ratio)
|
||||||
.height(85 * this.ratio)
|
.height(85 * this.ratio)
|
||||||
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') :
|
.backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg'))
|
||||||
$r('app.media.userboxbg'))
|
|
||||||
.backgroundImageSize({ width: '100%', height: '100%' })
|
.backgroundImageSize({ width: '100%', height: '100%' })
|
||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
|
console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
|
||||||
if ((this.isExamStart && !globalThis.singlePlay && this.systemParam.Param341) ||
|
if (this.startExam && this.systemParam.Param364 == '2') {
|
||||||
(this.startExam && this.systemParam.Param364 == '2')) {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.currentUser = EmptyCandidateObject
|
this.currentUser = EmptyCandidateObject
|
||||||
@ -1205,6 +1222,9 @@ struct UserInfo {
|
|||||||
// .commStyle()
|
// .commStyle()
|
||||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
|
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
|
||||||
.margin({ bottom: 12 * this.ratio })
|
.margin({ bottom: 12 * this.ratio })
|
||||||
|
.onClick(() => {
|
||||||
|
globalThis.judgeUdp.askVoice()
|
||||||
|
})
|
||||||
|
|
||||||
// Image($r('app.media.gx_btn'))
|
// Image($r('app.media.gx_btn'))
|
||||||
// .commStyle()
|
// .commStyle()
|
||||||
@ -1226,17 +1246,14 @@ struct UserInfo {
|
|||||||
.onClick(() => {
|
.onClick(() => {
|
||||||
// this.avPlayer.playAudio(['button_media.wav'])
|
// this.avPlayer.playAudio(['button_media.wav'])
|
||||||
// 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考
|
// 已开始考试不能缺考 已考过一次学员不能缺考 车上不能缺考
|
||||||
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') ||
|
if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') {
|
||||||
this.systemParam.Param770Str == '1') {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.ksksLimit = true
|
this.ksksLimit = true
|
||||||
this.qkFlag = true
|
this.qkFlag = true
|
||||||
})
|
})
|
||||||
|
|
||||||
if (this.isBoardPrePareSetPopupOpen &&
|
if (this.isBoardPrePareSetPopupOpen && (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') && !this.isFirstBoardPrePareSetPopupBtnShow) {
|
||||||
(this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') &&
|
|
||||||
!this.isFirstBoardPrePareSetPopupBtnShow) {
|
|
||||||
//上车准备
|
//上车准备
|
||||||
// Image($r('app.media.sczb_btn')).commStyle()
|
// Image($r('app.media.sczb_btn')).commStyle()
|
||||||
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })
|
imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user