From 95ca47afec682be5e33a87168e4f91202dfca8c3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 03 六月 2024 19:59:33 +0800
Subject: [PATCH] 合并
---
src/books/English/view/components/chapter001.vue | 134 +++++++++++++++++++++++++++++++++++++++++---
src/components/matching/matching.vue | 6 +-
src/books/English/view/components/header.vue | 6 -
3 files changed, 128 insertions(+), 18 deletions(-)
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index b00a6d0..4a537d1 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -517,6 +517,9 @@
<p class="center">
<img class="img-0" alt="" src="../../assets/images/0013-3.jpg" />
</p>
+ <!-- <div>
+ <matching :rawData="rawData" :item="question" :value="value"></matching>
+ </div> -->
<h3 id="c003" class="fl al-cn">
<span class="bjh3">Reading</span>
<audio :src="resource.readingOne" controls></audio>
@@ -841,8 +844,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 +1817,6 @@
<div class="pageBox"></div>
</div>
<!-- 鏄剧ず褰撳墠椤靛拰鎬婚〉鏁扮殑鍏冪礌 -->
-
</div>
</div>
</div>
@@ -2306,9 +2307,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 +2327,119 @@
showAnswerFive: false,
showImg: false,
showQuestionAnswer: false,
- // pageNum: "1",
- // total: "27",
+ rawData: {
+ left: [
+ {
+ oldId: "FB34",
+ txt: "Silk",
+ },
+ {
+ oldId: "64D6",
+ txt: "The Great Wall",
+ },
+ {
+ oldId: "2ED4",
+ txt: "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: "C",
+ value: "Chinese Food",
+ },
+ {
+ id: "44DE",
+ linkValue: "D",
+ 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: "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.",
+ },
+ {
+ oldId: "44DE",
+ txt: "It was first discovered and drank in China and my favoriteLongjing tea is produced near the West Lake in Hangzhou.",
+ },
+ ],
+ values: [
+ {
+ oldId: "FB34",
+ txt: "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: [],
+ },
questionData: {
warnUp: {
one: {
@@ -2542,14 +2656,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"
);
},
diff --git a/src/books/English/view/components/header.vue b/src/books/English/view/components/header.vue
index 642f742..c310ac9 100644
--- a/src/books/English/view/components/header.vue
+++ b/src/books/English/view/components/header.vue
@@ -1,8 +1,5 @@
<template>
<div class="chapter" num="1">
- <div class="page-box">
- <matching :rawData="rawData" :item="question" :value="value"></matching>
- </div>
<!-- -->
<div class="page-box mt-20" page="1" style="min-height: auto">
<div v-if="showPageList.indexOf(1) > -1">
@@ -196,10 +193,9 @@
</template>
<script>
-import matching from "@/components/matching/matching.vue";
+
export default {
name: "page-header",
- components: { matching },
props: {
showPageList: {
type: Array,
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index 7e1cd5b..2ceb837 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -187,9 +187,9 @@
};
})
.filter((r) => r.right !== undefined);
- this.$emit("input", model);
+ // this.$emit("input", model);
this.item.userChoise = model;
- console.log(JSON.stringify(model));
+ // console.log(JSON.stringify(model));
},
// 瑙︽懜寮�濮�
touchstart(e, item,index) {
@@ -223,7 +223,7 @@
if (this.item.showAnswer) {
return false;
}
- // let event = e.targetTouches[0];
+ console.log('绉诲姩',e);
this.checkItem.line[2] = e.pageX;
this.checkItem.line[3] =
e.pageY - this.$refs.connect.getBoundingClientRect().y + this.scrollTop;
--
Gitblit v1.9.1