From 6bfdebe168ed50f603a838f47c45c51605dbc6e7 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 11 六月 2024 10:43:56 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/embedded/view/components/index.vue | 2 ++
src/books/lifeCare/view/components/index.vue | 13 ++-----------
src/books/artAndDance/view/components/index.vue | 2 ++
src/App.vue | 2 +-
src/books/English/view/components/index.vue | 2 ++
src/books/childHealth/view/content/index.vue | 13 ++-----------
src/books/sportsAndHealth/view/components/index.vue | 13 ++-----------
7 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d0e1de1..0e7d8d2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -72,7 +72,7 @@
// embedded
// english
// artAndDance
- this.config.resourceCtx + "childHealth"
+ this.config.resourceCtx + "sportsAndHealth"
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/books/English/view/components/index.vue b/src/books/English/view/components/index.vue
index 9632f7e..a911a6c 100644
--- a/src/books/English/view/components/index.vue
+++ b/src/books/English/view/components/index.vue
@@ -731,6 +731,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -762,6 +763,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
diff --git a/src/books/artAndDance/view/components/index.vue b/src/books/artAndDance/view/components/index.vue
index d784f74..0c3cdbe 100644
--- a/src/books/artAndDance/view/components/index.vue
+++ b/src/books/artAndDance/view/components/index.vue
@@ -746,6 +746,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -777,6 +778,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 8d4ef10..1b0f7fa 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -21,61 +21,51 @@
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterOne>
<chapterTwo
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterTwo>
<chapterThree
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterThree>
<chapterFour
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterFour>
<chapterFive
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterFive>
<chapterSix
v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterSix>
<chapterSeven
v-if="showCatalogList.indexOf(8) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterSeven>
<chapterEight
v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterEight>
<chapterNine
v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterNine>
<chapterTen
v-if="showCatalogList.indexOf(11) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
></chapterTen>
<chapterEleven
v-if="showCatalogList.indexOf(12) > -1"
@@ -133,7 +123,6 @@
questionDataMap: {},
renderSignMap: {},
highlightData: null,
- isSearch:false
};
},
computed: {
@@ -812,6 +801,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -843,6 +833,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
diff --git a/src/books/embedded/view/components/index.vue b/src/books/embedded/view/components/index.vue
index b7b9e73..f187aa3 100644
--- a/src/books/embedded/view/components/index.vue
+++ b/src/books/embedded/view/components/index.vue
@@ -713,6 +713,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -744,6 +745,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
diff --git a/src/books/lifeCare/view/components/index.vue b/src/books/lifeCare/view/components/index.vue
index b01f62f..2e60d55 100644
--- a/src/books/lifeCare/view/components/index.vue
+++ b/src/books/lifeCare/view/components/index.vue
@@ -14,44 +14,37 @@
<front001
v-if="showCatalogList.indexOf(1) > -1"
:showPageList="loadPageList"
- :isSearch="isSearch"
/>
<ChapterOne
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterTwo
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterThree
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterFour
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterFive
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
@Upload_initViewer="changeDomViewer"
- :isSearch="isSearch"
/>
<chapterSix
v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<chapterSeven
v-if="showCatalogList.indexOf(8) > -1"
@@ -59,19 +52,16 @@
:questionData="questionDataMap"
@eventSwdt="swdtChange"
@Upload_initViewer="changeDomViewer"
- :isSearch="isSearch"
/>
<chapterEight
v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<chapterNine
v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<chapter010
v-if="showCatalogList.indexOf(11) > -1"
@@ -156,7 +146,6 @@
questionDataMap: {},
renderSignMap: {},
highlightData: null,
- isSearch: false,
};
},
computed: {
@@ -828,6 +817,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -859,6 +849,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue
index a00a00a..c8e9ca8 100644
--- a/src/books/sportsAndHealth/view/components/index.vue
+++ b/src/books/sportsAndHealth/view/components/index.vue
@@ -14,44 +14,37 @@
<front001
v-if="showCatalogList.indexOf(1) > -1"
:showPageList="loadPageList"
- :isSearch="isSearch"
/>
<ChapterOne
v-if="showCatalogList.indexOf(2) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterTwo
v-if="showCatalogList.indexOf(3) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterThree
v-if="showCatalogList.indexOf(4) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<ChapterFour
v-if="showCatalogList.indexOf(5) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/>
<!-- <ChapterFive
v-if="showCatalogList.indexOf(6) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
@Upload_initViewer="changeDomViewer"
- :isSearch="isSearch"
/> -->
<!-- <chapterSix
v-if="showCatalogList.indexOf(7) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/> -->
<!-- <chapterSeven
v-if="showCatalogList.indexOf(8) > -1"
@@ -59,19 +52,16 @@
:questionData="questionDataMap"
@eventSwdt="swdtChange"
@Upload_initViewer="changeDomViewer"
- :isSearch="isSearch"
/> -->
<!-- <chapterEight
v-if="showCatalogList.indexOf(9) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/> -->
<!-- <chapterNine
v-if="showCatalogList.indexOf(10) > -1"
:showPageList="loadPageList"
:questionData="questionDataMap"
- :isSearch="isSearch"
/> -->
<!-- <chapter010
v-if="showCatalogList.indexOf(11) > -1"
@@ -156,7 +146,6 @@
questionDataMap: {},
renderSignMap: {},
highlightData: null,
- isSearch: false,
};
},
computed: {
@@ -828,6 +817,7 @@
propsData: {
showPageList: [],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
@@ -859,6 +849,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
+ isSearch: true
},
});
pageExample.$mount(
--
Gitblit v1.9.1