Browse Source

fix(front): 长难句

Go 5 years ago
parent
commit
3e7f4f2b37

+ 1 - 0
front/project/www/components/List/index.less

@@ -37,6 +37,7 @@
         flex: 5;
         font-size: 16px;
         color: @night-blue;
+        border: none;
       }
 
       &.introduction {

+ 3 - 3
front/project/www/routes/paper/report/page.js

@@ -415,7 +415,7 @@ function pieOption1(title, userCorrect, userNumber, totalCorrect, totalNumber) {
   };
 }
 
-function pieOption2(title, value1, value2, value3) {
+function pieOption2(title, value1, value2, value3, total) {
   return {
     title: [
       {
@@ -424,7 +424,7 @@ function pieOption2(title, value1, value2, value3) {
         left: '0',
       },
       {
-        text: `${value1 + value2 + value3}`,
+        text: `${total}`,
         textAlign: 'center',
         textVerticalAlign: 'middle',
         textStyle: { color: '#686872', fontSize: 60 },
@@ -855,7 +855,7 @@ export default class extends Page {
       <div className="body">
         <div className="content">
           <div className="title">能力评估</div>
-          <PieChart option={pieOption2('综合得分', detail.ability.logic, detail.ability.struct, detail.ability.speed)} />
+          <PieChart option={pieOption2('综合得分', detail.ability.logic, detail.ability.struct, detail.ability.speed, detail.ability.score)} />
         </div>
       </div>
       <div className="body gray">

+ 12 - 12
server/gateway-api/src/main/java/com/qxgmat/service/extend/QuestionFlowService.java

@@ -1364,14 +1364,14 @@ public class QuestionFlowService {
                 difficult.put("key", difficultKey);
                 difficult.put("userNumber", 1);
                 difficult.put("userCorrect", userQuestion.getIsCorrect());
-                difficult.put("totalNumber", relation.getTotalNumber());
-                difficult.put("totalCorrect", relation.getTotalCorrect());
+                difficult.put("totalNumber", relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", relation.getTotalCorrect() + userQuestion.getIsCorrect());
                 difficultMap.put(difficultKey, difficult);
             }else{
                 difficult.put("userNumber", difficult.getInteger("userNumber") + 1);
                 difficult.put("userCorrect", difficult.getInteger("userCorrect") + userQuestion.getIsCorrect());
-                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber());
-                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect());
+                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect() + userQuestion.getIsCorrect());
             }
         }
         detail.put("pace", pace);
@@ -1722,14 +1722,14 @@ public class QuestionFlowService {
                 difficult.put("key", difficultKey);
                 difficult.put("userNumber", 1);
                 difficult.put("userCorrect", userQuestion.getIsCorrect());
-                difficult.put("totalNumber", relation.getTotalNumber());
-                difficult.put("totalCorrect", relation.getTotalCorrect());
+                difficult.put("totalNumber", relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", relation.getTotalCorrect() + userQuestion.getIsCorrect());
                 difficultTypeMap.put(difficultKey, difficult);
             }else{
                 difficult.put("userNumber", difficult.getInteger("userNumber") + 1);
                 difficult.put("userCorrect", difficult.getInteger("userCorrect") + userQuestion.getIsCorrect());
-                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber());
-                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect());
+                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect() + userQuestion.getIsCorrect());
             }
             difficult = difficultSubjectMap.getJSONObject(difficultKey);
             if (difficult == null){
@@ -1737,14 +1737,14 @@ public class QuestionFlowService {
                 difficult.put("key", difficultKey);
                 difficult.put("userNumber", 1);
                 difficult.put("userCorrect", userQuestion.getIsCorrect());
-                difficult.put("totalNumber", relation.getTotalNumber());
-                difficult.put("totalCorrect", relation.getTotalCorrect());
+                difficult.put("totalNumber", relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", relation.getTotalCorrect() + userQuestion.getIsCorrect());
                 difficultSubjectMap.put(difficultKey, difficult);
             }else{
                 difficult.put("userNumber", difficult.getInteger("userNumber") + 1);
                 difficult.put("userCorrect", difficult.getInteger("userCorrect") + userQuestion.getIsCorrect());
-                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber());
-                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect());
+                difficult.put("totalNumber", difficult.getInteger("totalNumber") + relation.getTotalNumber() + 1);
+                difficult.put("totalCorrect", difficult.getInteger("totalCorrect") + relation.getTotalCorrect() + userQuestion.getIsCorrect());
             }
 
             // 基础数据