From 013e8c13df0f97cf0444d2277069e39a5c8e1faa Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 29 五月 2024 19:17:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/index.vue | 332 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 226 insertions(+), 106 deletions(-)
diff --git a/src/books/lifeCare/index.vue b/src/books/lifeCare/index.vue
index f3d2323..aae3725 100644
--- a/src/books/lifeCare/index.vue
+++ b/src/books/lifeCare/index.vue
@@ -1,33 +1,99 @@
<template>
<div class="page-main" @scroll="throttledScrollHandler">
<div
- class="public-books"
+ class="public-lifeCare"
@mouseup="handleMouseUp"
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
transform: `scale(${pageZoom ? pageZoom : 1})`,
- transformOrigin: 'center top'
+ 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" />
+ <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>
@@ -68,7 +134,7 @@
observer: null,
loadPageObserver: null,
loadPageList: [],
- questionData: {}
+ questionData: {},
};
},
computed: {
@@ -77,11 +143,11 @@
},
pageZoom() {
return this.$store.state.qiankun.scale / 100;
- }
+ },
},
provide() {
return {
- changeQuestionData: this.changeQuestionData
+ changeQuestionData: this.changeQuestionData,
};
},
watch: {
@@ -93,7 +159,7 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal
+ showCatalogList: newVal,
});
}
// 鍚姩椤电爜瑙傚療
@@ -101,6 +167,15 @@
this.initObservation();
this.initThemeColor();
}, 500);
+ }
+ },
+ loadPageList: {
+ handler(newVal, oldVal) {
+ console.log(newVal, "this.loadPageList");
+ setTimeout(() => {
+ this.initSwiper();
+ this.initViewer();
+ }, 200);
}
}
},
@@ -127,7 +202,7 @@
// 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
delSign: (data) => {
this.delSign(data);
- }
+ },
});
}
@@ -136,13 +211,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锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -153,75 +228,24 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(5, 100);
- // setTimeout(() => {
- // this.renderSign("Note", {
- // id: "2ACA9359",
- // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
- // page: "100",
- // type: "Highlight",
- // color: "#F5E12A"
- // });
- // setTimeout(() => {
- // this.delSign({
- // ids: ["2ACA9359"]
- // });
- // }, 2000);
- // }, 1000);
- // }, 3000);
+ // this.gotoPage(1, 15);
+ // setTimeout(() => {
+ // this.renderSign("Note", {
+ // id: "2ACA9359",
+ // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
+ // page: "100",
+ // type: "Highlight",
+ // color: "#F5E12A"
+ // });
+ // setTimeout(() => {
+ // this.delSign({
+ // ids: ["2ACA9359"]
+ // });
+ // }, 2000);
+ // }, 1000);
+ // }, 1000);
},
methods: {
- getParentWithClass(element, className) {
- while (element.parentElement) {
- element = element.parentElement;
- if (element.classList.contains(className)) {
- return element;
- }
- }
- },
- handleMouseUp(e) {
- const selection = (
- this.container ? this.container : window
- ).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,
- "page-box"
- );
- let chapterDom = this.getParentWithClass(
- selection.anchorNode,
- "chapter"
- );
- let chapterNum;
- if (chapterDom) chapterNum = chapterDom.getAttribute("num");
- if (pageHtml) {
- const page = pageHtml.getAttribute("page");
- // 鐩戝惉閫変腑鏂囨湰浜嬩欢锛屽苟瑙﹀彂鐖跺眰鏂规硶
- if (this.$store.state.qiankun.windowSelection) {
- this.$store.state.qiankun.windowSelection({
- chapterNum,
- txt,
- page,
- x: e.x,
- y: e.y,
- });
- }
- }
- } else {
- if (this.$store.state.qiankun.windowSelection) {
- this.$store.state.qiankun.windowSelection({
- chapterNum: "",
- txt: "",
- page: "",
- x: e.x,
- y: e.y,
- });
- }
- }
- },
// 婊氬姩鐩戝惉
scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
@@ -277,7 +301,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength
+ this.catalogLength,
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -328,7 +352,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}')" onmouseout="noteOut">${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('Note')">${data.txt}<img src="${NoteIcon}"/></span>`
);
break;
}
@@ -376,7 +400,7 @@
return false;
}
}
- //observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
+ // observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
const isObserver = section.getAttribute("observer");
const isLoadObserver = section.getAttribute("loadObserver");
if (!isObserver) {
@@ -489,12 +513,16 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log(page, "page", catalog, "catalog");
+ let text = null;
+ if (target.querySelector("p")) {
+ text = target.querySelector("p").textContent.substring(0, 20);
+ }
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
this.$store.state.qiankun.pageChange({
page: page,
- catalog: catalog
+ catalog: catalog,
+ text
});
// const sections = Array.from(document.querySelectorAll(".section"));
//sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -509,7 +537,6 @@
const target = entry.target;
const page = target.getAttribute("page");
if (this.loadPageList.indexOf(page) == -1) {
- //
const catalogDom = this.tool.getParentNodeByClassName(
target,
"chapter"
@@ -520,7 +547,7 @@
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
this.questionData[page] = await getQuestionList(
- [],
+ page,
testData[catalog][page],
this.config.activeBook
);
@@ -547,9 +574,102 @@
}
});
},
- changeQuestionData(page, data) {
- this.$props.questionData[page] = data;
- }
+ initSwiper() {
+ const doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".swiper-container");
+ for (let i = 0; i < doms.length; i++) {
+ const dom = doms[i];
+ new Swiper(dom, {
+ loop: false, // 鏃犵紳
+ autoplay: {
+ //鑷姩寮�濮�
+ delay: 3000, //鏃堕棿闂撮殧
+ disableOnInteraction: false //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
+ },
+ paginationClickable: true,
+ slidesPerView: 1, // 涓�缁勪笁涓�
+ spaceBetween: 30, // 闂撮殧
+ // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
+ navigation: {
+ nextEl: ".swiper-button-next",
+ prevEl: ".swiper-button-prev"
+ },
+ // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
+ observer: true,
+ observeParents: true,
+ // 濡傛灉闇�瑕佸垎椤靛櫒
+ pagination: {
+ el: ".swiper-pagination",
+ clickable: true // 鍒嗛〉鍣ㄥ彲浠ョ偣鍑�
+ }
+ });
+ }
+ },
+ initViewer() {
+ const doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".openImgBox");
+ for (let i = 0; i < doms.length; i++) {
+ const dom = doms[i];
+ new Viewer(dom, {
+ navbar: true, // 鏄剧ず瀵艰埅鏍�
+ toolbar: true, // 鏄剧ず宸ュ叿鏍�
+ title: true // 鏄剧ず鏍囬
+ });
+ }
+ },
+ // eslint-disable-next-line
+ getParentWithClass(element, className) {
+ while (element.parentElement) {
+ element = element.parentElement;
+ if (element.classList.contains(className)) {
+ return element;
+ }
+ }
+ },
+ handleMouseUp(e) {
+ const selection = (
+ this.container ? this.container : window
+ ).getSelection();
+ const txt = selection.toString();
+ if (selection.type != "none" && txt) {
+ let node = selection.anchorNode.parentNode;
+ let pageHtml = this.getParentWithClass(
+ selection.anchorNode,
+ "page-box"
+ );
+ let chapterDom = this.getParentWithClass(
+ selection.anchorNode,
+ "chapter"
+ );
+ let chapterNum;
+ if (chapterDom) chapterNum = chapterDom.getAttribute("num");
+ if (pageHtml) {
+ const page = pageHtml.getAttribute("page");
+ // 鐩戝惉閫変腑鏂囨湰浜嬩欢锛屽苟瑙﹀彂鐖跺眰鏂规硶
+ if (this.$store.state.qiankun.windowSelection) {
+ this.$store.state.qiankun.windowSelection({
+ chapterNum,
+ txt,
+ page,
+ x: e.x,
+ y: e.y,
+ });
+ }
+ }
+ } else {
+ if (this.$store.state.qiankun.windowSelection) {
+ this.$store.state.qiankun.windowSelection({
+ chapterNum: "",
+ txt: "",
+ page: "",
+ x: e.x,
+ y: e.y,
+ });
+ }
+ }
+ },
},
components: {
front001,
@@ -571,7 +691,7 @@
chapter016,
chapter017,
chapter018,
- }
+ },
};
</script>
--
Gitblit v1.9.1