From 4e236a15226b5341cebc480c4798069b9f90919a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 06 十一月 2024 17:04:40 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilAviation/view/components/index.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/books/civilAviation/view/components/index.vue b/src/books/civilAviation/view/components/index.vue
index 2cee5ad..727a816 100644
--- a/src/books/civilAviation/view/components/index.vue
+++ b/src/books/civilAviation/view/components/index.vue
@@ -10,6 +10,10 @@
}">
<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(6) > -1" :showPageList="loadPageList"></chapterfive>
</div>
</div>
</template>
@@ -17,6 +21,10 @@
<script>
import pageHeader from "./header.vue";
import chapterOne from "./chapter001.vue";
+import chapterTwo from "./chapter002.vue";
+import chapterThree from "./chapter003.vue";
+import chapterfour from "./chapter004.vue";
+import chapterfive from "./chapter005.vue"
import NoteIcon from "@/assets/images/biji.png";
import _ from "lodash";
import Swiper from "swiper/bundle";
@@ -27,7 +35,7 @@
name: "pageContent",
data() {
return {
- catalogLength: 2, // 鎬荤珷鑺傛暟
+ catalogLength: 6, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -151,8 +159,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- // setTimeout(() => {
- // this.gotoPage(6, 30);
+ setTimeout(() => {
+ this.gotoPage(6,190);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -166,7 +174,7 @@
// ids: ["2ACA9359"]
// });
// }, 2000);
- // }, 500);
+ }, 500);
// const pageDom = (this.container ? this.container : document)
// .querySelector("#app")
@@ -706,6 +714,10 @@
const pageData = {
pageHeader,
chapterOne,
+ chapterTwo,
+ chapterThree,
+ chapterfour,
+ chapterfive,
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -928,6 +940,10 @@
components: {
pageHeader,
chapterOne,
+ chapterTwo,
+ chapterThree,
+ chapterfour,
+ chapterfive,
},
};
</script>
--
Gitblit v1.9.1