From eaca7b61bb877006c25449a9f68083f26956d5fa Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 22 七月 2024 11:35:48 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/English/view/components/chapter004.vue | 12 ++++++------
src/books/English/view/components/chapter003.vue | 7 -------
src/books/English/view/components/chapter006.vue | 6 ------
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/books/English/view/components/chapter003.vue b/src/books/English/view/components/chapter003.vue
index ad151e3..5c557e0 100644
--- a/src/books/English/view/components/chapter003.vue
+++ b/src/books/English/view/components/chapter003.vue
@@ -5303,13 +5303,6 @@
saveData() {
console.log(this.testData);
},
- isTextRight(answer, data, num) {
- let flag = null;
- if (data) {
- flag = answer[num] == data
- }
- return flag;
- },
isShowRight(answer, userAnswer, data) {
let flag = null;
if (userAnswer.indexOf(data) > -1) {
diff --git a/src/books/English/view/components/chapter004.vue b/src/books/English/view/components/chapter004.vue
index 16e7d59..6ba100d 100644
--- a/src/books/English/view/components/chapter004.vue
+++ b/src/books/English/view/components/chapter004.vue
@@ -1849,22 +1849,22 @@
<p>
<input type="checkbox" value="What it is" name="what" v-model="listenTwo[0].value[0].userAnswer" :disabled="listenTwo[0].isComplete">
1.What it is
- <img :src="isTextRight(listenTwo[0].value[0].answer,'What it is',0) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[0],0) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
<p>
<input type="checkbox" value="Where Nadia got it" name="what" v-model="listenTwo[0].value[0].userAnswer" :disabled="listenTwo[0].isComplete">
2.Where Nadia got it
- <img :src="isTextRight(listenTwo[0].value[0].answer,'Where Nadia got it',1) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[1],1) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
<p>
<input type="checkbox" value="How much it is" name="what" v-model="listenTwo[0].value[0].userAnswer" :disabled="listenTwo[0].isComplete">
3.How much it is
- <img :src="isTextRight(listenTwo[0].value[0].answer,'How much it is',2) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[2],2) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
<p>
<input type="checkbox" value="What Nadia uses it for" name="what" v-model="listenTwo[0].value[0].userAnswer" :disabled="listenTwo[0].isComplete">
4.What Nadia uses it for
- <img :src="isTextRight(listenTwo[0].value[0].answer,'What Nadia uses it for',3) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[3],3) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
</div>
</div>
@@ -1891,7 +1891,7 @@
<p>
<input type="checkbox" value="When Nadia owned it" name="what" v-model="listenTwo[0].value[0].userAnswer" :disabled="listenTwo[0].isComplete">
5.When Nadia owned it
- <img :src="isTextRight(listenTwo[0].value[0].answer,'When Nadia owned it',4) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[4],4) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
<p>
<input
@@ -1902,7 +1902,7 @@
:disabled="listenTwo[0].isComplete"
>
6.Why it is important to Nadia
- <img :src="isTextRight(listenTwo[0].value[0].answer,'Why it is important to Nadia',5) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
+ <img :src="isTextRight(listenTwo[0].value[0].answer,listenTwo[0].value[0].userAnswer[5],5) ? correctIcon : errorIcon" v-if="listenTwo[0].isComplete">
</p>
<div class="event-header-text-bc pd-5 w100 mt-20" v-if="listenTwo[0].isShowAnswer">
<span>绛旀:</span>
diff --git a/src/books/English/view/components/chapter006.vue b/src/books/English/view/components/chapter006.vue
index a47c07d..f63874f 100644
--- a/src/books/English/view/components/chapter006.vue
+++ b/src/books/English/view/components/chapter006.vue
@@ -4376,12 +4376,6 @@
if(listenThree) this.listenThree = JSON.parse(listenThree)
},
methods: {
- isTextRight(answer, data, num) {
- console.log(answer[num]);
- let flag = null;
- answer[num] ? flag = answer[num] == data :flag = false
- return flag;
- },
arrayToString(data) {
if(Array.isArray(data)) {
return data.toString()
--
Gitblit v1.9.1