From f7a1e23185b5146571e81f0daab5698527a0fb21 Mon Sep 17 00:00:00 2001
From: unknown <qq1940665526@163.com>
Date: 星期二, 28 五月 2024 16:39:55 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 3f0193b..cd683ac 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -8,46 +8,57 @@
<chapterOne
v-if="showCatalogList.indexOf(1) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterOne>
<chapterTwo
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterTwo>
<chapterThree
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterThree>
<chapterFour
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterFour>
<chapterFive
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterFive>
<chapterSix
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterSix>
<chapterSeven
v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterSeven>
<chapterEight
v-if="showCatalogList.indexOf(8) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterEight>
<chapterNine
v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterNine>
<chapterTen
v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterTen>
<chapterEleven
v-if="showCatalogList.indexOf(11) > -1"
:showPageList="loadPageList"
+ :questionData="questionData"
></chapterEleven>
<chapterTwelve
v-if="showCatalogList.indexOf(12) > -1"
@@ -77,6 +88,8 @@
import chapterThirteen from "./components/chapter013.vue";
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
+import getQuestionList from "@/assets/methods/examination";
+import testData from "../../assets/examinationList";
export default {
data() {
return {
@@ -88,8 +101,14 @@
throttledScrollHandler: null,
observer: null,
loadPageObserver: null,
- loadPageList: []
+ loadPageList: [],
+ questionData: {},
};
+ },
+ provide() {
+ return {
+ changeQuestionData:this.changeQuestionData
+ }
},
watch: {
showCatalogList: {
@@ -100,7 +119,7 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal
+ showCatalogList: newVal,
});
}
// 鍚姩椤电爜瑙傚療
@@ -108,8 +127,8 @@
this.initObservation();
this.initThemeColor();
}, 500);
- }
- }
+ },
+ },
},
mounted() {
// 榛樿鍔犺浇绔犺妭
@@ -134,7 +153,7 @@
// 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
delSign: (data) => {
this.delSign(data);
- }
+ },
});
}
@@ -143,13 +162,13 @@
this.observer = new IntersectionObserver(this.pageChangeCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0.5 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0.5, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
this.loadPageObserver = new IntersectionObserver(this.loadPageCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -233,7 +252,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength
+ this.catalogLength,
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -284,7 +303,7 @@
// 绗旇
pageDom.innerHTML = pageDom.innerHTML.replace(
reg,
- `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')" onmouseover="noteHover('Note','${data.id}','${data.chapterNum}')">${data.txt}<img src="${NoteIcon}"/></span>`
+ `<span datatype="Note" dataid="${data.id}" style="border-bottom-color:${data.color}" class="notesline" onclick="signClick('Note','${data.id}','${data.chapterNum}')" onmouseover="noteHover('Note','${data.id}','${data.chapterNum}')" onmouseout="noteOut">${data.txt}<img src="${NoteIcon}"/></span>`
);
break;
}
@@ -440,7 +459,7 @@
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
this.$store.state.qiankun.pageChange({
page: page,
- catalog: catalog
+ catalog: catalog,
});
// const sections = Array.from(document.querySelectorAll(".section"));
//sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -450,21 +469,57 @@
});
},
loadPageCallback(entries, observer) {
- entries.forEach((entry) => {
+ entries.forEach(async (entry) => {
if (entry.isIntersecting) {
const target = entry.target;
const page = target.getAttribute("page");
if (this.loadPageList.indexOf(page) == -1) {
+ //
+ const catalogDom = this.tool.getParentNodeByClassName(
+ target,
+ "chapter"
+ );
+ const catalog = catalogDom.getAttribute("num");
+ if (!this.questionData[page]) {
+ if (testData && testData[catalog]) {
+ console.log(testData[catalog]);
+ if (testData[catalog][page]) {
+ console.log(testData[catalog][page]);
+ if (Array.isArray(testData[catalog][page])) {
+ this.questionData[page] = await getQuestionList(
+ [],
+ testData[catalog][page],
+ this.config.activeBook
+ )
+ } else {
+ const obj = {};
+ for (let key in testData[catalog][page]) {
+ console.log("key", key, testData[catalog][page][key]);
+ obj[key] = await getQuestionList(
+ [],
+ testData[catalog][page][key],
+ this.config.activeBook
+ );
+ }
+ this.questionData[page] = obj;
+ }
+ }
+ }
+ }
this.loadPageList.push(Number(page));
- console.log(this.loadPageList,"this.loadPageList");
+ console.log(this.loadPageList, "this.loadPageList", catalog);
if (this.loadPageList.length > 5) {
- // 瓒呰繃涓夌珷闅愯棌椤堕儴涓�绔�
+ // 瓒呰繃5椤�
this.loadPageList.shift();
}
}
}
});
- }
+ },
+ changeQuestionData(page,data) {
+ console.log('鍙樺寲',page,data);
+ this.$props.questionData[page] = data
+ },
},
components: {
pageHeader,
@@ -480,8 +535,8 @@
chapterTen,
chapterEleven,
chapterTwelve,
- chapterThirteen
- }
+ chapterThirteen,
+ },
};
</script>
--
Gitblit v1.9.1