From d7bb63ff28f0f08f377239139893fa5b263c844f Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 16 十月 2024 18:05:09 +0800
Subject: [PATCH] 数学
---
src/books/mathBook/view/components/index.vue | 69 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index e4c31fa..2fa559b 100644
--- a/src/books/mathBook/view/components/index.vue
+++ b/src/books/mathBook/view/components/index.vue
@@ -13,11 +13,11 @@
</chapterOne>
<chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterTwo>
- <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList">
+ <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterThree>
- <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList">
+ <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterFour>
- <chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList">
+ <chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList" :questionData="questionDataMap">
</chapterFive>
</div>
@@ -32,7 +32,6 @@
import chapterThree from "./chapter003.vue";
import chapterFour from './chapter004.vue'
import chapterFive from './chapter005.vue'
-// import chapterSix from './chapter006.vue'
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
import Swiper from "swiper/bundle";
@@ -57,7 +56,7 @@
renderSignMap: {},
highlightData: null,
questionId: {},
- collectId: []
+ collectId: [],
};
},
computed: {
@@ -162,8 +161,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- // setTimeout(() => {
- // this.gotoPage(2, 8);
+ setTimeout(() => {
+ this.gotoPage(3, 111);
// // setTimeout(() => {
// // this.renderSign("Highlight", {
// // id: "2ACA9359",
@@ -191,7 +190,7 @@
// // txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// // txtIndex: 57
// // });
- // }, 500);
+ }, 500);
// 鑾峰彇棰樼洰id鍒楄〃
this.getQuestionId();
@@ -553,14 +552,18 @@
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
+ }
}
}
}
@@ -709,7 +712,6 @@
pageHeader,
chapterOne,
chapterTwo,
-
chapterThree,
chapterFour,
chapterFive,
@@ -820,11 +822,11 @@
.get(this.config.activeBook.resourceUrl + "/question.json")
.then((res) => {
this.questionId = res.data.data;
-
});
},
// 鑾峰彇棰樼洰鏀惰棌id鍒楄〃
getCollect() {
+ if(!localStorage.getItem(this.config.tokenKey)) return false
this.MG.identity
.getUserKey({
domain: "collectData",
@@ -844,8 +846,7 @@
})
},
// 鑾峰彇绔犺妭棰樼洰
- async getQuestion(num, page) {
- // debugger
+ async getQuestion(num, page,questionIndex) {
let cardList = [
{
catalogName: "鍗曢�夐",
@@ -873,17 +874,11 @@
const res = await axios.get(
this.config.activeBook.resourceUrl + "/question-" + num + ".json"
);
-
- console.log(1, res);
-
-
-
- // debugger
if (!res.data) return [];
- // debugger
+ 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];
- // debugger
// 鏁板鍏紡鍔犵被鍚嶅幓淇敼鏍峰紡
if (item.type && item.type == 'material') {
if (!item.infoList.length) return false
@@ -894,28 +889,28 @@
if (item.answer) item.answer = item.answer.replace(/\<math/gi, '<math class="examination-math"')
}
item.isCollect = this.collectId.indexOf(item.id) > -1 ? true : false
- // debugger
- 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);
}
}
}
}
-
- console.log(cardList.filter((item) => item.infoList.length > 0));
-
return cardList.filter((item) => item.infoList.length > 0);
}
} else {
@@ -948,9 +943,7 @@
chapterTwo,
chapterThree,
chapterFour,
- chapterFive
-
-
+ chapterFive,
},
};
</script>
--
Gitblit v1.9.1