From a0ce9ef2ed2e13882c306c95e29e16af3f4bb373 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 04 六月 2024 15:40:03 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/English/view/components/chapter001.vue | 141 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index b00a6d0..11382cc 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -517,6 +517,13 @@
<p class="center">
<img class="img-0" alt="" src="../../assets/images/0013-3.jpg" />
</p>
+ <div>
+ <ul class="fl ju-bt">
+ <li>Speakers銆�Chinese Cultural Symbols</li>
+ <li style="width:40%;text-align:center">Descriptions</li>
+ </ul>
+ <matching :rawData="rawData" :item="question"></matching>
+ </div>
<h3 id="c003" class="fl al-cn">
<span class="bjh3">Reading</span>
<audio :src="resource.readingOne" controls></audio>
@@ -841,8 +848,7 @@
<p>along the way 娌块��</p>
</li>
</ul>
-
-
+
<div class="bj-note">
<p class="m0"><b class="fz-18">Notes:</b></p>
<p class="m0">
@@ -1815,7 +1821,6 @@
<div class="pageBox"></div>
</div>
<!-- 鏄剧ず褰撳墠椤靛拰鎬婚〉鏁扮殑鍏冪礌 -->
-
</div>
</div>
</div>
@@ -2306,9 +2311,11 @@
</template>
<script>
-import {getResourcePath} from "@/assets/methods/resources";
+import matching from "@/components/matching/matching.vue";
+import { getResourcePath } from "@/assets/methods/resources";
export default {
name: "chapter-one",
+ components:{matching},
props: {
showPageList: {
type: Array,
@@ -2324,8 +2331,121 @@
showAnswerFive: false,
showImg: false,
showQuestionAnswer: false,
- // pageNum: "1",
- // total: "27",
+ rawData: {
+ left: [
+ {
+ oldId: "FB34",
+ txt: "Martin銆�銆�銆�銆�Silk",
+ },
+ {
+ oldId: "64D6",
+ txt: "Jessica銆�銆�The Great Wall",
+ },
+ {
+ oldId: "2ED4",
+ txt: "Soren銆�銆�Chinese Food",
+ },
+ {
+ oldId: "44DE",
+ txt: "Chinese銆�銆�銆�銆�Tea",
+ },
+ ],
+ right: [
+ {
+ oldId: "64D6",
+ txt: "It is one of China's must-see sights for visitors, which shows thewisdom of Chinese people.",
+ },
+ {
+ oldId: "FB34",
+ txt: "It was first discovered and drank in China and my favorileLongjing tca is praduced near the West Lake in Hangzhou.",
+ },
+ {
+ oldId: "2ED4",
+ txt: "The clothing material is quite popular among Roman women inancient times.",
+ },
+ {
+ oldId: "44DE",
+ txt: "It is very delicious and I like the hot and spicy Sichuan lavor hest.",
+ },
+ ],
+ },
+ value: [],
+ question: {
+ KnowledgePoint: "123",
+ analysis: "123",
+ answer: [
+ {
+ id: "FB34",
+ linkValue: "The clothing material is quite popular among Roman women inancient times.",
+ value: "Silk",
+ },
+ {
+ id: "64D6",
+ linkValue: "It is one of China's must-see sights for visitors, which shows thewisdom of Chinese people.",
+ value: "The Great Wall",
+ },
+ {
+ id: "2ED4",
+ linkValue: "It is very delicious and I like the hot and spicy Sichuan lavor hest.",
+ value: "Chinese Food",
+ },
+ {
+ id: "44DE",
+ linkValue: "It was first discovered and drank in China and my favorileLongjing tca is praduced near the West Lake in Hangzhou.",
+ value: "Chinese Tea",
+ },
+ ],
+ optionStyle: undefined,
+ id: 489306,
+ options: {
+ linkValues: [
+ {
+ oldId: "64D6",
+ txt: "It is one of China's must-see sights for visitors, which shows thewisdom of Chinese people.",
+ },
+ {
+ oldId: "44DE",
+ txt: "It was first discovered and drank in China and my favoriteLongjing tea is produced near the West Lake in Hangzhou.",
+ },
+ {
+ oldId: "FB34",
+ txt: "The clothing material is quite popular among Roman women inancient times.",
+ },
+ {
+ oldId: "2ED4",
+ txt: "It is very delicious and I like the hot and spicy Sichuan lavor hest.",
+ },
+
+ ],
+ values: [
+ {
+ oldId: "FB34",
+ txt: "Martin Silk",
+ },
+ {
+ oldId: "64D6",
+ txt: "The Great Wall",
+ },
+ {
+ oldId: "2ED4",
+ txt: "Chinese Food",
+ },
+ {
+ oldId: "44DE",
+ txt: "Chinese Tea",
+ },
+ ],
+ },
+ questionType: "matching",
+ stem: {
+ stemTxt: "鎸夐『搴忚繛绾�",
+ },
+ stemStyle: undefined,
+ titleDescription: "1",
+ userChoise: [],
+ value: [],
+ answerImg:require("@/books/English/assets/images/matching-one.png")
+ },
questionData: {
warnUp: {
one: {
@@ -2542,14 +2662,14 @@
JSON.stringify(this.questionData)
);
},
- getPath() {
- this.resource.listenOne = getResourcePath(
+ async getPath() {
+ this.resource.listenOne = await getResourcePath(
"422139A2EF66EA888C5ED1D550AE23E0"
);
- this.resource.readingOne = getResourcePath(
+ this.resource.readingOne = await getResourcePath(
"3F442B682D84C8AB06C800B29D734920"
);
- this.resource.readingTwo = getResourcePath(
+ this.resource.readingTwo = await getResourcePath(
"E8719EC88026BCFB11D292AA999F6D3D"
);
},
@@ -2680,4 +2800,5 @@
select {
height: 24px;
}
+
</style>
--
Gitblit v1.9.1