From 045dc56d598cb70fde4bb2ba0c3fb6731ea25384 Mon Sep 17 00:00:00 2001
From: lixiao <932184220@qq.com>
Date: Tue, 15 Apr 2025 16:53:55 +0800
Subject: [PATCH] =?UTF-8?q?bug=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 | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets
index c1ed6122..8314d705 100644
--- a/entry/src/main/ets/pages/Judge.ets
+++ b/entry/src/main/ets/pages/Judge.ets
@@ -317,7 +317,7 @@ struct Index {
       }
       if (no1 == 6) {
         const name = decodeURI(systemParm.txt1)
-        // 夜间行驶
+        // 白考过滤掉夜间行驶
         if (this.mode !== 2 && no2 == 13) {
           return
         }
@@ -326,15 +326,21 @@ struct Index {
           return
         }
         let isRequired = allItems.includes(no2 + '')
+        let isEnd = false
+        let isUpload = false
+
+        // 夜考除夜间行驶其他项目不需要重复上传
+        if (this.mode === 2 && no2 != 13) {
+          isUpload = true
+        }
+        // 夜考靠边停车设置为非必须
         if (this.mode === 2 && no2 == 11) {
           isRequired = false
         }
+        // 加减档自动完成，为非必须项目
         if (no2 == 14) {
           isRequired = false
         }
-        if (no2 == 13 && this.mode === 1) {
-          isRequired = false
-        }
         const currentProject: Project = {
           name,
           abbreviation: decodeURI(systemParm.txt3),
@@ -343,19 +349,10 @@ struct Index {
           // 白考夜间行驶非必考
           isRequired,
           //是否考过了
-          isEnd: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
+          isEnd,
           //项目开始数据是否上传过
-          isUpload: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'),
+          isUpload,
         }
-        // if (this.mode === 2) {
-        //   let type: '1' | '2' | '3'
-        //   if (no2 == 13) {
-        //     type = '2'
-        //   } else {
-        //     type = isRequired ? '1' : '3'
-        //   }
-        //   currentProject.ykType = type
-        // }
         this.projectsObj[no2*1] = currentProject
         this.projectsCenterObj[txt2] = currentProject
         this.projects.push(currentProject);