From bd4d2df3c20c2baea23567f57556a70a38e1960d Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 26 七月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/index.vue | 94 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index afb0c52..fd91aa9 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -157,6 +157,7 @@
setTimeout(() => {
this.initSwiper();
this.initViewer();
+ this.closeVideo()
}, 200);
}
},
@@ -228,7 +229,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(1, 10);
+ // this.gotoPage(11,282);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -242,7 +243,7 @@
// ids: ["2ACA9359"]
// });
// }, 2000);
- // }, 5000);
+ // }, 500);
// const pageDom = (this.container ? this.container : document)
// .querySelector("#app")
@@ -256,7 +257,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- // }, 5000);
+ // }, 500);
},
methods: {
// setZoom1() {
@@ -275,6 +276,8 @@
// },
// 婊氬姩鐩戝惉
scrollFun(event) {
+ // 瑙嗛灏忕獥鏂规硶
+ this.handleVideoPicture()
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
if (event.target.scrollTop > this.previousScrollTop) {
// 鍚戜笅
@@ -378,9 +381,10 @@
this.container ? this.container : document
).querySelector(`[page="${data.page}"]`);
// 鍒涘缓 createTreeWalker 杩唬鍣紝鐢ㄤ簬閬嶅巻鏂囨湰鑺傜偣锛屼繚瀛樺埌涓�涓暟缁�
- const treeWalker = (
- this.container ? this.container : document
- ).createTreeWalker(pageDom, NodeFilter.SHOW_TEXT);
+ const treeWalker = document.createTreeWalker(
+ pageDom,
+ NodeFilter.SHOW_TEXT
+ );
const allTextNodes = [];
let currentNode = treeWalker.nextNode();
while (currentNode) {
@@ -579,7 +583,7 @@
const catalog = catalogDom.getAttribute("num");
let text = null;
if (target.querySelector("p")) {
- text = target.querySelector("p").textContent.substring(0, 20);
+ text = target.querySelector("p").textContent.substring(0, 50);
}
// 杩斿洖椤电爜鍜岀珷鑺備俊鎭�
if (this.$store.state.qiankun && this.$store.state.qiankun.pageChange)
@@ -605,16 +609,19 @@
target,
"chapter"
);
+ // 娣诲姞椤电爜
+ this.loadPageList.push(Number(page));
const catalog = catalogDom.getAttribute("num");
if (!this.questionDataMap[page]) {
if (testData && testData[catalog]) {
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
- this.questionDataMap[page] = await getQuestionList(
+ const datas = await getQuestionList(
page,
testData[catalog][page],
this.config.activeBook
);
+ this.$set(this.questionDataMap,page,datas)
} else {
const obj = {};
for (let key in testData[catalog][page]) {
@@ -624,14 +631,12 @@
this.config.activeBook
);
}
- this.questionDataMap[page] = obj;
+ this.$set(this.questionDataMap,page,obj)
+ // this.questionDataMap[page] = obj;
}
- console.log("棰樼洰", this.questionDataMap);
}
}
}
- // 娣诲姞椤电爜
- this.loadPageList.push(Number(page));
// 娓叉煋杩欎竴椤电殑鏍囪
for (const key in this.renderSignMap) {
if (this.renderSignMap[key][page]) {
@@ -645,9 +650,10 @@
// 楂樹寒琛�
setTimeout(() => {
// 鑾峰彇椤甸潰鎵�鏈塼ext鑺傜偣
- const pageTextList = (
- this.container ? this.container : document
- ).createTreeWalker(target, NodeFilter.SHOW_TEXT);
+ const pageTextList = document.createTreeWalker(
+ target,
+ NodeFilter.SHOW_TEXT
+ );
// 鍖归厤鍏抽敭瀛�
const allPageTextNodes = [];
let currentNode = pageTextList.nextNode();
@@ -698,10 +704,10 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
)
},
@@ -730,10 +736,10 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
)
},
@@ -805,7 +811,8 @@
pageExample = new pageComponent({
propsData: {
showPageList: [],
- questionData: {}
+ questionData: {},
+ isSearch: true
}
});
pageExample.$mount(
@@ -836,7 +843,8 @@
pageExample = new pageComponent({
propsData: {
showPageList: [pageNum],
- questionData: {}
+ questionData: {},
+ isSearch: true
}
});
pageExample.$mount(
@@ -850,9 +858,10 @@
.querySelector(`[page="${pageNum}"]`);
if (thisPageDom) {
// 鑾峰彇椤甸潰鎵�鏈塼ext鑺傜偣
- const pageTextList = (
- this.container ? this.container : document
- ).createTreeWalker(thisPageDom, NodeFilter.SHOW_TEXT);
+ const pageTextList = document.createTreeWalker(
+ thisPageDom,
+ NodeFilter.SHOW_TEXT
+ );
// 鍖归厤鍏抽敭瀛�
const allPageTextNodes = [];
let currentNode = pageTextList.nextNode();
@@ -892,6 +901,43 @@
this.highlightData = data;
// 璺宠浆
this.gotoPage(data.catalog, data.page, () => {});
+ },
+ // 鐐瑰嚮瑙嗛鍏抽棴鍏朵粬
+ closeVideo() {
+ let allVideo = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ for (let index = 0; index < allVideo.length; index++) {
+ const item = allVideo[index];
+ item.addEventListener('playing',(item) => {
+ const path = item.srcElement.src
+ const videoList = Array.from(allVideo);
+ for (let cindex = 0; cindex < videoList.length; cindex++) {
+ const citem = videoList[cindex];
+ if(citem.currentSrc != path && path) {
+ citem.pause()
+ }
+ }
+ })
+ }
+ },
+ // 瑙嗛灏忕獥
+ handleVideoPicture() {
+ let doms = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ doms = Array.from(doms)
+ if(!doms.length) return false
+ const playVudio = doms
+ .reverse()
+ .find((item) => item.paused == false);
+ if(playVudio) {
+ const bottomGap = playVudio.getBoundingClientRect().bottom;
+ const topGap = playVudio.getBoundingClientRect().top;
+ if (bottomGap < 0 || topGap > window.innerHeight) {
+ playVudio.requestPictureInPicture();
+ }
+ }
}
},
components: {
--
Gitblit v1.9.1