From d14467a70204879c15b82de39deb6df23b85a088 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 28 五月 2024 16:29:57 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/components/chapter001.vue | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 6a9a0e1..7cc83b3 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -300,7 +300,7 @@
<examinations
v-if="testOne && questionData"
ref="examinationOne"
- :cardList="questionData[2]"
+ :cardList="questionData[9]"
:chapter="1"
:page="2"
/>
@@ -617,7 +617,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span>
<examinations
- :cardList="questionData[6]"
+ :cardList="questionData[14]"
v-if="questionData"
:chapter="1"
:page="6"
@@ -1034,7 +1034,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚浜�</span>
<examinations
- :cardList="questionData[9]"
+ :cardList="questionData[17]"
v-if="questionData"
:chapter="1"
:page="9"
@@ -1499,7 +1499,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span>
<examinations
- :cardList="questionData[14]"
+ :cardList="questionData[22]"
v-if="questionData"
:chapter="1"
:page="14"
@@ -1950,7 +1950,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚鍥�</span>
<examinations
- :cardList="questionData[19]"
+ :cardList="questionData[27]"
v-if="questionData"
:chapter="1"
:page="19"
@@ -2534,7 +2534,7 @@
>涓撻涓� 瀛︿範涓婚浜斻�佸涔犱富棰樺叚</span
>
<examinations
- :cardList="questionData[24]"
+ :cardList="questionData[32]"
v-if="questionData"
:chapter="1"
:page="24"
@@ -2851,7 +2851,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span>
<examinations
- :cardList="questionData[26]"
+ :cardList="questionData[34]"
v-if="questionData"
:chapter="1"
:page="26"
@@ -3308,7 +3308,7 @@
<p class="blockh6-c">
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚鍏�</span>
<examinations
- :cardList="questionData[31]"
+ :cardList="questionData[39]"
v-if="questionData"
:chapter="1"
:page="31"
@@ -4062,7 +4062,7 @@
<!-- <img class="img-g" alt="" src="image/0053-1.jpg" /><br /> -->
<span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涔�</span>
<examinations
- :cardList="questionData[40]"
+ :cardList="questionData[48]"
v-if="questionData"
:chapter="1"
:page="40"
@@ -4275,7 +4275,7 @@
瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵鎵爜娴嬩竴娴嬪惂锛�<br />
<span class="img">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級1</span><br />
<examinations
- :cardList="questionData[421]"
+ :cardList="questionData[50][1]"
v-if="questionData"
:chapter="1"
:page="421"
@@ -4283,7 +4283,7 @@
<span class="span-border"></span>
<span class="img mt-20 dl-bl">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級2</span>
<examinations
- :cardList="questionData[422]"
+ :cardList="questionData[50][2]"
v-if="questionData"
:chapter="1"
:page="422"
@@ -4309,8 +4309,6 @@
<script>
import examinations from "@/components/examinations/index.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 },
@@ -4318,6 +4316,9 @@
showPageList:{
type:Array,
default:[]
+ },
+ questionData:{
+ type:Object
}
},
data() {
@@ -4381,7 +4382,6 @@
learnTableSeven: true,
learnTableEight: true,
learnTableNine: true,
- questionData: {},
pathOne: "",
pathTwo: "",
pathThree: "",
@@ -4550,11 +4550,11 @@
this.saveChapterOneData();
}
}, 1000);
- this.$data.questionData = await getQuestionData(
- "1",
- testData[1],
- this.config.activeBook
- );
+ // this.$data.questionData = await getQuestionData(
+ // "1",
+ // testData[1],
+ // this.config.activeBook
+ // );
},
unmounted() {
if (window.timerOne) {
@@ -4564,7 +4564,7 @@
},
methods: {
changeResources(type) {
- console.log("鐐瑰嚮", type, this.learnTbaleOne, this.$data.questionData);
+ console.log("鐐瑰嚮",this.$props.questionData);
if (type == "learnTbaleOne") {
this.$data.learnTbaleOne = !this.$data.learnTbaleOne;
} else if (type == "videoOne") {
--
Gitblit v1.9.1