From 506a01b77de957b1fcbc238888abf9386fdc3577 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期三, 23 七月 2025 15:04:33 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/toddlerSportsSafetyProtection/view/components/index.vue | 74 +++++++++----------------------------
1 files changed, 18 insertions(+), 56 deletions(-)
diff --git a/src/books/toddlerSportsSafetyProtection/view/components/index.vue b/src/books/toddlerSportsSafetyProtection/view/components/index.vue
index 2774aba..39dd967 100644
--- a/src/books/toddlerSportsSafetyProtection/view/components/index.vue
+++ b/src/books/toddlerSportsSafetyProtection/view/components/index.vue
@@ -3,39 +3,14 @@
<div id="searchDomBox" style="display: none">
<div id="searchContent"></div>
</div>
- <div
- class="page-content"
- :style="{
- fontSize: fontSize + 'px',
- transform: `scale(${pageZoom})`,
- 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>
- <chapterFour
- v-if="showCatalogList.indexOf(5) > -1"
- :showPageList="loadPageList"
- ></chapterFour>-->
- <chapterFive
- v-if="showCatalogList.indexOf(2) > -1"
- :showPageList="loadPageList"
- :interfaceQuestion="questionDataMap"
- ></chapterFive>
+ <div class="page-content" :style="{
+ fontSize: fontSize + 'px',
+ transform: `scale(${pageZoom})`,
+ transformOrigin: 'center top',
+ }">
+ <pageHeader v-if="showCatalogList.indexOf(1) > -1" :showPageList="loadPageList"></pageHeader>
+ <chapterFive v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList"
+ :interfaceQuestion="questionDataMap"></chapterFive>
</div>
</div>
</template>
@@ -187,20 +162,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(2, 185);
- // setTimeout(() => {
- // this.renderSign("Highlight", {
- // id: "2ACA9359",
- // txt: "棰樹竴瀛︿範涓婚涓� 杩愬姩",
- // page: "10",
- // type: "Highlight",
- // color: "#F5E12A"
- // });
- // setTimeout(() => {
- // this.delSign({
- // ids: ["2ACA9359"]
- // });
- // }, 2000);
+ // this.gotoPage(2, 163);
// }, 500);
// const pageDom = (this.container ? this.container : document)
@@ -477,8 +439,8 @@
page && pageThemeColor && pageThemeColor[page]
? pageThemeColor[page]
: chapterNum && chapterThemeColor && chapterThemeColor[chapterNum]
- ? chapterThemeColor[chapterNum]
- : bookThemeColor;
+ ? chapterThemeColor[chapterNum]
+ : bookThemeColor;
if (themeColor) {
domItem.style.color = themeColor;
}
@@ -495,8 +457,8 @@
page && pageThemeColor && pageThemeColor[page]
? pageThemeColor[page]
: chapterNum && chapterThemeColor && chapterThemeColor[chapterNum]
- ? chapterThemeColor[chapterNum]
- : bookThemeColor;
+ ? chapterThemeColor[chapterNum]
+ : bookThemeColor;
if (themeColor) {
domItem.style.backgroundColor = themeColor;
}
@@ -513,8 +475,8 @@
page && pageThemeColor && pageThemeColor[page]
? pageThemeColor[page]
: chapterNum && chapterThemeColor && chapterThemeColor[chapterNum]
- ? chapterThemeColor[chapterNum]
- : bookThemeColor;
+ ? chapterThemeColor[chapterNum]
+ : bookThemeColor;
if (themeColor) {
domItem.style.borderColor = themeColor;
}
@@ -579,7 +541,7 @@
this.questionDataMap[page] = await getQuestionList(
page,
testData[catalog][page],
- this.config.activeBook
+ this.config.ceShiActiveBook
);
} else {
const obj = {};
@@ -587,7 +549,7 @@
obj[key] = await getQuestionList(
[],
testData[catalog][page][key],
- this.config.activeBook
+ this.config.ceShiActiveBook
);
}
this.questionDataMap[page] = obj;
@@ -843,7 +805,7 @@
// 璁板綍楂樹寒淇℃伅
this.highlightData = data;
// 璺宠浆
- this.gotoPage(data.catalog, data.page, () => {});
+ this.gotoPage(data.catalog, data.page, () => { });
},
// 椤甸潰鍚戜笅婊氬姩锛岄煶棰戝皬绐楁挱鏀惧姛鑳�
getAduio() {
--
Gitblit v1.9.1