From f03ace7f04bf25f826db32dae350edcba441a103 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Wed, 2 Jul 2025 17:34:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BD=A6=E8=BE=86=E5=90=8E=E6=89=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BF=9B=E5=85=A5=E8=81=94=E7=BD=91=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=8D=95=E6=9C=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/model/Judge.ets | 4 ---- entry/src/main/ets/pages/Index.ets | 18 ++++++++++++++++-- entry/src/main/ets/pages/Index/Loading.ets | 2 +- entry/src/main/ets/pages/Judge.ets | 11 +---------- entry/src/main/ets/pages/Judge/Message.ets | 8 +++++++- entry/src/main/ets/pages/Judge/utils.ets | 3 ++- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/entry/src/main/ets/model/Judge.ets b/entry/src/main/ets/model/Judge.ets index 7dc3ef4..bebf75e 100644 --- a/entry/src/main/ets/model/Judge.ets +++ b/entry/src/main/ets/model/Judge.ets @@ -582,10 +582,6 @@ export interface ItemInfos { '1'?: ItemInfo } -// export const defaultCdsbInfoObj:DefaultJudgeConfigObj = { -// -// } - /****** 评判初始化数据*****/ export interface JudgeInitObj extends Km3JudgeInitConfig { diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 16f0b90..837f9d1 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -15,10 +15,10 @@ import { JudgeEmitterInstance } from '../utils/business/UdpEvent'; import HeaderComponent from './compontents/Header'; import CardComponent from './Index/Card'; import BottomMessageComponent from './Index/BottomMessage'; -import LoadingComponent from './Index/Loading'; import Prompt from '@system.prompt'; import { DifferentialAndSignal } from '../utils/business/DifferentialAndSignalWorker'; import { dConsole } from '../utils/LogWorker'; +import CarLoadingComponent from './Index/Loading'; @Entry @Component @@ -41,7 +41,7 @@ struct Index { @State initWork: boolean = false // 请求网络表等待弹窗 customDialogController: CustomDialogController = new CustomDialogController({ - builder: LoadingComponent(), + builder: CarLoadingComponent(), customStyle: true, alignment: DialogAlignment.Center, autoCancel: true @@ -222,10 +222,24 @@ struct Index { CardComponent({ isSingle: this.singlePlay, singleClick: () => { + if (this.deviceId === "") { + Prompt.showToast({ + message: `未获取到车辆信息,请检查网络!`, + duration: 3000 + }); + return + } dConsole.log(HomeTag, "单机模式点击") this.singlePlayerTraining() }, networkingClick: () => { + if (this.deviceId === "") { + Prompt.showToast({ + message: `未获取到车辆信息,请检查网络!`, + duration: 3000 + }); + return + } dConsole.log(HomeTag, "联网考试点击") this.onlineExam() } diff --git a/entry/src/main/ets/pages/Index/Loading.ets b/entry/src/main/ets/pages/Index/Loading.ets index d3e9f90..815f1b6 100644 --- a/entry/src/main/ets/pages/Index/Loading.ets +++ b/entry/src/main/ets/pages/Index/Loading.ets @@ -1,5 +1,5 @@ @CustomDialog -export default struct LoadingComponent { +export default struct CarLoadingComponent { @State angle: number = 0 private controller?: CustomDialogController; diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 4e10610..5f3a8d8 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -63,9 +63,6 @@ struct JudgePage { //页面通用字体大小 @State wayno: number = 0 @State isDdxk: boolean = false; - @State time: string = '' - //考试用时 - @State examTime: number = 0 //开始时间 @State startTime: string = '00:00:00' @State startFullTime: string = '' @@ -200,7 +197,6 @@ struct JudgePage { }) async aboutToDisappear() { - this.generateExamRecordsDialogController.close() clearInterval(this.mileageTimer) } @@ -208,13 +204,9 @@ struct JudgePage { this.carInfo = AppStorage.get('carInfo')! this.singlePlay = AppStorage.get('singlePlay')! this.startFullTime = GetCurrentTime(1); - // this.startHourTime = await getCurrentHourTime() this.startTime = dayTs().format("YYYY-MM-DD HH:mm:ss") this.startExamTime = dayTs().format("YYYY-MM-DD HH:mm:ss") - setInterval(async () => { - this.time = dayTs().format("YYYY-MM-DD HH:mm:ss"); - this.examTime += 1; - }, 1000); + //初始化数据库表 await this.initDb() //断点续考 @@ -690,7 +682,6 @@ struct JudgePage { name: this.name, idCard: this.idCard, startTime: this.startTime, - examTime: this.examTime, examSubject: this.examSubject, examMileage: this.examMileage, jl: this.jl, diff --git a/entry/src/main/ets/pages/Judge/Message.ets b/entry/src/main/ets/pages/Judge/Message.ets index c781681..8b38214 100644 --- a/entry/src/main/ets/pages/Judge/Message.ets +++ b/entry/src/main/ets/pages/Judge/Message.ets @@ -6,13 +6,19 @@ export default struct MessageComponent { @Prop name: string @Prop startTime: string @Prop idCard: string - @Prop examTime: number + @State examTime: number = 0 @Prop examSubject: string @Prop examMileage: string @Prop jl: number @Prop wayno: number @Prop judgeConfigObj: DefaultJudgeConfigObj + aboutToAppear(): void { + setInterval(async () => { + this.examTime += 1; + }, 1000); + } + build() { Row() { Column() { diff --git a/entry/src/main/ets/pages/Judge/utils.ets b/entry/src/main/ets/pages/Judge/utils.ets index 9f2e39c..5fed719 100644 --- a/entry/src/main/ets/pages/Judge/utils.ets +++ b/entry/src/main/ets/pages/Judge/utils.ets @@ -689,7 +689,8 @@ export const GetIsExitManualProject = (index: number, judgeConfigObj: DefaultJud const projectType = currentProject.type; //不允许人工触发的项目列表，以","分隔 - const unExitManualProjects: string[] = Reflect.get(judgeConfigObj, '332').split(',') || []; + // TODO 可能会出错 + const unExitManualProjects: string[] = (Reflect.get(judgeConfigObj, '332') || '').split(','); //直线行驶中不进其他考试项目(0-否 1-是) const param348: string = Reflect.get(judgeConfigObj, '348') || '0', //里程不够允许手工点靠边停车（0-否 1-是）