From 3465a4b37d56e4a737309ebb7f2965dfcb2090a0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 29 五月 2024 21:21:01 +0800
Subject: [PATCH] 英语优化
---
src/books/childHealth/view/content/index.vue | 265 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 190 insertions(+), 75 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index cd683ac..b8a4106 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -1,71 +1,79 @@
<template>
<div class="page-main" @scroll="throttledScrollHandler">
- <div class="page-content">
+ <div
+ class="page-content"
+ :style="{
+ fontSize: fontSize ? fontSize + 'px' : '16px',
+ transform: `scale(${pageZoom ? pageZoom : 1})`,
+ transformOrigin: 'center top'
+ }"
+ >
<pageHeader
- v-if="showCatalogList.indexOf(0) > -1"
+ v-if="showCatalogList.indexOf(1) > -1"
:showPageList="loadPageList"
></pageHeader>
<chapterOne
- v-if="showCatalogList.indexOf(1) > -1"
+ v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterOne>
<chapterTwo
- v-if="showCatalogList.indexOf(2) > -1"
+ v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterTwo>
<chapterThree
- v-if="showCatalogList.indexOf(3) > -1"
+ v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterThree>
<chapterFour
- v-if="showCatalogList.indexOf(4) > -1"
+ v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterFour>
<chapterFive
- v-if="showCatalogList.indexOf(5) > -1"
+ v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterFive>
<chapterSix
- v-if="showCatalogList.indexOf(6) > -1"
+ v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterSix>
<chapterSeven
- v-if="showCatalogList.indexOf(7) > -1"
+ v-if="showCatalogList.indexOf(8) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterSeven>
<chapterEight
- v-if="showCatalogList.indexOf(8) > -1"
+ v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterEight>
<chapterNine
- v-if="showCatalogList.indexOf(9) > -1"
+ v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterNine>
<chapterTen
- v-if="showCatalogList.indexOf(10) > -1"
+ v-if="showCatalogList.indexOf(11) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterTen>
<chapterEleven
- v-if="showCatalogList.indexOf(11) > -1"
+ v-if="showCatalogList.indexOf(12) > -1"
:showPageList="loadPageList"
:questionData="questionData"
></chapterEleven>
<chapterTwelve
- v-if="showCatalogList.indexOf(12) > -1"
+ v-if="showCatalogList.indexOf(13) > -1"
:showPageList="loadPageList"
></chapterTwelve>
<chapterThirteen
- v-if="showCatalogList.indexOf(13) > -1"
+ v-if="showCatalogList.indexOf(14) > -1"
+ :showPageList="loadPageList"
></chapterThirteen>
</div>
</div>
@@ -90,6 +98,10 @@
import _ from "lodash";
import getQuestionList from "@/assets/methods/examination";
import testData from "../../assets/examinationList";
+import Swiper from "swiper/bundle";
+import "swiper/swiper-bundle.css";
+import Viewer from "viewerjs";
+import "viewerjs/dist/viewer.css";
export default {
data() {
return {
@@ -103,11 +115,15 @@
loadPageObserver: null,
loadPageList: [],
questionData: {},
+ renderSignMap: {}
};
},
- provide() {
- return {
- changeQuestionData:this.changeQuestionData
+ computed: {
+ fontSize() {
+ return this.$store.state.qiankun.fontSize;
+ },
+ pageZoom() {
+ return this.$store.state.qiankun.scale / 100;
}
},
watch: {
@@ -119,7 +135,7 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal,
+ showCatalogList: newVal
});
}
// 鍚姩椤电爜瑙傚療
@@ -127,12 +143,21 @@
this.initObservation();
this.initThemeColor();
}, 500);
- },
+ }
},
+ loadPageList: {
+ handler(newVal, oldVal) {
+ console.log(newVal, "this.loadPageList");
+ setTimeout(() => {
+ this.initSwiper();
+ this.initViewer();
+ }, 200);
+ }
+ }
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [0];
+ this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -148,12 +173,14 @@
},
// 娓叉煋绗旇銆侀珮浜�佸垝绾�
renderSign: (type, data) => {
- this.renderSign(type, data);
+ // 鍥犱负璋冩暣涓洪〉闈㈡噿鍔犺浇锛屾墍浠ユ覆鏌撴爣璁颁篃闇�瑕佹寜鐓ч〉闈㈣繘琛屽鐞嗭紝鍏堝偍瀛樻暟鎹紝椤甸潰鍔犺浇瀹屾垚鍐嶆覆鏌撳搴旂殑鏍囪锛�
+ this.handelSignData(type, data);
+ // this.renderSign(type, data);
},
// 鍒犻櫎绗旇銆侀珮浜�佸垝绾�
delSign: (data) => {
this.delSign(data);
- },
+ }
});
}
@@ -162,13 +189,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锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -179,22 +206,22 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(5, 100);
+ // this.gotoPage(1, 10);
// setTimeout(() => {
- // this.renderSign("Note", {
+ // this.renderSign("Highlight", {
// id: "2ACA9359",
- // txt: "钀ュ吇绱犲拰鐑噺锛屾墠鑳�",
- // page: "100",
+ // txt: "棰樹竴瀛︿範涓婚涓� 杩愬姩",
+ // page: "10",
// type: "Highlight",
// color: "#F5E12A"
// });
- // setTimeout(() => {
- // this.delSign({
- // ids: ["2ACA9359"]
- // });
- // }, 2000);
- // }, 1000);
- // }, 3000);
+ // setTimeout(() => {
+ // this.delSign({
+ // ids: ["2ACA9359"]
+ // });
+ // }, 2000);
+ // }, 5000);
+ // }, 1000);
},
methods: {
// 婊氬姩鐩戝惉
@@ -252,7 +279,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength,
+ this.catalogLength
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -273,6 +300,14 @@
}
},
+ // 澶勭悊鏍囪鏁版嵁
+ handelSignData(type, data) {
+ if (!this.renderSignMap[type]) this.renderSignMap[type] = {};
+ if (!this.renderSignMap[type][data.page])
+ this.renderSignMap[type][data.page] = [];
+ this.renderSignMap[type][data.page].push(data);
+ },
+
// 娓叉煋鏍囪
renderSign(type, data) {
const existence = (
@@ -283,29 +318,48 @@
const pageDom = (
this.container ? this.container : document
).querySelector(`[page="${data.page}"]`);
- let reg = new RegExp(`${data.txt}`, "ig");
- switch (type) {
- case "Highlight":
- // 楂樹寒
- pageDom.innerHTML = pageDom.innerHTML.replace(
- reg,
- `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight" onclick="signClick('Highlight','${data.id}','${data.chapterNum}')">${data.txt}</span>`
- );
- break;
- case "Dashing":
- // 鍒掔嚎
- pageDom.innerHTML = pageDom.innerHTML.replace(
- reg,
- `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline" onclick="signClick('Dashing','${data.id}','${data.chapterNum}')">${data.txt}</span>`
- );
- break;
- case "Note":
- // 绗旇
- 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>`
- );
- break;
+ // 鍒涘缓 createTreeWalker 杩唬鍣紝鐢ㄤ簬閬嶅巻鏂囨湰鑺傜偣锛屼繚瀛樺埌涓�涓暟缁�
+ const treeWalker = document.createTreeWalker(
+ pageDom,
+ NodeFilter.SHOW_TEXT
+ );
+ const allTextNodes = [];
+ let currentNode = treeWalker.nextNode();
+ while (currentNode) {
+ allTextNodes.push(currentNode);
+ currentNode = treeWalker.nextNode();
+ }
+ for (let i = 0; i < allTextNodes.length; i++) {
+ const textDom = allTextNodes[i];
+ if (textDom.textContent.indexOf(data.txt) > -1) {
+ let reg = new RegExp(`${data.txt}`, "ig");
+ switch (type) {
+ case "Highlight":
+ // 楂樹寒
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.innerHTML.replace(
+ reg,
+ `<span datatype="Highlight" dataid="${data.id}" style="background: ${data.color};" class="highLight" onclick="signClick('Highlight','${data.id}','${data.chapterNum}')">${data.txt}</span>`
+ );
+ break;
+ case "Dashing":
+ // 鍒掔嚎
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.innerHTML.replace(
+ reg,
+ `<span datatype="Dashing" dataid="${data.id}" style="text-decoration-color:${data.color};" class="underline" onclick="signClick('Dashing','${data.id}','${data.chapterNum}')">${data.txt}</span>`
+ );
+ break;
+ case "Note":
+ // 绗旇
+ textDom.parentNode.innerHTML =
+ textDom.parentNode.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('Note')">${data.txt}<img src="${NoteIcon}"/></span>`
+ );
+ break;
+ }
+ }
}
}
},
@@ -341,7 +395,17 @@
this.container ? this.container : document
).querySelectorAll(".page-box");
sections.forEach((section) => {
- //observer 瑙傚療姣忎釜鍏冪礌锛屼互渚垮湪瀹冧滑杩涘叆鎴栫寮�瑙嗙獥鏃惰Е鍙戝洖璋冨嚱鏁般��
+ 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) {
@@ -454,12 +518,16 @@
"chapter"
);
const catalog = catalogDom.getAttribute("num");
- console.log("page", page, 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,
+ text
});
// const sections = Array.from(document.querySelectorAll(".section"));
//sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -473,8 +541,7 @@
if (entry.isIntersecting) {
const target = entry.target;
const page = target.getAttribute("page");
- if (this.loadPageList.indexOf(page) == -1) {
- //
+ if (this.loadPageList.indexOf(Number(page)) == -1) {
const catalogDom = this.tool.getParentNodeByClassName(
target,
"chapter"
@@ -482,19 +549,17 @@
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(
- [],
+ page,
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],
@@ -503,11 +568,20 @@
}
this.questionData[page] = obj;
}
+ console.log('棰樼洰',this.questionData);
}
}
}
+ // 娣诲姞椤电爜
this.loadPageList.push(Number(page));
- console.log(this.loadPageList, "this.loadPageList", catalog);
+ // 娓叉煋杩欎竴椤电殑鏍囪
+ for (const key in this.renderSignMap) {
+ if (this.renderSignMap[key][page]) {
+ this.renderSignMap[key][page].forEach((item) => {
+ this.renderSign(key, item);
+ });
+ }
+ }
if (this.loadPageList.length > 5) {
// 瓒呰繃5椤�
this.loadPageList.shift();
@@ -516,10 +590,51 @@
}
});
},
- changeQuestionData(page,data) {
- console.log('鍙樺寲',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 // 鏄剧ず鏍囬
+ });
+ }
+ }
},
components: {
pageHeader,
@@ -535,8 +650,8 @@
chapterTen,
chapterEleven,
chapterTwelve,
- chapterThirteen,
- },
+ chapterThirteen
+ }
};
</script>
--
Gitblit v1.9.1