From 23ebc0d9ee7d4b06916478f84b411d0406f11a3a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 05 六月 2024 18:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/index.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/books/sportsAndHealth/index.vue b/src/books/sportsAndHealth/index.vue
index 804efb9..f6f6ca3 100644
--- a/src/books/sportsAndHealth/index.vue
+++ b/src/books/sportsAndHealth/index.vue
@@ -13,26 +13,31 @@
v-if="showCatalogList.indexOf(1) > -1"
:showPageList="loadPageList"
/>
- <!-- <ChapterOne
+ <ChapterOne
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionData"
- /> -->
- <!-- <ChapterTwo
+ :isSearch="isSearch"
+ />
+ <ChapterTwo
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionData"
- /> -->
- <!-- <ChapterThree
+ @eventPublic="swdtChange"
+ :isSearch="isSearch"
+ />
+ <ChapterThree
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionData"
- /> -->
- <!-- <ChapterFour
+ :isSearch="isSearch"
+ />
+ <ChapterFour
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionData"
- /> -->
+ :isSearch="isSearch"
+ />
<!-- <ChapterFive
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
@@ -47,7 +52,7 @@
v-if="showCatalogList.indexOf(8) > -1"
:showPageList="loadPageList"
:questionData="questionData"
- @eventSwdt="swdtChange"
+ @eventPublic="swdtChange"
/> -->
<!-- <chapterEight
v-if="showCatalogList.indexOf(9) > -1"
@@ -101,8 +106,10 @@
<script>
import front001 from "./view/front001";
-// import ChapterOne from "./view/chapter001";
-// import ChapterTwo from "./view/chapter002";
+import ChapterOne from "./view/chapter001";
+import ChapterTwo from "./view/chapter002";
+import ChapterThree from "./view/testDynaicTable";
+import ChapterFour from "./view/testPp";
// import ChapterThree from "./view/chapter003";
// import ChapterFour from "./view/chapter004";
// import ChapterFive from "./view/chapter005";
@@ -130,7 +137,7 @@
export default {
data() {
return {
- catalogLength: 19, // 鎬荤珷鑺傛暟
+ catalogLength: 5, // 鎬荤珷鑺傛暟
showCatalogList: [], // 鏄剧ず鐨勭珷鑺�
loadThreshold: 300, // 瑙﹀彂鍔犺浇闃堝��
throttleThreshold: 100, // 鑺傛祦闃堝��
@@ -141,6 +148,7 @@
loadPageList: [],
questionData: {},
renderSignMap: {},
+ isSearch: false,
};
},
computed: {
@@ -186,7 +194,7 @@
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [1];
+ this.showCatalogList = [5];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -701,6 +709,9 @@
for (let i = 0; i < doms.length; i++) {
const dom = doms[i];
new Viewer(dom, {
+ container: this.container
+ ? this.container.querySelector("#app")
+ : "body",
navbar: true, // 鏄剧ず瀵艰埅鏍�
toolbar: true, // 鏄剧ず宸ュ叿鏍�
title: true, // 鏄剧ず鏍囬
@@ -761,17 +772,18 @@
swdtChange(data) {
if (this.$store.state.qiankun && this.$store.state.qiankun.chooseWords) {
this.$store.state.qiankun.chooseWords({
- type: data,
+ type: data.type,
+ data: data.data,
});
}
},
},
components: {
front001,
- // ChapterOne,
- // ChapterTwo,
- // ChapterThree,
- // ChapterFour,
+ ChapterOne,
+ ChapterTwo,
+ ChapterThree,
+ ChapterFour,
// ChapterFive,
// chapterSix,
// chapterSeven,
--
Gitblit v1.9.1