From 637da3ece986e6750804e38938a15fa577116977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 07 Mar 2022 15:09:52 +0800
Subject: [PATCH] 冲突
---
common/api/examFunc.js | 63 ++++++++++++-------------------
1 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/common/api/examFunc.js b/common/api/examFunc.js
index c0de7bd..292075c 100644
--- a/common/api/examFunc.js
+++ b/common/api/examFunc.js
@@ -10,53 +10,40 @@
let questionList = []
let queTypeArr = []
-
+
quesModules.forEach((item, index) => {
-
+
+
+
let quesType = item.choicesType
-
- queTypeArr.push(quesType)
-
- item.template = item.choicesType
-
+
+ // 是否答题了
+ item.selectedFlag = false
+ // 答题的结果
item.tempAnswer = ""
-
+ // 题目是否做对
+ item.correctOrError = false
+
+ queTypeArr.push(quesType)
+
+ if (item.choicesType == 1 || item.choicesType == 3) {
+ item.dualChooseArr = []
+ }
+
+
item.options = item.examSubjectOptions
-
- item.options.forEach(it => {
- it.newOptLetter = it.optionName
- it.optContent = it.optionContent
- it.optLetter = it.newOptLetter
- })
-
+
+ if (item.choicesType == 0 || item.choicesType == 1 || item.choicesType == 3) {
+ item.options.reverse()
+ }
+
+
questionList.push(item)
-
+
})
store.state.queTypeArr = unique(queTypeArr)
store.state.questionList = questionList
-}
-
-export const topicOptions = (options) => {
-
- var questionList = store.state.questionList
-
- questionList.forEach((item, index) => {
-
- })
-
- store.state.questionList = questionList
-
- // for (let j = 0; j < quesModules[i].examSubjectOptions.length; j++) {
- // // 解决theoryExamAnswer可能为null的问题，把它赋值为字符串
- // quesModules[i].examSubjectOptions[j].tempAnswer = "" //暂存每题的答案
- // quesModules[i].examSubjectOptions[j].template = quesModules[i].choicesType //防止template初始值是null
- // quesModules[i].examSubjectOptions[j].recordId = store.state.examDetail
- // .id //搬移recordId的位置
- // quesModules[i].examSubjectOptions[j].blankArr = [] //新建blankArr属性，临时保存填空题答案
- // quesModules[i].examSubjectOptions[j].dualChooseArr = [] //新建blankArr属性，临时保存填空题答案
- // questionList.push(quesModules[i].examSubjectOptions[j])
- // }
}
--
Gitblit v1.9.3