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 | 192 +++++++++++++++++++++++++++++++----------------
1 files changed, 125 insertions(+), 67 deletions(-)
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index 2385e42..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">
@@ -1812,9 +1814,9 @@
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
+ <div class="pageBox"></div>
</div>
<!-- 鏄剧ず褰撳墠椤靛拰鎬婚〉鏁扮殑鍏冪礌 -->
- <div class="pageBox">{{ pageNum }} / {{ total }}</div>
</div>
</div>
</div>
@@ -2305,24 +2307,14 @@
</template>
<script>
-import getResourcePath from "@/assets/methods/resources";
-import Swiper from "swiper/bundle";
-import "swiper/swiper-bundle.css";
+import matching from "@/components/matching/matching.vue";
+import { getResourcePath } from "@/assets/methods/resources";
export default {
name: "chapter-one",
+ components:{matching},
props: {
showPageList: {
type: Array,
- },
- },
- watch: {
- showPageList: {
- handler(newVal, oldVal) {
- if (newVal.indexOf(14) > -1) {
- console.log("椤电爜", newVal, oldVal);
- this.setSwiper();
- }
- },
},
},
data() {
@@ -2335,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: {
@@ -2553,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"
);
},
@@ -2630,51 +2733,6 @@
},
saveData() {
console.log(this.testData);
- },
- setSwiper() {
- const that = this;
- const dom = document.querySelector(".swiper_ppt");
- console.log("dom", dom);
- new Swiper(dom, {
- loop: false, // 鏃犵紳
- autoplay: false,
- paginationClickable: true,
- slidesPerView: 1, // 涓�缁勪笁涓�
- spaceBetween: 30, // 闂撮殧
- // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
- navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
- ".swiper-button-next"
- ),
- prevEl: (this.container ? this.container : document).querySelector(
- ".swiper-button-prev"
- ),
- },
- // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
- observer: true,
- observeParents: true,
- on: {
- slideChange: function (value) {
- console.log("ppt椤电爜", value);
- let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
- let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
- // this.changePage(currentPage)
- that.pageNum = currentPage;
- this.total = totalPages;
- console.log(this.pageNum, this.total);
- },
- // slideChangeTran sitionStart:function (value) {
- // // 姣忓綋婊戝潡鏀瑰彉鏃惰Е鍙戯紝鏇存柊褰撳墠椤靛拰鎬婚〉鏁扮殑鏄剧ず
- // let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級
- // let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁�
- // var paginationInfoEl = document.querySelector('.pagination-info');
- // paginationInfoEl.textContent = currentPage + '/' + totalPages;
- // }
- },
- });
- },
- changePage(value) {
- this.pageNum = value;
},
},
};
--
Gitblit v1.9.1