From 40fb2059e31c525952e71782acecd97c178fb6e6 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 18 十月 2024 18:10:27 +0800
Subject: [PATCH] 数学标注
---
src/books/mathBook/view/components/index.vue | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/books/mathBook/view/components/index.vue b/src/books/mathBook/view/components/index.vue
index 04469b0..f3c90f7 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,
@@ -161,8 +161,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- setTimeout(() => {
- this.gotoPage(4, 157);
+ // setTimeout(() => {
+ // this.gotoPage(5, 210);
// // setTimeout(() => {
// // this.renderSign("Highlight", {
// // id: "2ACA9359",
@@ -190,7 +190,7 @@
// // txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// // txtIndex: 57
// // });
- }, 500);
+ // }, 500);
// 鑾峰彇棰樼洰id鍒楄〃
this.getQuestionId();
@@ -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