From 0a465050c773d8b420f2b99d598de3d5dc9aef2b Mon Sep 17 00:00:00 2001 From: YM <479443481@qq.com> Date: 星期五, 17 五月 2024 15:45:28 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout --- src/assets/methods/examination.js | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/assets/methods/examination.js b/src/assets/methods/examination.js index bb9fde7..a1dffd6 100644 --- a/src/assets/methods/examination.js +++ b/src/assets/methods/examination.js @@ -1,7 +1,7 @@ import { activeBook } from "@/assets/js/config"; import MG from "@/assets/js/middleGround/WebMiddleGroundApi"; import getPublicImage from "@/assets/js/middleGround/tool"; -const getQuestionList = async (questionList) => { +const getQuestionList = async (oldList,questionList) => { let cardList = [ { catalogName: "鍗曢�夐", @@ -52,6 +52,10 @@ }; const res = await MG.store.getProductDetail(query); res.datas.cmsDatas[0].datas.forEach((item, index) => { + let oldObj = {} + if(oldList) { + oldObj = oldList.find(item => item.id == qitem) + } const questionObj = { number: index + 1, // 棰樺彿 id: item.id, @@ -72,7 +76,7 @@ difficulty: item.Embedded_QuestionBank_Difficulty ? 4 - item.Embedded_QuestionBank_Difficulty : 0, // 闅惧害绛夌骇 - userAnswer: + userAnswer:oldObj ? oldObj.userAnswer : item.Embedded_QuestionBank_QuestionType == "completion" || item.Embedded_QuestionBank_QuestionType == "multipleChoice" ? [] @@ -192,7 +196,7 @@ } }); } - cardList[0].infoList = singleChoiceArr, + cardList[0].infoList = singleChoiceArr cardList[1].infoList = judgeArr cardList[2].infoList = multipleChoiceArr cardList[3].infoList = completionArr @@ -207,10 +211,20 @@ return cardList.filter(item=>item.infoList.length > 0); }; -const getQuestionData = async (chapterData) => { +const getQuestionData = async (chapter,chapterData) => { const data = { ...chapterData }; + const oldAnswerData = localStorage.getItem('oldAnswerData') + const oldData = oldAnswerData ? JSON.parse(oldAnswerData) :{} + let oldChapterData + if(oldData) { + oldChapterData = oldData[chapter] + } for (let key in chapterData) { - data[key] = await getQuestionList(chapterData[key]); + let oldList = [] + if(oldChapterData) { + oldList = oldChapterData[key] + } + data[key] = await getQuestionList(oldList,chapterData[key]); } return data; }; -- Gitblit v1.9.1