From a954bafb1bb4a70b2baf768230f2c50fd5c7163c Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期四, 13 六月 2024 14:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/English/view/components/chapter001.vue | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 36 deletions(-)
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index 8dc5e7f..34edb72 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -505,7 +505,12 @@
<div class="bodystyle">
<h3 id="c002" class="fl al-cn">
<span class="bjh3">Listening</span>
- <audio :src="resource.listenOne" controls></audio>
+ <audio
+ :src="resource.listenOne"
+ controls
+ class="audio"
+ @play="audioPlay"
+ ></audio>
</h3>
<p>
<b
@@ -514,12 +519,24 @@
corresponding descriptions.</b
>
</p>
- <p class="center">
+ <!-- <p class="center">
<img class="img-0" alt="" src="../../assets/images/0013-3.jpg" />
- </p>
+ </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>
+ <audio
+ :src="resource.readingOne"
+ controls
+ class="audio"
+ @play="audioPlay"
+ ></audio>
</h3>
<p>
1.How was Chinese culture introduced to the world in ancient
@@ -728,6 +745,8 @@
:src="resource.readingTwo"
controls
style="margin-left: 10px"
+ class="audio"
+ @play="audioPlay"
></audio>
<p>wonderland /藞w蕦nd蓹l忙nd/ <i>n.</i> 鏈夎澶氬濡欎簨鐗╃殑鍦版柟</p>
<div class="bkbj">
@@ -830,11 +849,18 @@
>
</p>
</div>
- <p>get selected as ...琚�変负鈥︹��</p>
- <p>(a) variety of ...鍚勭鍚勬牱鐨勨�︹��</p>
- <p>come across 鍋堕亣锛涚鍒�</p>
- <p>be curious about ...瀵光�︹�︽劅鍒板ソ濂�</p>
- <p>along the way 娌块��</p>
+ <ul class="w100 fl fw-wr">
+ <li>
+ <p>get selected as ...琚�変负鈥︹��</p>
+ <p>(a) variety of ...鍚勭鍚勬牱鐨勨�︹��</p>
+ <p>come across 鍋堕亣锛涚鍒�</p>
+ </li>
+ <li>
+ <p>be curious about ...瀵光�︹�︽劅鍒板ソ濂�</p>
+ <p>along the way 娌块��</p>
+ </li>
+ </ul>
+
<div class="bj-note">
<p class="m0"><b class="fz-18">Notes:</b></p>
<p class="m0">
@@ -1664,7 +1690,7 @@
</div>
<div class="resource-primary-border" style="padding: 8px">
<div class="banshi openImgBox">
- <div class="swiper-container swiper-ppt">
+ <div class="swiper-container swiper_ppt">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
@@ -1804,9 +1830,9 @@
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
- <!-- 鏄剧ず褰撳墠椤靛拰鎬婚〉鏁扮殑鍏冪礌 -->
- <div class="pagination-info"></div>
+ <div class="pageBox"></div>
</div>
+ <!-- 鏄剧ず褰撳墠椤靛拰鎬婚〉鏁扮殑鍏冪礌 -->
</div>
</div>
</div>
@@ -2266,14 +2292,14 @@
</div>
<div class="w100 fl ju-cn">
<div class="fl ju-ev mt-40" style="width: 80%">
- <button @click="setDropdownData" class="btn-border btn-w">
- 淇濆瓨
- </button>
<button
class="btn-border btn-w"
@click="handleDropdown('judge')"
>
鎻愪氦
+ </button>
+ <button @click="setDropdownData" class="btn-border btn-w">
+ 淇濆瓨
</button>
<button class="btn-border btn-w" @click="changeDropdown">
閲嶅仛
@@ -2297,14 +2323,15 @@
</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",
- props:{
- showPageList:{
- type:Array
- }
+ components: { matching },
+ props: {
+ showPageList: {
+ type: Array,
+ },
},
data() {
return {
@@ -2316,6 +2343,124 @@
showAnswerFive: false,
showImg: false,
showQuestionAnswer: false,
+ 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("../../assets/images/matching-one.png"),
+ },
questionData: {
warnUp: {
one: {
@@ -2367,7 +2512,7 @@
},
},
testData: {
- check:[],
+ check: [],
tx: {
one: "",
two: "",
@@ -2480,9 +2625,9 @@
localStorage.setItem("english-testOne", JSON.stringify(this.testData));
},
changeTestData() {
- localStorage.removeItem("english-testOne")
+ localStorage.removeItem("english-testOne");
this.testData = {
- check:[],
+ check: [],
tx: {
one: "",
two: "",
@@ -2524,22 +2669,23 @@
four: "",
five: "",
},
- }
+ };
},
setBookQuestion() {
+ console.log('淇濆瓨');
localStorage.setItem(
"english-book-question-one",
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"
);
},
@@ -2594,11 +2740,11 @@
this.dropdownData = dropdownDatas;
},
changeDropdown() {
- localStorage.removeItem("english-dropdown-one")
- for(let key in this.dropdownData) {
- const item = this.dropdownData[key]
- item.value = ""
- item.isRight = null
+ localStorage.removeItem("english-dropdown-one");
+ for (let key in this.dropdownData) {
+ const item = this.dropdownData[key];
+ item.value = "";
+ item.isRight = null;
}
},
setDropdownData() {
@@ -2609,7 +2755,10 @@
},
saveData() {
console.log(this.testData);
- }
+ },
+ audioPlay() {
+ this.$emit("closeMiniAudio");
+ },
},
};
</script>
@@ -2646,7 +2795,7 @@
font-size: 14px;
border-width: 1px;
min-width: 80px;
- min-height: 28px;
+ height: 30px;
background-color: #fff;
&:hover {
background-color: #0bab87;
@@ -2654,12 +2803,27 @@
}
}
.banshi {
+ position: relative;
margin-top: 40px;
width: 100%;
height: 350px;
margin: 0 auto;
}
+.pageBox {
+ z-index: 9999999999;
+ color: #999;
+ position: absolute;
+ left: 48%;
+ bottom: 0px;
+}
select {
height: 24px;
}
+.mini-audio {
+ width: 200px;
+ height: 200px;
+ position: fixed;
+ right: 0;
+ background-color: red;
+}
</style>
--
Gitblit v1.9.1