Merge branch 'master' of https://gitlab.ezijing.com/ezijing/x-learn

src/components/exam/examCard.vue

@@ -89,7 +89,6 @@ export default {
       countdownTimer: null, // 倒计时计时器
       countdownText: '', // 倒计时显示时间
       questionGroups: this.groups, // 所有试题分组,一组一页
-      questionCount: 0, // 小题数量
       currentGroupPage: this.groupPage, // 大题页码
       currentGroupCount: this.groupPageCount // 大题总页数
     }
@@ -131,15 +130,17 @@ export default {
   },
   watch: {
     data: {
-      deep: true,
+      immediate: true,
       handler(data) {
         data && this.dataInit(data)
       }
     },
     groups: {
+      immediate: true,
       handler(groups) {
-        this.questionGroups = groups
-        this.questionCount = groups.length
+        if (groups.length) {
+          this.questionGroups = groups
+        }
       }
     },
     groupPage(value) {
@@ -245,7 +246,6 @@ export default {
       const isSubmited = ['1', '2'].includes(data.status)
       this.disabled = isSubmited
       this.hasResult = isSubmited
-      this.questionCount = data.questions.total_question_count
       this.genQuestions(data)
       this.currentGroupCount = this.questionGroups.length
       if (this.$route.query.id) {
@@ -262,24 +262,28 @@ export default {
       const { questions, answers = {} } = data
       if (!questions) return []
       this.questionGroups = questions.question_items.reduce((result, question) => {
-        question.question_list.forEach(list => {
-          list = list.map(item => {
-            let userAnswers = []
-            let sign = false
-            if (answers) {
-              // 大题答案包含所有小题答案
-              const bigQuestionAnswer = answers[question.question_item_id]
-              if (bigQuestionAnswer) {
-                // 小题答案
-                const questionAnswer = bigQuestionAnswer[item.id] || {}
-                userAnswers = questionAnswer.answer || []
-                sign = questionAnswer.sign || false
+        if (question.question_list.length) {
+          question.question_list.forEach(list => {
+            list = list.map(item => {
+              let userAnswers = []
+              let sign = false
+              if (answers) {
+                // 大题答案包含所有小题答案
+                const bigQuestionAnswer = answers[question.question_item_id]
+                if (bigQuestionAnswer) {
+                  // 小题答案
+                  const questionAnswer = bigQuestionAnswer[item.id] || {}
+                  userAnswers = questionAnswer.answer || []
+                  sign = questionAnswer.sign || false
+                }
               }
-            }
-            return { ...item, user_answer: userAnswers, sign }
+              return { ...item, user_answer: userAnswers, sign }
+            })
+            result.push(Object.assign({}, question, { question_list: list }))
           })
-          result.push(Object.assign({}, question, { question_list: list }))
-        })
+        } else {
+          result.push(Object.assign({}, question, { question_list: [] }))
+        }
         return result
       }, [])
     },