harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	entry/src/main/ets/pages/UserInfo.ets
This commit is contained in:
surenjun 2025-03-27 10:33:15 +08:00
commit b6bbba02e8
2 changed files with 66 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
entry/src/main/ets/mock/CarCheck.ets
View File

@ -136,8 +136,8 @@ export const RealNumData = {
8: 18,
9: 5,
10: 29,
11: 30,
12: 31,
11: 31,
12: 30,
13: 32,
14: 28,
15: 28,

108
entry/src/main/ets/pages/UserInfo.ets
View File

@ -209,48 +209,66 @@ struct UserInfo {
this.list = await getSyncData('USERLIST')
// @ts-ignore
const data = await getSyncData('USER')
console.log('useruser,', JSON.stringify(this.list))
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)
globalThis.lsh =
this.list.length
? this.currentUser.lsh
:'1111111111111'
console.info('surenjun 当前的流水号1为:' + globalThis.lsh)
}
} 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
console.info('surenjun 当前的流水号2为:' + globalThis.lsh)
}, 200)
} else {
this.currentUser = EmptyCandidateObject
globalThis.lsh = '1111111111111'
console.info('surenjun 当前的流水号3为:' + globalThis.lsh)
}
}
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()
}
@ -273,6 +291,7 @@ struct UserInfo {
//监听远程开始考试
globalThis.udpEvent.onBeginExam(async () => {
console.info('surenjun', 'userInfo收到UdpEvent事件')
if (this.isBoardPrePareSetPopupOpen && !this.isFirstBoardPrePareSetPopupBtnShow) {
await this.prePareSCZB()
} else {
@ -645,8 +664,7 @@ struct UserInfo {
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
@ -654,6 +672,8 @@ struct UserInfo {
try {
getExaminationStudentInfo(param).then(async (res) => {
console.log("temp log ", JSON.stringify(res))
await DB.clearTable('USER')
await DB.clearTable('USERLIST')
this.errorDialog.close()
setTimeout(() => {
this.updateTimeLimit = false
@ -718,21 +738,21 @@ 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 {
// 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'