From 39da75fa54f4a0bfc6c135bcacdd5a4df4890210 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 17 十月 2024 16:22:13 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/view/components/index.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index e46d568..e5c1ead 100644
--- a/src/books/mathBook/view/components/index.vue
+++ b/src/books/mathBook/view/components/index.vue
@@ -8,8 +8,8 @@
transform: `scale(${pageZoom ? pageZoom : 1})`,
transformOrigin: 'center top',
}">
- <pageHeader v-if="showCatalogList.indexOf(0) > -1" :showPageList="loadPageList"></pageHeader>
- <chapterOne v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
+ <pageHeader v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList"></pageHeader>
+ <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterOne>
<chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterTwo>
@@ -105,7 +105,7 @@
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [0];
+ this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -162,7 +162,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(3, 96);
+ this.gotoPage(3, 76);
// // setTimeout(() => {
// // this.renderSign("Highlight", {
// // id: "2ACA9359",
@@ -552,15 +552,21 @@
this.loadPageList.push(Number(page));
const catalog = catalogDom.getAttribute("num");
if (!this.questionDataMap[page]) {
-
if (this.questionId && this.questionId[catalog]) {
-
if (this.questionId[catalog][page]) {
-
- this.questionDataMap[page] = await this.getQuestion(catalog, page);
-
- console.log("棰樼洰", this.questionDataMap);
+ console.log(page,Array.isArray(this.questionId[catalog][page]));
+ if(Array.isArray(this.questionId[catalog][page])) {
+ this.questionDataMap[page] = await this.getQuestion(catalog, page,false);
+ } else {
+ const obj = {}
+ for (let key in this.questionId[catalog][page]) {
+ obj[key] = await this.getQuestion(catalog, page,key)
+ }
+ this.questionDataMap[page] = obj
+ }
}
+ console.log(1,this.questionDataMap);
+
}
}
// 娓叉煋杩欎竴椤电殑鏍囪
@@ -842,7 +848,7 @@
})
},
// 鑾峰彇绔犺妭棰樼洰
- async getQuestion(num, page) {
+ async getQuestion(num, page,questionIndex) {
let cardList = [
{
catalogName: "鍗曢�夐",
@@ -870,8 +876,9 @@
const res = await axios.get(
this.config.activeBook.resourceUrl + "/question-" + num + ".json"
);
- console.log(1, res);
if (!res.data) return [];
+ let ids = []
+ questionIndex ? ids = this.questionId[num][page][questionIndex] : ids = this.questionId[num][page]
for (let index = 0; index < res.data.data.length; index++) {
const item = res.data.data[index];
// 鏁板鍏紡鍔犵被鍚嶅幓淇敼鏍峰紡
@@ -884,19 +891,23 @@
if (item.answer) item.answer = item.answer.replace(/\<math/gi, '<math class="examination-math"')
}
item.isCollect = this.collectId.indexOf(item.id) > -1 ? true : false
- if (this.questionId[num][page].indexOf(item.id) > -1) {
+ if (ids.indexOf(item.id) > -1) {
if (item.type && item.type == "material") {
cardList.push(item);
} else {
if (item.questionType == "judge") {
cardList[1].infoList.push(item);
- } else if (item.questionType == "singleChoice") {
+ }
+ if (item.questionType == "singleChoice") {
cardList[0].infoList.push(item);
- } else if (item.questionType == "multipleChoice") {
+ }
+ if (item.questionType == "multipleChoice") {
cardList[2].infoList.push(item);
- } else if (item.questionType == "completion") {
+ }
+ if (item.questionType == "completion") {
cardList[3].infoList.push(item);
- } else if (item.questionType == "shortAnswer") {
+ }
+ if (item.questionType == "shortAnswer") {
cardList[4].infoList.push(item);
}
}
--
Gitblit v1.9.1