From aea98d166ba5f5f2bc15ce99035b331302f42831 Mon Sep 17 00:00:00 2001
From: unknown <qq1940665526@163.com>
Date: 星期三, 29 五月 2024 14:30:09 +0800
Subject: [PATCH] 优化
---
src/books/lifeCare/index.vue | 200 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 61 deletions(-)
diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index e8ed46c..3538dae 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -6,27 +6,28 @@
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
transform: `scale(${pageZoom ? pageZoom : 1})`,
+ transformOrigin: 'center top'
}"
>
- <front001 v-if="showCatalogList.indexOf(0) > -1" />
- <ChapterOne v-if="showCatalogList.indexOf(1) > -1" />
- <ChapterTwo v-if="showCatalogList.indexOf(2) > -1" />
- <ChapterThree v-if="showCatalogList.indexOf(3) > -1" />
- <ChapterFour v-if="showCatalogList.indexOf(4) > -1" />
- <ChapterFive v-if="showCatalogList.indexOf(5) > -1" />
- <chapterSix v-if="showCatalogList.indexOf(6) > -1" />
- <chapterSeven v-if="showCatalogList.indexOf(7) > -1" />
- <chapterEight v-if="showCatalogList.indexOf(8) > -1" />
- <chapterNine v-if="showCatalogList.indexOf(9) > -1" />
- <chapter010 v-if="showCatalogList.indexOf(10) > -1" />
- <chapter011 v-if="showCatalogList.indexOf(11) > -1" />
- <chapter012 v-if="showCatalogList.indexOf(12) > -1" />
- <chapter013 v-if="showCatalogList.indexOf(13) > -1" />
- <chapter014 v-if="showCatalogList.indexOf(14) > -1" />
- <chapter015 v-if="showCatalogList.indexOf(15) > -1" />
- <chapter016 v-if="showCatalogList.indexOf(16) > -1" />
- <chapter017 v-if="showCatalogList.indexOf(17) > -1" />
- <chapter018 v-if="showCatalogList.indexOf(18) > -1" />
+ <front001 v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList" />
+ <ChapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <ChapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <ChapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <ChapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <ChapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <chapterNine v-if="showCatalogList.indexOf(10) > -1" :showPageList="loadPageList" :questionData="questionData"/>
+ <chapter010 v-if="showCatalogList.indexOf(11) > -1" :showPageList="loadPageList" />
+ <chapter011 v-if="showCatalogList.indexOf(12) > -1" :showPageList="loadPageList" />
+ <chapter012 v-if="showCatalogList.indexOf(13) > -1" :showPageList="loadPageList" />
+ <chapter013 v-if="showCatalogList.indexOf(14) > -1" :showPageList="loadPageList" />
+ <chapter014 v-if="showCatalogList.indexOf(15) > -1" :showPageList="loadPageList" />
+ <chapter015 v-if="showCatalogList.indexOf(16) > -1" :showPageList="loadPageList" />
+ <chapter016 v-if="showCatalogList.indexOf(17) > -1" :showPageList="loadPageList" />
+ <chapter017 v-if="showCatalogList.indexOf(18) > -1" :showPageList="loadPageList" />
+ <chapter018 v-if="showCatalogList.indexOf(19) > -1" :showPageList="loadPageList" />
</div>
</div>
</template>
@@ -53,16 +54,34 @@
import chapter018 from "./view/chapter018";
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
+import getQuestionList from "@/assets/methods/examination";
+import testData from "./js/examinationList";
export default {
data() {
return {
- catalogLength: 18, // 鎬荤珷鑺傛暟
+ catalogLength: 19, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
previousScrollTop: 0,
throttledScrollHandler: null,
observer: null,
+ loadPageObserver: null,
+ loadPageList: [],
+ questionData: {}
+ };
+ },
+ computed: {
+ fontSize() {
+ return this.$store.state.qiankun.fontSize;
+ },
+ pageZoom() {
+ return this.$store.state.qiankun.scale / 100;
+ }
+ },
+ provide() {
+ return {
+ changeQuestionData: this.changeQuestionData
};
},
watch: {
@@ -74,21 +93,20 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal,
+ showCatalogList: newVal
});
}
-
// 鍚姩椤电爜瑙傚療
setTimeout(() => {
this.initObservation();
this.initThemeColor();
}, 500);
- },
- },
+ }
+ }
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [10];
+ this.showCatalogList = [11];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -109,7 +127,7 @@
// 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
delSign: (data) => {
this.delSign(data);
- },
+ }
});
}
@@ -118,7 +136,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锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -146,35 +170,6 @@
// }, 1000);
// }, 3000);
},
- components: {
- front001,
- ChapterOne,
- ChapterTwo,
- ChapterThree,
- ChapterFour,
- ChapterFive,
- chapterSix,
- chapterSeven,
- chapterEight,
- chapterNine,
- chapter010,
- chapter011,
- chapter012,
- chapter013,
- chapter014,
- chapter015,
- chapter016,
- chapter017,
- chapter018,
- },
- computed: {
- fontSize() {
- return this.$store.state.qiankun.fontSize;
- },
- pageZoom() {
- return this.$store.state.qiankun.scale / 100;
- },
- },
methods: {
getParentWithClass(element, className) {
while (element.parentElement) {
@@ -190,6 +185,7 @@
).getSelection();
const txt = selection.toString();
if (selection.type != "none" && txt) {
+ // eslint-disable-next-line no-unused-vars
let node = selection.anchorNode.parentNode;
let pageHtml = this.getParentWithClass(
selection.anchorNode,
@@ -226,7 +222,6 @@
}
}
},
-
// 婊氬姩鐩戝惉
scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
@@ -234,7 +229,6 @@
// 鍚戜笅
const currentScrollTop =
event.target.scrollTop + event.target.offsetHeight;
-
if (
currentScrollTop >=
event.target.scrollHeight - this.loadThreshold
@@ -283,7 +277,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength,
+ this.catalogLength
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -334,7 +328,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}" style="cursor: pointer" /></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;
}
@@ -372,11 +366,26 @@
this.container ? this.container : document
).querySelectorAll(".page-box");
sections.forEach((section) => {
+ if (this.config.activeBook && this.config.activeBook.tryPageCount) {
+ const page = section.getAttribute("page");
+ if (Number(page) > this.config.activeBook.tryPageCount) {
+ let chapterDom = this.getParentWithClass(section, "chapter");
+ const chapterNum = chapterDom.getAttribute("num");
+ this.catalogLength = Number(chapterNum) - 1;
+ section.remove();
+ return false;
+ }
+ }
//observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
const isObserver = section.getAttribute("observer");
+ const isLoadObserver = section.getAttribute("loadObserver");
if (!isObserver) {
this.observer.observe(section);
section.setAttribute("observer", "1");
+ }
+ if (!isLoadObserver) {
+ this.loadPageObserver.observe(section);
+ section.setAttribute("loadObserver", "1");
}
});
},
@@ -480,11 +489,12 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
+ console.log(page, "page", catalog, "catalog");
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
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 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -493,7 +503,75 @@
}
});
},
+ loadPageCallback(entries, observer) {
+ 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]) {
+ if (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]) {
+ obj[key] = await getQuestionList(
+ [],
+ testData[catalog][page][key],
+ this.config.activeBook
+ );
+ }
+ this.questionData[page] = obj;
+ }
+ }
+ }
+ }
+ this.loadPageList.push(Number(page));
+ if (this.loadPageList.length > 5) {
+ // 瓒呰繃5椤�
+ this.loadPageList.shift();
+ }
+ }
+ }
+ });
+ },
+ changeQuestionData(page, data) {
+ this.$props.questionData[page] = data;
+ }
},
+ components: {
+ front001,
+ ChapterOne,
+ ChapterTwo,
+ ChapterThree,
+ ChapterFour,
+ ChapterFive,
+ chapterSix,
+ chapterSeven,
+ chapterEight,
+ chapterNine,
+ chapter010,
+ chapter011,
+ chapter012,
+ chapter013,
+ chapter014,
+ chapter015,
+ chapter016,
+ chapter017,
+ chapter018,
+ }
};
</script>
--
Gitblit v1.9.1