Merge branch 'master'

src/pages/exam/testExam/exam/result.vue

@@ -158,10 +158,12 @@ export default {
           item.question_list.forEach(it => {
             const currentItem = currentQuestionScore[it.id]
             if (Array.isArray(it.question_options) && it.question_options.length) {
-              if (currentItem.is_right) objectQuestionScore += parseFloat(currentItem.score)
+              // if (currentItem.is_right) objectQuestionScore += parseFloat(currentItem.score)
+              objectQuestionScore += parseFloat(currentItem.score)
               objectQuestionTotal += parseFloat(it.score)
             } else {
-              if (currentItem.is_right) subjectQuestionScore += parseFloat(currentItem.score)
+              // if (currentItem.is_right) subjectQuestionScore += parseFloat(currentItem.score)
+              subjectQuestionScore += parseFloat(currentItem.score)
               subjectQuestionTotal += parseFloat(it.score)
             }
           })