From 0eb3fd999fad3008f71d8d8428acd037c5f20bda Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 21 Oct 2024 10:08:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/examnum/countExam.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
index 7c217d2..e3c2f2c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
@@ -173,7 +173,7 @@
                     <li>
                         <div class="textList">
                             <p>
-                                {{countList.total}}
+                                {{countTrainList.total}}
                             </p>
                             <p>
                                 培训次数
@@ -185,7 +185,7 @@
                     <li>
                         <div class="textList">
                             <p>
-                                {{countList.shtg}}
+                                {{countTrainList.shtg}}
                             </p>
                             <p>
                                 审核通过
@@ -197,7 +197,7 @@
                     <li>
                         <div class="textList">
                             <p>
-                                {{countList.shwtg}}
+                                {{countTrainList.shwtg}}
                             </p>
                             <p>
                                 审核未通过
@@ -209,7 +209,7 @@
                     <li>
                         <div class="textList">
                             <p>
-                                {{countList.dsh}}
+                                {{countTrainList.dsh}}
                             </p>
                             <p>
                                 待审核
@@ -288,6 +288,7 @@
         el: '#app',
         data: {
             countList:[],
+            countTrainList:[]
         },
         created(){
             this.init()
@@ -299,7 +300,7 @@
                 })
                 axios.post(trainPrefix + '/countList').then(response => {
                     console.log(response)
-                    this.countList = response.data.data
+                    this.countTrainList = response.data.data
                 })
             },
         }

From 835eff09f8e82982b6402c595f2ea738134b57bb Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Mon, 21 Oct 2024 10:15:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=88=90=E7=BB=A9=E6=9C=80=E9=AB=98?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/ElUserExamMapper.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml
index c0a2146..fee8906 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ElUserExamMapper.xml
@@ -38,6 +38,7 @@
         <if test="userName!=null and userName!=''">
             AND uc.user_name LIKE CONCAT('%',#{userName},'%')
         </if>
+        ORDER BY ue.max_score desc
     </select>
 
 

From d268223d6ffa7ad439a8d533dc4865d36fc408cb Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 21 Oct 2024 10:23:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/examnum/countExam.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
index e3c2f2c..2bd5ea7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
@@ -113,8 +113,8 @@
         overflow: hidden;
     }
     .yuan{
-        width: 300px;
-        height: 300px;
+        width: 275px;
+        height: 275px;
         display: inline-block;
         position: absolute;
         bottom: -163px;

From d1c6121905372b2ec5d9fe77354679f198824661 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 21 Oct 2024 10:29:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/examnum/countExam.html          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
index 2bd5ea7..db49899 100644
--- a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html
@@ -42,9 +42,9 @@
         position: relative;
         overflow: hidden;
     }
-    .yuan{
-        width: 266px;
-        height: 266px;
+    .count_top ul li .yuan{
+        width: 275px;
+        height: 275px;
         display: inline-block;
         position: absolute;
         bottom: -163px;
@@ -112,9 +112,9 @@
         position: relative;
         overflow: hidden;
     }
-    .yuan{
-        width: 275px;
-        height: 275px;
+    .count_bottom ul li .yuan{
+        width: 291px;
+        height: 291px;
         display: inline-block;
         position: absolute;
         bottom: -163px;