From 3a9cb686109b102362c9fe9af1c61893a8a88d8a Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期一, 29 七月 2024 16:09:47 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/view/components/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue
index cba2248..fca9090 100644
--- a/src/books/sportsAndHealth/view/components/index.vue
+++ b/src/books/sportsAndHealth/view/components/index.vue
@@ -13,7 +13,8 @@
<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>
- <assemblyOne v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></assemblyOne>
+ <!-- <assemblyOne v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></assemblyOne> -->
+ <chapterfive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></chapterfive>
<!-- <assemblyTwo v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList" @openPDFChange="swdtChange" /> -->
@@ -97,7 +98,8 @@
import chapterTwo from "./chapter002.vue";
import chapterThree from "./chapter003.vue";
import chapterFour from "./chapter004.vue";
-import assemblyOne from "./testDynaicTable.vue";
+import chapterfive from "./chapter005.vue";
+// import assemblyOne from "./testDynaicTable.vue";
import assemblyTwo from "./testPp.vue";
// import ChapterFour from "./testPp";
@@ -244,7 +246,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(4, 127);
+ this.gotoPage(5, 163);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -814,8 +816,10 @@
chapterTwo,
chapterThree,
chapterFour,
- assemblyOne,
- assemblyTwo
+ chapterfive,
+ // assemblyOne,
+ // assemblyTwo,
+
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -947,8 +951,9 @@
chapterTwo,
chapterThree,
chapterFour,
- assemblyOne,
- assemblyTwo
+ chapterfive,
+ // assemblyOne,
+ // assemblyTwo,
// ChapterFour,
// ChapterFive,
// chapterSix,
--
Gitblit v1.9.1