From 3d27635c7ac693c461dd2ca01e8f5bebb1f0c642 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 17:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/components/chapter001.vue | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 8cc724b..5a1e29e 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -62,11 +62,12 @@
<span class="fl fl-cn mb-20">
<span class="learn-title-text">鑷富瀛︿範浠诲姟鍗曪細</span>
<span class="t0" >涓撻涓�瀛︿範涓婚涓� 杩愬姩绯荤粺鑷富瀛︿範浠诲姟鍗�</span>
+
<img
src="../../../assets/images/icon/document.png"
alt=""
@click="changeResources('learnTbaleOne')"
- style="margin-left: 10px"
+ style="margin-left: 10px;"
class="btn"
/>
</span>
@@ -78,9 +79,6 @@
cellspacing="0"
class="w100 table-br-color"
>
- <!-- <caption class="fw-b" style="font-size: 18px; margin: 20px 0">
- 鑷富瀛︿範浠诲姟鍗曪細涓撻涓�瀛︿範涓婚涓� 杩愬姩绯荤粺鑷富瀛︿範浠诲姟鍗�
- </caption> -->
<tr>
<th class="primary-color">涓�銆佸涔犳寚鍗�</th>
</tr>
@@ -254,9 +252,10 @@
src="../../../assets/images/icon/video.png"
alt=""
@click="changeResources('videoOne')"
- style="margin-left: 10px"
+ style="margin-left: 10px;"
class="btn"
/>
+ <!-- <svg @click="changeResources('videoOne')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="btn icon icon-tabler icons-tabler-outline icon-tabler-video"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 10l4.553 -2.276a1 1 0 0 1 1.447 .894v6.764a1 1 0 0 1 -1.447 .894l-4.553 -2.276v-4z" /><path d="M3 6m0 2a2 2 0 0 1 2 -2h8a2 2 0 0 1 2 2v8a2 2 0 0 1 -2 2h-8a2 2 0 0 1 -2 -2z" /></svg> -->
</span>
<span v-if="videoOne">
<video
@@ -276,6 +275,7 @@
<span class="fl fl-cn mb-20">
<span class="learn-title-text">浜戞祴璇曪細</span>
<span class="t0">浜轰綋姒傝堪</span>
+ <!-- <svg @click="changeResources('testOne')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="btn icon icon-tabler icons-tabler-outline icon-tabler-ballpen"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M14 6l7 7l-4 4" /><path d="M5.828 18.172a2.828 2.828 0 0 0 4 0l10.586 -10.586a2 2 0 0 0 0 -2.829l-1.171 -1.171a2 2 0 0 0 -2.829 0l-10.586 10.586a2.828 2.828 0 0 0 0 4z" /><path d="M4 20l1.768 -1.768" /></svg> -->
<img
src="../../../assets/images/icon/topic.png"
alt=""
@@ -2655,7 +2655,12 @@
</h6>
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span>
- <examinations :cardList="questionData[26]" v-if="questionData" />
+ <examinations
+ :cardList="questionData[26]"
+ v-if="questionData"
+ :chapter="1"
+ :page="26"
+ />
</p>
<h2 class="module_block" id="b008">
<div class="custom1">瀛︿範涓婚鍏�</div>
@@ -3062,7 +3067,12 @@
</h6>
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚鍏�</span>
- <examinations :cardList="questionData[31]" v-if="questionData" />
+ <examinations
+ :cardList="questionData[31]"
+ v-if="questionData"
+ :chapter="1"
+ :page="31"
+ />
</p>
<h4 id="d065">锛堝叚锛夊畨鎺掍赴瀵岀殑娲诲姩鍙婇�傚綋鐨勪綋鑲查敾鐐�</h4>
<p>
@@ -3756,7 +3766,12 @@
<p class="blockh6-c">
<!-- <img class="img-g" alt="" src="image/0053-1.jpg" /><br /> -->
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涔�</span>
- <examinations :cardList="questionData[40]" v-if="questionData"/>
+ <examinations
+ :cardList="questionData[40]"
+ v-if="questionData"
+ :chapter="1"
+ :page="40"
+ />
</p>
<h6 class="Conclusion-title4">涓撻灏忕粨</h6>
<p class="blockh6">
@@ -3950,10 +3965,20 @@
<p class="blockh6-c">
瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵鎵爜娴嬩竴娴嬪惂锛�<br />
<span class="img">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級1</span><br />
- <examinations :cardList="questionData[421]" v-if="questionData" />
+ <examinations
+ :cardList="questionData[421]"
+ v-if="questionData"
+ :chapter="1"
+ :page="421"
+ />
<span class="span-border"></span>
<span class="img mt-20 dl-bl">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級2</span>
- <examinations :cardList="questionData[422]" v-if="questionData" />
+ <examinations
+ :cardList="questionData[422]"
+ v-if="questionData"
+ :chapter="1"
+ :page="422"
+ />
</p>
<h6 class="Conclusion-title4">鈥㈠涔犲弽鎬濃��</h6>
<p class="blockh6 fl fl-di fl-cn" style="text-indent: 0">
@@ -3973,14 +3998,12 @@
<script>
import examinations from "@/components/examinations/index.vue";
-import evenHeaderVue from '../../components/pageHeader/evenHeader.vue';
-import oddHeaderVue from '../../components/pageHeader/oddHeader.vue';
import getResourcePath from '@/assets/methods/resources'
import getQuestionData from '@/assets/methods/examination'
import testData from '../../../assets/examinationList'
export default {
name: "chapter-one",
- components: { examinations,evenHeaderVue,oddHeaderVue },
+ components: { examinations },
props: {},
data() {
return {
@@ -4211,7 +4234,7 @@
this.saveChapterOneData()
}
},1000)
- this.$data.questionData = await getQuestionData('1',testData[1])
+ this.$data.questionData = await getQuestionData('1',testData[1],this.config.activeBook)
this.getVideoPath()
},
unmounted() {
--
Gitblit v1.9.1