From 4a8a0615b7aaa5e7a7aa5ae7fad4bba887d11308 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 22 七月 2024 10:09:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/English/view/components/chapter004.vue | 223 +++++++------------------------------------------------
1 files changed, 30 insertions(+), 193 deletions(-)
diff --git a/src/books/English/view/components/chapter004.vue b/src/books/English/view/components/chapter004.vue
index c013bd6..b55e750 100644
--- a/src/books/English/view/components/chapter004.vue
+++ b/src/books/English/view/components/chapter004.vue
@@ -216,22 +216,22 @@
{{ item.answer }}
</span>
</div>
- <div class="w100 fl">
- <ul class="fl ju-ar w100">
+ <div class="w100 fl ju-cn">
+ <ul class="fl ju-ev" style="width:80%">
<li>
- <button class="btn-border btn-w" @click="handlewarmUp">
- 鎻愪氦
- </button>
+ <button class="btn-border btn-w" @click="handlewarmUp">
+ 鎻愪氦
+ </button>
</li>
<li>
- <button @click="recastwarmUp" class="btn-border btn-w">
- 閲嶅仛
- </button>
+ <button @click="recastwarmUp" class="btn-border btn-w">
+ 閲嶅仛
+ </button>
</li>
<li>
- <button @click="viewwarmUp" class="parimary-btn">
- 鏌ョ湅绛旀
- </button>
+ <button @click="viewwarmUp" class="parimary-btn">
+ 鏌ョ湅绛旀
+ </button>
</li>
</ul>
</div>
@@ -811,22 +811,22 @@
{{index + 1}}.{{ item.answer }}
</span>
</div>
- <div class="w100 fl">
- <ul class="fl ju-ar w100">
+ <div class="w100 fl ju-cn">
+ <ul class="fl ju-ev" style="width:80%">
<li>
- <button class="btn-border btn-w" @click="handleReadingOne">
- 鎻愪氦
- </button>
+ <button class="btn-border btn-w" @click="handleReadingOne">
+ 鎻愪氦
+ </button>
</li>
<li>
- <button @click="recastReadingOne" class="btn-border btn-w">
- 閲嶅仛
- </button>
+ <button @click="recastReadingOne" class="btn-border btn-w">
+ 閲嶅仛
+ </button>
</li>
<li>
- <button @click="viewReadingOne" class="parimary-btn">
- 鏌ョ湅绛旀
- </button>
+ <button @click="viewReadingOne" class="parimary-btn">
+ 鏌ョ湅绛旀
+ </button>
</li>
</ul>
</div>
@@ -1584,7 +1584,7 @@
<div class="w100 fl ju-cn">
<ul class="fl ju-ev" style="width:80%">
<li>
- <button class="btn-border btn-w" @click="handleReadingOne">
+ <button class="btn-border btn-w" @click="handleReadingTwo">
鎻愪氦
</button>
</li>
@@ -1848,22 +1848,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>
@@ -1890,7 +1890,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
@@ -1901,7 +1901,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>
@@ -2717,61 +2717,11 @@
nine: "",
},
},
- testData: {
- check: [],
- tx: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- in: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- line: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- ts: {
- one: "",
- two: "",
- three: "",
- four: "",
- },
- gr: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- cm: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- },
resource: {
listenOne: "",
readingOne: "",
readingTwo: "",
},
- dropDownList: [
- "robot floor cleaner",
- "blood donation",
- "community clean-ups",
- "language service",
- ],
dropdownData: {
one: {
value: "",
@@ -3606,10 +3556,6 @@
};
},
mounted() {
- const testData = localStorage.getItem("english-testOne");
- if (testData) {
- this.testData = JSON.parse(testData);
- }
const bookQuestion = localStorage.getItem("english-book-question-one");
if (bookQuestion) {
this.questionData = JSON.parse(bookQuestion);
@@ -3648,63 +3594,6 @@
saveWord(event, word) {
this.$emit("saveCharacters", event, word);
},
- setTestData() {
- localStorage.setItem("english-testOne", JSON.stringify(this.testData));
- },
- changeTestData() {
- localStorage.removeItem("english-testOne");
- this.testData = {
- check: [],
- tx: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- in: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- line: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- ts: {
- one: "",
- two: "",
- three: "",
- four: "",
- },
- gr: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- cm: {
- one: "",
- two: "",
- three: "",
- four: "",
- five: "",
- },
- };
- },
- setBookQuestion() {
- console.log("淇濆瓨");
- localStorage.setItem(
- "english-book-question-one",
- JSON.stringify(this.questionData)
- );
- },
async getPath() {
this.resource.listenOne = await getResourcePath(
"422139A2EF66EA888C5ED1D550AE23E0"
@@ -3724,52 +3613,6 @@
}
setTimeout(() => { this.$emit("initViewer", "") }, 500)
},
- handleQuestion(type) {
- if (type == "one") {
- this.questionData.warnUp.one.value
- ? (this.questionData.warnUp.one.isRight =
- this.questionData.warnUp.one.value == "Chinese knot")
- : (this.questionData.warnUp.one.isRight = null);
- } else if (type == "two") {
- this.questionData.warnUp.two.value
- ? (this.questionData.warnUp.two.isRight =
- this.questionData.warnUp.two.value == "Chinese medicine")
- : (this.questionData.warnUp.two.isRight = null);
- } else if (type == "three") {
- this.questionData.warnUp.three.value
- ? (this.questionData.warnUp.three.isRight =
- this.questionData.warnUp.three.value == "Chinese calligraphy")
- : (this.questionData.warnUp.three.isRight = null);
- } else if (type == "four") {
- this.questionData.warnUp.four.value
- ? (this.questionData.warnUp.four.isRight =
- this.questionData.warnUp.four.value == "Taichi")
- : (this.questionData.warnUp.four.isRight = null);
- } else if (type == "five") {
- this.questionData.warnUp.five.value
- ? (this.questionData.warnUp.five.isRight =
- this.questionData.warnUp.five.value == "sweet dumpling")
- : (this.questionData.warnUp.five.isRight = null);
- } else if (type == "six") {
- this.questionData.warnUp.six.value
- ? (this.questionData.warnUp.six.isRight =
- this.questionData.warnUp.six.value == "Chinese chess")
- : (this.questionData.warnUp.six.isRight = null);
- }
- },
- handleDropdown(type) {
- const dropdownDatas = this.dropdownData;
- for (let key in dropdownDatas) {
- const item = dropdownDatas[key];
- if (type == "judge") {
- item.value == item.answer
- ? (item.isRight = true)
- : (item.isRight = false);
- console.log(item.value, item.answer);
- }
- }
- this.dropdownData = dropdownDatas;
- },
changeDropdown() {
localStorage.removeItem("english-dropdown-one");
for (let key in this.dropdownData) {
@@ -3777,12 +3620,6 @@
item.value = "";
item.isRight = null;
}
- },
- setDropdownData() {
- localStorage.setItem(
- "english-dropdown-one",
- JSON.stringify(this.dropdownData)
- );
},
// 鏂板
showNoSubmitAnswer(index,num) {
@@ -3903,7 +3740,7 @@
saveReadingTwo() {
localStorage.setItem('english-chapter04-readingTwo',JSON.stringify(this.readingTwo))
},
- handleReadingOne() {
+ handleReadingTwo() {
for (let index = 0; index < this.readingTwo.length; index++) {
const item = this.readingTwo[index];
item.isComplete = true
--
Gitblit v1.9.1