From ba316af6d4ad8f9db18a589fb4c6cca364d46456 Mon Sep 17 00:00:00 2001
From: qiaojiale <qiaojiale@gmail.com>
Date: Mon, 14 Apr 2025 08:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 finalExamScore2.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/finalExamScore2.html b/finalExamScore2.html
index 013bdad..1a6ab0d 100644
--- a/finalExamScore2.html
+++ b/finalExamScore2.html
@@ -605,10 +605,19 @@
             // 转换回数组
             const mergedArray = Array.from(mergedMap.values());
 
+
+            const mergedArray2 = allSubject.map(item1 => {
+            const matchingItem2 = obj.scoreInfo.find(item2 => item2.subjectId === item1.id);
+            return {
+            ...item1,
+            ...matchingItem2
+            };
+            });
+
             console.log(mergedArray,'asdsad');
 
 
-            $.each(mergedArray, function (index, item) {
+            $.each(mergedArray2, function (index, item) {
 
                 $(".Allsub").append(
                     `
@@ -718,7 +727,6 @@
                     return
                 }
             });
-
             AllSub(name)
 
         }).catch(error => {