From 820234fc9890b43a6629d8e39d9f6ac565c2d22b Mon Sep 17 00:00:00 2001
From: lixiao <932184220@qq.com>
Date: Mon, 31 Mar 2025 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E8=BD=A6=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/pages/Judge.ets | 48 ++++++++++++++++--------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets
index 6ef5a848..dc9f8c17 100644
--- a/entry/src/main/ets/pages/Judge.ets
+++ b/entry/src/main/ets/pages/Judge.ets
@@ -61,10 +61,8 @@ struct Index {
     }, 1000);
     //初始化数据库表
     await this.initDb()
-    //断点续考
-    if (this.mode == 2) {
-      await this.goDdxkItems()
-    }
+    //扣分
+    await this.goDdxkItems()
     //初始化评判
     const judge = await this.initJudge();
     this.judge = judge
@@ -456,6 +454,7 @@ struct Index {
     const nightScoreArr = examItems?.split(",").filter(item => item) || []
     const ddxkKfArr = kfItems.split(";")?.[3]?.split('^').filter(item => item) || []
     nightScoreArr.forEach((kf) => {
+      this.isDdxk = true
       let xmdm = '';
       let kfdm = ''
       let currentKf
@@ -481,26 +480,29 @@ struct Index {
         kfxh: currentKf.kfxh
       })
     })
-    ddxkKfArr.forEach((kf) => {
-      const [xmdm, kfdm] = kf.split(',')
-      const currentKf = this.markRuleListObj[`${xmdm}_${kfdm}`]
-      const currentProject = this.projectsObj[xmdm] || { name: '通用评判' }
-      if (this.projectsObj[xmdm]) {
-        this.projectsObj[xmdm].type = '4'
-      }
-      this.kfArr.push({
-        //扣分项目名称
-        xmmcStr: currentProject.name,
-        //@ts-ignore
-        xmdm,
-        desc: currentKf.markshow,
-        score: currentKf.markreal,
-        markcatalog: currentKf.markcatalog,
-        markserial: currentKf.markserial,
-        kfxh: currentKf.kfxh
+    if (this.judgeConfigObj['432'] != 0) {
+      ddxkKfArr.forEach((kf) => {
+        this.isDdxk = true
+        const [xmdm, kfdm] = kf.split(',')
+        const currentKf = this.markRuleListObj[`${xmdm}_${kfdm}`]
+        const currentProject = this.projectsObj[xmdm] || { name: '通用评判' }
+        if (this.projectsObj[xmdm]) {
+          this.projectsObj[xmdm].type = '4'
+        }
+        this.kfArr.push({
+          //扣分项目名称
+          xmmcStr: currentProject.name,
+          //@ts-ignore
+          xmdm,
+          desc: currentKf.markshow,
+          score: currentKf.markreal,
+          markcatalog: currentKf.markcatalog,
+          markserial: currentKf.markserial,
+          kfxh: currentKf.kfxh
+        })
+        this.totalScore += currentKf.markreal * 1;
       })
-      this.totalScore += currentKf.markreal * 1;
-    })
+    }
     this.ddxkKfArr = [...nightScoreArr, ...ddxkKfArr]
   }