Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html

@@ -42,9 +42,9 @@
         position: relative;
         overflow: hidden;
     }
-    .yuan{
+    .count_top ul li .yuan{
-        width: 266px;
+        width: 275px;
-        height: 266px;
+        height: 275px;
         display: inline-block;
         position: absolute;
         bottom: -163px;
@@ -112,9 +112,9 @@
         position: relative;
         overflow: hidden;
     }
-    .yuan{
+    .count_bottom ul li .yuan{
-        width: 300px;
+        width: 291px;
-        height: 300px;
+        height: 291px;
         display: inline-block;
         position: absolute;
         bottom: -163px;
@@ -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
                 })
             },
         }

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>