From 02ab5b03eba1f1f628ff6b5e9e6e19539928a168 Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期五, 12 七月 2024 09:24:59 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout --- src/books/childHealth/view/content/index.vue | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue index 97e9d4e..fb4a8ec 100644 --- a/src/books/childHealth/view/content/index.vue +++ b/src/books/childHealth/view/content/index.vue @@ -21,61 +21,51 @@ v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterOne> <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterTwo> <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterThree> <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterFour> <chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterFive> <chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterSix> <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterSeven> <chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterEight> <chapterNine v-if="showCatalogList.indexOf(10) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterNine> <chapterTen v-if="showCatalogList.indexOf(11) > -1" :showPageList="loadPageList" :questionData="questionDataMap" - @closeVideo="closeVideo" ></chapterTen> <chapterEleven v-if="showCatalogList.indexOf(12) > -1" @@ -167,6 +157,7 @@ setTimeout(() => { this.initSwiper(); this.initViewer(); + this.closeVideo() }, 200); } }, @@ -238,7 +229,7 @@ // 娴嬭瘯椤甸潰璺宠浆 // setTimeout(() => { - // this.gotoPage(2,58); + // this.gotoPage(11,282); // setTimeout(() => { // this.renderSign("Highlight", { // id: "2ACA9359", @@ -623,11 +614,12 @@ 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]) { @@ -637,7 +629,8 @@ this.config.activeBook ); } - this.questionDataMap[page] = obj; + this.$set(this.questionDataMap,page,obj) + // this.questionDataMap[page] = obj; } } } @@ -907,18 +900,23 @@ // 璺宠浆 this.gotoPage(data.catalog, data.page, () => {}); }, - closeVideo(path) { + // 鐐瑰嚮瑙嗛鍏抽棴鍏朵粬 + closeVideo() { let allVideo = ( this.container ? this.container : document ).querySelectorAll(".video"); - allVideo = Array.from(allVideo); - if(allVideo.length) { - for (let index = 0; index < allVideo.length; index++) { - const item = allVideo[index]; - if(item.currentSrc != path) { - item.pause() + 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() + } } - } + }) } } }, -- Gitblit v1.9.1