From d2e795c82f6a711e12df05d5b5c68badfbd40d5a Mon Sep 17 00:00:00 2001
From: Surenjun <tlsurejun@163.com>
Date: Tue, 29 Jul 2025 15:07:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:1.=20=E9=9D=A0=E8=BE=B9=E5=81=9C=E8=BD=A6?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E8=A1=8C=E4=B8=AD=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=202.344=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/pages/Judge.ets | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets
index 6123c4ef..12062786 100644
--- a/entry/src/main/ets/pages/Judge.ets
+++ b/entry/src/main/ets/pages/Judge.ets
@@ -920,6 +920,25 @@ struct Index {
             .backgroundImage($rawfile('judge/anniu_nor.png'), ImageRepeat.NoRepeat)
             .backgroundImageSize({ width: '100%', height: '100%' })
             .onClick(() => {
+
+              //靠边停车进行中&且其它项目都已经完成 不能结束
+              if(!this.singlePlay && this.projectsObj['40600']?.type == '2' && this.isRequiredProjectsEnd){
+                Prompt.showToast({
+                  message: '靠边停车项目进行中，不允许手动退出！',
+                  duration: 4000
+                });
+                return
+              }
+
+              //考试未结束且有扣分,不允许退出
+              if (!this.singlePlay && this.judgeConfigObj['344'] == 1 && this.kfArr.length > 0&& !this.isAllProjectsEnd ) {
+                Prompt.showToast({
+                  message: '考试未结束且有扣分，不允许手动退出！',
+                  duration: 4000
+                });
+                return
+              }
+
               // this.vocObj.playAudio({
               //   type: 1,
               //   name: 'button_media.wav'
@@ -1029,13 +1048,7 @@ struct Index {
               router.back()
               return
             }
-            if (this.judgeConfigObj['344'] == 1) {
-              Prompt.showToast({
-                message: '考试未结束，不允许手动退出！',
-                duration: 4000
-              });
-              return
-            }
+
             this.endPopupVisible = false;
             this.loadingPopupVisible = true
             clearInterval(this.timer);
@@ -1427,7 +1440,7 @@ struct Index {
   // 必考项目除靠边停车是否全部完成
   @State isRequiredProjectsEnd: boolean = false;
   // 考试项目是否全部完成
-  // @State isAllProjectsEnd: boolean = false;
+  @State isAllProjectsEnd: boolean = false;
   @State lane: LANE = { road: '', num: 0, count: 0 }
   @State roadData: Object = {};
   //定位差分状态时候正常