From cf6e9bcbfc64019bb14fb0964576ae3e3bd2fde5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 26 三月 2025 11:22:20 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/policiesAndRegulations/view/components/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/books/policiesAndRegulations/view/components/index.vue b/src/books/policiesAndRegulations/view/components/index.vue
index 1f0968e..a1b7ff6 100644
--- a/src/books/policiesAndRegulations/view/components/index.vue
+++ b/src/books/policiesAndRegulations/view/components/index.vue
@@ -11,7 +11,7 @@
<chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList"></chapterThree>
<chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList"></chapterFour>
<chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></chapterFive> -->
- <chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList"></chapterSix>
+ <chapterSix v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" :questionData="questionDataMap"></chapterSix>
<!-- <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList">
</chapterSeven>
<chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList"></chapterEight>
@@ -34,6 +34,8 @@
// import chapterNine from "./chapter009.vue"
// import chapterTen from "./chapter010.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";
@@ -171,7 +173,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(11, 290);
+ // this.gotoPage(11, 290);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -556,30 +558,31 @@
// 娣诲姞椤电爜
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])) {
+ 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]) {
+ obj[key] = await getQuestionList(
+ [],
+ testData[catalog][page][key],
+ this.config.activeBook
+ );
+ }
+ this.$set(this.questionDataMap,page,obj)
+ // this.questionDataMap[page] = obj;
+ }
+ }
+ }
+ }
// 娓叉煋杩欎竴椤电殑鏍囪
for (const key in this.renderSignMap) {
if (this.renderSignMap[key][page]) {
--
Gitblit v1.9.1