From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 18:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/meetingPlanners/view/components/index.vue | 91 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/src/books/meetingPlanners/view/components/index.vue b/src/books/meetingPlanners/view/components/index.vue
index b8ee3f7..7834ecd 100644
--- a/src/books/meetingPlanners/view/components/index.vue
+++ b/src/books/meetingPlanners/view/components/index.vue
@@ -9,19 +9,25 @@
transformOrigin: 'center top',
}">
<pageHeader v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList"></pageHeader>
- <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList"></chapterOne>
- <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList"></chapterTwo>
- <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList"></chapterThree>
+ <chapterOne v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList"
+ :interfaceQuestion="questionDataMap"></chapterOne>
+ <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList"
+ :interfaceQuestion="questionDataMap"></chapterTwo>
+ <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList"
+ :interfaceQuestion="questionDataMap"></chapterThree>
</div>
</div>
</template>
<script>
+import Vue from "vue";
import pageHeader from "./header.vue";
import chapterOne from "./chapter001.vue";
import chapterTwo from "./chapter002.vue";
import chapterThree from "./chapter003.vue";
import NoteIcon from "@/assets/images/biji.png";
+import getQuestionList from "@/assets/methods/examination";
+import testData from "../../assets/examinationList";
import _ from "lodash";
import Swiper from "swiper/bundle";
import "swiper/swiper-bundle.css";
@@ -100,7 +106,6 @@
// 榛樿鍔犺浇绔犺妭
this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
- debugger
this.throttledScrollHandler = _.throttle(
this.scrollFun,
this.throttleThreshold,
@@ -156,7 +161,7 @@
//娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(2, 15);
+ // this.gotoPage(3,237);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -169,7 +174,7 @@
// this.delSign({
// ids: ["2ACA9359"]
// });
- // }, 2000);
+ // // }, 2000);
// }, 500);
// const pageDom = (this.container ? this.container : document)
@@ -216,7 +221,6 @@
) {
console.log(1);
- debugger
// 鍒拌揪闃堝��
if (
this.showCatalogList[this.showCatalogList.length - 1] <
@@ -530,6 +534,7 @@
});
},
loadPageCallback(entries, observer) {
+ // console.log(entries,1234);
entries.forEach(async (entry) => {
if (entry.isIntersecting) {
const target = entry.target;
@@ -542,30 +547,30 @@
// 娣诲姞椤电爜
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(
- // page,
- // 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.questionDataMap[page] = obj;
- // }
- // console.log("棰樼洰", this.questionDataMap);
- // }
- // }
- // }
+ if (!this.questionDataMap[page]) {
+ if (testData && testData[catalog]) {
+ if (testData[catalog][page]) {
+ if (Array.isArray(testData[catalog][page])) {
+ this.questionDataMap[page] = await getQuestionList(
+ page,
+ 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.questionDataMap[page] = obj;
+ }
+ console.log("棰樼洰", this.questionDataMap);
+ }
+ }
+ }
// 娓叉煋杩欎竴椤电殑鏍囪
for (const key in this.renderSignMap) {
if (this.renderSignMap[key][page]) {
@@ -722,7 +727,7 @@
pageExample = new pageComponent({
propsData: {
showPageList: [],
- questionData: {},
+ interfaceQuestion: {},
isSearch: true,
},
});
@@ -754,7 +759,7 @@
pageExample = new pageComponent({
propsData: {
showPageList: [pageNum],
- questionData: {},
+ interfaceQuestion: {},
isSearch: true,
},
});
@@ -902,19 +907,21 @@
},
// 瑙嗛灏忕獥
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);
+ 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) {
- if (playVudio.readyState) playVudio.requestPictureInPicture();
+ try {
+ if (playVudio.readyState) playVudio.requestPictureInPicture();
+ } catch (error) {
+ console.log(error, "灏忕獥閿欒error");
+ }
}
}
},
--
Gitblit v1.9.1