From be7de94a601b8cbc1682a7ee12a05526d806f329 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期六, 12 十月 2024 13:06:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/view/components/index.vue | 116 ++++++++++++----------------------------------------------
1 files changed, 24 insertions(+), 92 deletions(-)
diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue
index 74b5385..0707942 100644
--- a/src/books/sportsAndHealth/view/components/index.vue
+++ b/src/books/sportsAndHealth/view/components/index.vue
@@ -15,79 +15,12 @@
<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> -->
<chapterfive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList"></chapterfive>
- <!-- <assemblyTwo v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList" @openPDFChange="swdtChange" /> -->
+ <chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList"></chapterSix>
+ <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList"></chapterSeven>
+ <chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList"></chapterEight>
+ <chapterNine v-if="showCatalogList.indexOf(10) > -1" :showPageList="loadPageList"></chapterNine>
- <!-- <ChapterFour
- v-if="showCatalogList.indexOf(5) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- /> -->
- <!-- <ChapterFive
- v-if="showCatalogList.indexOf(6) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- @Upload_initViewer="changeDomViewer"
- /> -->
- <!-- <chapterSix
- v-if="showCatalogList.indexOf(7) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- /> -->
- <!-- <chapterSeven
- v-if="showCatalogList.indexOf(8) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- @eventSwdt="swdtChange"
- @Upload_initViewer="changeDomViewer"
- /> -->
- <!-- <chapterEight
- v-if="showCatalogList.indexOf(9) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- /> -->
- <!-- <chapterNine
- v-if="showCatalogList.indexOf(10) > -1"
- :showPageList="loadPageList"
- :questionData="questionDataMap"
- /> -->
- <!-- <chapter010
- v-if="showCatalogList.indexOf(11) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter011
- v-if="showCatalogList.indexOf(12) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter012
- v-if="showCatalogList.indexOf(13) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter013
- v-if="showCatalogList.indexOf(14) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter014
- v-if="showCatalogList.indexOf(15) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter015
- v-if="showCatalogList.indexOf(16) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter016
- v-if="showCatalogList.indexOf(17) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter017
- v-if="showCatalogList.indexOf(18) > -1"
- :showPageList="loadPageList"
- /> -->
- <!-- <chapter018
- v-if="showCatalogList.indexOf(19) > -1"
- :showPageList="loadPageList"
- /> -->
</div>
</div>
</template>
@@ -100,24 +33,12 @@
import chapterThree from './chapter003.vue'
import chapterFour from './chapter004.vue'
import chapterfive from './chapter005.vue'
-// import assemblyOne from "./testDynaicTable.vue";
-import assemblyTwo from './testPp.vue'
-// import ChapterFour from "./testPp";
-// import ChapterFive from "./chapter005";
-// import chapterSix from "./chapter006";
-// import chapterSeven from "./chapter007";
-// import chapterEight from "./chapter008";
-// import chapterNine from "./chapter009";
-// import chapter010 from "./chapter010";
-// import chapter011 from "./chapter011";
-// import chapter012 from "./chapter012";
-// import chapter013 from "./chapter013";
-// import chapter014 from "./chapter014";
-// import chapter015 from "./chapter015";
-// import chapter016 from "./chapter016";
-// import chapter017 from "./chapter017";
-// import chapter018 from "./chapter018";
+import chapterSix from './chapter006.vue'
+import chapterSeven from './chapter007.vue'
+import chapterEight from './chapter008.vue'
+import chapterNine from './chapter009.vue'
+
import NoteIcon from '@/assets/images/biji.png'
import _ from 'lodash'
import getQuestionList from '@/assets/methods/examination'
@@ -129,7 +50,7 @@
export default {
data() {
return {
- catalogLength: 7, // 鎬荤珷鑺傛暟
+ catalogLength: 10, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -246,8 +167,8 @@
}, 500)
// 娴嬭瘯椤甸潰璺宠浆
- setTimeout(() => {
- this.gotoPage(5, 195)
+ // setTimeout(() => {
+ // this.gotoPage(1, 41)
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -275,7 +196,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- }, 500)
+ // }, 500)
},
methods: {
swdtChange(data) {
@@ -357,6 +278,7 @@
},
// 绔犺妭銆侀〉闈㈣烦杞�
gotoPage(catalog, page) {
+
if (catalog >= 0 && catalog <= this.catalogLength) {
// 澶勭悊娓叉煋绔犺妭
if (catalog == 0) {
@@ -375,9 +297,11 @@
const pageDom = (
this.container ? this.container : document
).querySelector(`[page="${page}"]`)
+
if (pageDom) {
pageDom.scrollIntoView()
} else {
+
console.log('椤电爜閿欒锛�')
}
}, 500)
@@ -817,6 +741,10 @@
chapterThree,
chapterFour,
chapterfive,
+ chapterSix,
+ chapterSeven,
+ chapterEight,
+ chapterNine
// assemblyOne,
// assemblyTwo,
}
@@ -952,6 +880,10 @@
chapterThree,
chapterFour,
chapterfive,
+ chapterSix,
+ chapterSeven,
+ chapterEight,
+ chapterNine
// assemblyOne,
// assemblyTwo,
// ChapterFour,
--
Gitblit v1.9.1