From 92ab9ef7b57b00dc4406bc581c75dc154e5ad5aa Mon Sep 17 00:00:00 2001 From: lvyuankang <1344032923@qq.com> Date: Wed, 19 Feb 2025 13:09:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/model/api.ets | 11 ++++++++++- entry/src/main/ets/pages/CarCheck.ets | 4 ++-- entry/src/main/ets/pages/ExaminerLogin.ets | 4 ++-- entry/src/main/ets/pages/UserInfo.ets | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index aefcb723..bbb88153 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -28,7 +28,16 @@ export interface Carinfo { isNeedCheck: string; examSubject:number| string; } -export interface examinerLoginInfo{ +export interface ExaminerLoginInfo{ + carId?: string; + examinationRoomId?: string; + examinerName?: string; + examinerPwd?: string; + username?: string; + kgxm?:string; + ksyh?:string; +} +export interface Spzd{ carId?: string; examinationRoomId?: string; examinerName?: string; diff --git a/entry/src/main/ets/pages/CarCheck.ets b/entry/src/main/ets/pages/CarCheck.ets index ee9c1dda..30d59adf 100644 --- a/entry/src/main/ets/pages/CarCheck.ets +++ b/entry/src/main/ets/pages/CarCheck.ets @@ -8,7 +8,7 @@ import { DwMapData, PassData, RealNumData, StackValueData, WarnFlagData, WarnFla import { BaseInfoType } from '../model/Common'; import { CarCheckDataType, CarConfigurationParams, CarInfoType } from '../model/CarCheck'; import { BusinessError } from '@ohos.base'; -import { Carinfo } from '../model'; +import { Carinfo, Spzd } from '../model'; @Entry @Component @@ -314,7 +314,7 @@ struct Index { that.passArray[index] = true if (index == 2) { let flag = false - const spzd = AppStorage.get('spzd') + const spzd:Spzd = AppStorage.get('spzd') for (let key in pzd) { if (spzd[key]) { that.warnFlag[index] = '1' diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index bf67cc06..f0a1a917 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -8,7 +8,7 @@ import { UserLoginType } from '../model/ExaminerLogin'; import { BusinessError } from '@ohos.base'; import { CarCheckDataType } from '../model/CarCheck'; import { examinerLogin } from '../api/login'; -import { examinerLoginInfo,Carinfo } from '../model/index' +import { ExaminerLoginInfo,Carinfo } from '../model/index' @Entry @@ -129,7 +129,7 @@ struct Index { }, router.RouterMode.Single); console.log('res11', JSON.stringify(res)) - const examinerLoginInfo: examinerLoginInfo = res.examinerLoginRsp.body + const examinerLoginInfo: ExaminerLoginInfo = res.examinerLoginRsp.body examinerLoginInfo.username = this.inputTextArr[0] AppStorage.setOrCreate('examinerLoginInfo', examinerLoginInfo) }).catch((err: BusinessError) => { diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index c9600fee..d1db1203 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -23,7 +23,7 @@ import FileUtil from '../common/utils/File'; import DB, { ColumnType } from '../common/database/DbSql'; import { LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; import { BusinessError } from '@ohos.base'; -import {Carinfo,examinerLoginInfo} from '../model/index' +import {Carinfo,ExaminerLoginInfo} from '../model/index' @Entry @Component struct UserInfo { @@ -81,7 +81,7 @@ struct UserInfo { isNeedCheck: '', examSubject:'' } - @State examinerLoginInfo: examinerLoginInfo = { + @State examinerLoginInfo: ExaminerLoginInfo = { carId: '', examinationRoomId: '', plateNo: '', From d6eaf825afd09561efb9245de3fd560b892fd4b8 Mon Sep 17 00:00:00 2001 From: lvyuankang <1344032923@qq.com> Date: Wed, 19 Feb 2025 13:22:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/model/api.ets | 9 +++++++++ entry/src/main/ets/pages/UserInfo.ets | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index bbb88153..85351645 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -45,4 +45,13 @@ export interface Spzd{ username?: string; kgxm?:string; ksyh?:string; +} +export interface IdCard{ + name?: string; + sex?: string; + nation?: string; + born?: string; + address?: string; + idCard?:string; + photo?:string; } \ No newline at end of file diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index d1db1203..11206150 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -21,7 +21,7 @@ import errorMsgDialog from './compontents/errorMsgDialog'; import imageBtn from './compontents/imageBtn'; import FileUtil from '../common/utils/File'; import DB, { ColumnType } from '../common/database/DbSql'; -import { LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; +import { IdCard, LabelBlockType, QKParamType, SckType, SystemParamType, User } from '../model'; import { BusinessError } from '@ohos.base'; import {Carinfo,ExaminerLoginInfo} from '../model/index' @Entry @@ -361,7 +361,7 @@ struct UserInfo { onReadCard(ret: IDCardSDK.IDCardInfo) { console.info(`zzctest xx Read Card ret =${ret.status}`) - let thisVar = AppStorage.get('indexComponent'); + let thisVar:IdCard = AppStorage.get('indexComponent'); if (ret.status == 0) { // status = 1 为读到身份证信息； status = 1 为身份证离开读卡器 // 收到身份证离开读卡器的事件通知，根据实际业务需要决定是否需要清空之前已读取的身份证信息。