From fa128e06eca9b6b04ecacde97f86a1d219b05594 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 29 五月 2024 15:08:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/index.vue | 235 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 150 insertions(+), 85 deletions(-)
diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index d174ba5..3538dae 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -1,47 +1,39 @@
<template>
- <div
- class="public-books"
- @scroll="throttledScrollHandler"
- @mouseup="handleMouseUp"
- :style="{
- fontSize: fontSize ? fontSize + 'px' : '16px',
- transform: `scale(${pageZoom ? pageZoom : 1})`,
- }"
- >
- <front001 v-if="showCatalogList.indexOf(0) > -1" />
- <front002 v-if="showCatalogList.indexOf(0) > -1" />
- <front003 v-if="showCatalogList.indexOf(0) > -1" />
- <front004 v-if="showCatalogList.indexOf(0) > -1"/>
- <front005 v-if="showCatalogList.indexOf(0) > -1" />
- <front006 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 /> -->
- <!-- <chapterEight /> -->
- <!-- <chapterNine /> -->
- <!-- <chapter010 /> -->
- <!-- <chapter011 /> -->
- <!-- <chapter012 /> -->
- <!-- <chapter013 /> -->
- <!-- <chapter014 /> -->
- <!-- <chapter015 /> -->
- <!-- <chapter016 /> -->
- <!-- <chapter017 /> -->
- <!-- <topic008 /> -->
+ <div class="page-main" @scroll="throttledScrollHandler">
+ <div
+ class="public-books"
+ @mouseup="handleMouseUp"
+ :style="{
+ fontSize: fontSize ? fontSize + 'px' : '16px',
+ transform: `scale(${pageZoom ? pageZoom : 1})`,
+ transformOrigin: 'center top'
+ }"
+ >
+ <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>
<script>
import front001 from "./view/front001";
-import front002 from "./view/front002";
-import front003 from "./view/front003";
-import front004 from "./view/front004";
-import front005 from "./view/front005";
-import front006 from "./view/front006";
import ChapterOne from "./view/chapter001";
import ChapterTwo from "./view/chapter002";
import ChapterThree from "./view/chapter003";
@@ -59,19 +51,38 @@
import chapter015 from "./view/chapter015";
import chapter016 from "./view/chapter016";
import chapter017 from "./view/chapter017";
-
+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 {
- name: "temp-book",
data() {
return {
- catalogLength: 13, // 鎬荤珷鑺傛暟
+ catalogLength: 19, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
previousScrollTop: 0,
throttledScrollHandler: null,
- observer: 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: {
showCatalogList: {
@@ -94,8 +105,8 @@
}
},
mounted() {
- // 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [0];
+ // 榛樿鍔犺浇绔犺妭
+ this.showCatalogList = [11];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -128,6 +139,12 @@
threshold: 0.5 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
+ this.loadPageObserver = new IntersectionObserver(this.loadPageCallback, {
+ root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
+ rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
+ threshold: 0 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ });
+
// 鍚姩椤电爜瑙傚療
setTimeout(() => {
this.initObservation();
@@ -153,39 +170,6 @@
// }, 1000);
// }, 3000);
},
- components: {
- front001,
- front002,
- front003,
- front004,
- front005,
- front006,
- ChapterOne,
- ChapterTwo,
- ChapterThree,
- ChapterFour,
- ChapterFive,
- chapterSix,
- chapterSeven,
- chapterEight,
- chapterNine,
- chapter010,
- chapter011,
- chapter012,
- chapter013,
- chapter014,
- chapter015,
- chapter016,
- chapter017,
- },
- computed: {
- fontSize() {
- return this.$store.state.qiankun.fontSize;
- },
- pageZoom() {
- return this.$store.state.qiankun.scale / 100;
- },
- },
methods: {
getParentWithClass(element, className) {
while (element.parentElement) {
@@ -201,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,
@@ -237,10 +222,8 @@
}
}
},
-
-
- // 婊氬姩鐩戝惉
- scrollFun(event) {
+ // 婊氬姩鐩戝惉
+ scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
if (event.target.scrollTop > this.previousScrollTop) {
// 鍚戜笅
@@ -345,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}')">${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;
}
@@ -383,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");
}
});
},
@@ -402,7 +400,6 @@
const borderColorDom = (
this.container ? this.container : document
).querySelectorAll(".theme-border");
- console.log(this.config,'this.configthis.config');
// 鑾峰彇閰嶇疆鐨勪富棰樿壊
const bookThemeColor =
this.config.activeBook && this.config.activeBook.bookThemeColor
@@ -492,7 +489,7 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log("page", page, catalog);
+ console.log(page, "page", catalog, "catalog");
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
this.$store.state.qiankun.pageChange({
@@ -505,11 +502,79 @@
//index锛氭煡鎵惧綋鍓嶇洰鏍囧厓绱犲湪 sections 鏁扮粍涓殑绱㈠紩锛屽苟鍔� 1锛岀敤浜庣‘瀹氬綋鍓嶉〉鐮併��
}
});
+ },
+ 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>
<style lang="less">
-@import './css/default.less';
+@import "./css/default.less";
</style>
--
Gitblit v1.9.1