From bae61829b323cd391e277ad6c054770f4b7a3f8a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 19:45:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/English/view/components/chapter001.vue | 232 +++++++++++++++++++++++++--------
src/books/artAndDrama/view/components/chapter003.vue | 2
src/components/dragQuestion/index.vue | 110 ++++++++++++---
src/components/matching/matching.vue | 14 +
src/books/English/view/components/index.vue | 4
src/books/English/assets/main.less | 4
src/books/childHealth/view/content/components/chapter001.vue | 2
7 files changed, 281 insertions(+), 87 deletions(-)
diff --git a/src/books/English/assets/main.less b/src/books/English/assets/main.less
index 2ba9808..64abac4 100644
--- a/src/books/English/assets/main.less
+++ b/src/books/English/assets/main.less
@@ -1007,6 +1007,10 @@
width: 500px;
height: 36px;
}
+ .matching-title-text {
+ color: #f49a4c;
+ font-weight: bold;
+ }
}
/* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */
@media (max-width: 660px) {
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index 4b24f11..db5f535 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -299,7 +299,7 @@
<img class="img-0" alt="" src="../../assets/images/0013-3.jpg" />
</p> -->
<div>
- <ul class="fl ju-bt">
+ <ul class="fl ju-bt matching-title-text">
<li>Speakers銆�Chinese Cultural Symbols</li>
<li style="width: 40%; text-align: center">Descriptions</li>
</ul>
@@ -307,7 +307,6 @@
</div>
<h3 id="c003" class="fl al-cn">
<span class="bjh3">Reading</span>
- <audio :src="resource.readingOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
</h3>
<p>
1.How was Chinese culture introduced to the world in ancient
@@ -357,6 +356,10 @@
scenery
</p>
<p class="center"><b>My Experience in Wonderland</b></p>
+ <p class="center">
+ <audio :src="resource.readingOne" controls controlslist="noplaybackrate nodownload" class="audio" @play="audioPlay"></audio>
+
+ </p>
<p class="block">
鈥淪o how was your journey to China?鈥� asks Alexandra.鈥淗ighly
enjoyable,鈥� responds Alice.鈥淵ou should visit it sometime.鈥�
@@ -564,33 +567,71 @@
<p>
A.Mark the items that made the author curious when she arrived in
China.
+ <span>
+ <svg
+ v-if="testData.check.isRight"
+ t="1716986419862"
+ class="icon"
+ viewBox="0 0 1820 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="18767"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="40"
+ height="20"
+ >
+ <path
+ d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
+ fill="#1AFA29"
+ p-id="18768"
+ ></path>
+ </svg>
+ <svg
+ v-if="testData.check.isRight == false"
+ t="1716987085767"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="25745"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="20"
+ height="20"
+ >
+ <path
+ d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
+ fill="#d81e06"
+ p-id="25746"
+ ></path>
+ </svg>
+ </span>
</p>
<p>
- <input type="checkbox" name="ball" value="Language" id="1" v-model="testData.check" />
+ <input type="checkbox" name="ball1" value="Language" id="1" v-model="testData.check.value" @change="setTestData" />
Language
</p>
<p>
- <input type="checkbox" name="ball" value="People" id="2" v-model="testData.check" />
+ <input type="checkbox" name="ball2" value="People" id="2" v-model="testData.check.value" @change="setTestData" />
People
</p>
<p>
- <input type="checkbox" name="ball" value="Culture" id="3" v-model="testData.check" />
+ <input type="checkbox" name="ball3" value="Culture" id="3" v-model="testData.check.value" @change="setTestData" />
Culture
</p>
<p>
- <input type="checkbox" name="ball" value="Cuisine" id="4" v-model="testData.check" />
+ <input type="checkbox" name="ball4" value="Cuisine" id="4" v-model="testData.check.value" @change="setTestData" />
Cuisine
</p>
<p>
- <input type="checkbox" name="ball" value="Folk" id="5" v-model="testData.check" />
+ <input type="checkbox" name="ball5" value="Folk" id="5" v-model="testData.check.value" @change="setTestData" />
Folk art
</p>
<p>
- <input type="checkbox" name="ball" value="Landscapes" id="6" v-model="testData.check" />
+ <input type="checkbox" name="ball6" value="Landscapes" id="6" v-model="testData.check.value" @change="setTestData" />
Landscapes
</p>
<p>
- <input type="checkbox" name="ball" value="Transportation" id="7" v-model="testData.check" />
+ <input type="checkbox" name="ball7" value="Transportation" id="7" v-model="testData.check.value" @change="setTestData" />
Transportation
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 35px; width: 93%" v-if="showQuestionAnswer">
@@ -621,14 +662,14 @@
</p>
<p>1.What鈥檙e the author鈥檚 comments about Chinese food?</p>
<textarea v-model="testData.tx.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
- class="fz-16 textarea-text"></textarea>
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欳hinese food is very delicious. Sichuan and Hunan cuisines
are quite mouth-watering and stimulating.
</p>
<p>2.When and why did the author start her journey to China?</p>
<textarea v-model="testData.tx.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
- class="fz-16 textarea-text"></textarea>
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歐hen the author got selected as a foreign student for PhD
studies at one university in 2017, she started her journey to
@@ -636,20 +677,20 @@
</p>
<p>3.What are the author鈥檚 expectations of her stay in China?</p>
<textarea v-model="testData.tx.three" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
- class="fz-16 textarea-text"></textarea>
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歍he author looks forward to exploring more during her stay.
</p>
<p>4.What did the author think of Chinese people?</p>
<textarea v-model="testData.tx.four" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
- class="fz-16 textarea-text"></textarea>
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歍he author thought the local Chinese were very friendly and
hospitable.
</p>
<p>5.What鈥檚 the author鈥檚 impression of the cities in China?</p>
<textarea v-model="testData.tx.five" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
- class="fz-16 textarea-text"></textarea>
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欵ach city has its unique atmosphere with charming features
and unique landscapes.
@@ -660,22 +701,60 @@
<p>
A.Fill in the blanks with the proper words in the passage.The
initial letters of the words have been given.
+ <span>
+ <svg
+ v-if="testData.in.isRight"
+ t="1716986419862"
+ class="icon"
+ viewBox="0 0 1820 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="18767"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="40"
+ height="20"
+ >
+ <path
+ d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
+ fill="#1AFA29"
+ p-id="18768"
+ ></path>
+ </svg>
+ <svg
+ v-if="testData.in.isRight == false"
+ t="1716987085767"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="25745"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="20"
+ height="20"
+ >
+ <path
+ d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
+ fill="#d81e06"
+ p-id="25746"
+ ></path>
+ </svg>
+ </span>
</p>
<p>
In 2017,the author arrived in China.When she arrived,she was like
Alice in <i>Alice in Wonderland</i>.She was curious about the
people,the culture,the c<input type="text" class="input-bottom-border" style="width: 60px"
- v-model="testData.in.one" />
+ v-model="testData.in.one" @change="setTestData" />
,and of course the huge variety of l<input v-model="testData.in.two" type="text"
- class="input-bottom-border" style="width: 60px" />.Chinese friends helped her a lot in understanding
+ class="input-bottom-border" style="width: 60px" @change="setTestData" />.Chinese friends helped her a lot in understanding
Chinese
culture and c<input v-model="testData.in.three" type="text" class="input-bottom-border"
- style="width: 60px" />.The author believes that one cannot e<input type="text"
- v-model="testData.in.four" class="input-bottom-border" style="width: 60px" />China properly if he/she
+ style="width: 60px" @change="setTestData" />.The author believes that one cannot e<input type="text"
+ v-model="testData.in.four" class="input-bottom-border" style="width: 60px" @change="setTestData" />China properly if he/she
does not try its delicious variety of
food.China has thousands of years of rich and beautiful
culture.Each city has its u<input v-model="testData.in.five" type="text" class="input-bottom-border"
- style="width: 60px" />atmosphere that attracts people.
+ style="width: 60px" @change="setTestData" />atmosphere that attracts people.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歝uisine, landscapes, civilization, explore, unique
@@ -685,41 +764,46 @@
sentences with them.
</p>
<p>
- 1.get selected as<input v-model="testData.line.one" type="text" class="input-bottom-border"
- style="width: 77%" />
+ 1.get selected as
</p>
+ <textarea v-model="testData.line.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歋he got selected as the cultural ambassador to show Chinese
culture on campus.
</p>
<p>
- 2.be curious about<input v-model="testData.line.two" type="text" class="input-bottom-border"
- style="width: 75%" />
+ 2.be curious about
</p>
+ <textarea v-model="testData.line.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歁any foreigners are curious about the amazing Chinese
martial arts.
</p>
<p>
- 3.along the way<input v-model="testData.line.three" type="text" class="input-bottom-border"
- style="width: 77%" />
+ 3.along the way
</p>
+ <textarea v-model="testData.line.three" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欼 suggest that you go to Tibet by train so that you can
enjoy the natural scenery along the way.
</p>
<p>
- 4.come across<input v-model="testData.line.four" type="text" class="input-bottom-border"
- style="width: 79%" />
+ 4.come across
</p>
+ <textarea v-model="testData.line.four" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欻e came across the temple fair in Beijing during the Spring
Festival.
</p>
<p>
- 5.look forward to<input v-model="testData.line.five" type="text" class="input-bottom-border"
- style="width: 76%" />
+ 5.look forward to
</p>
+ <textarea v-model="testData.line.five" placeholder="璇疯緭鍏ュ唴瀹�" rows="4" style="margin-left: 40px; width: 92%"
+ class="fz-16 textarea-text" @change="setTestData"></textarea>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛歋he is looking forward to visiting the incredible cities in
China.
@@ -749,7 +833,7 @@
people.
</p>
<p>
- <input v-model="testData.ts.one" type="text" class="input-bottom-border" />
+ <input v-model="testData.ts.one" type="text" class="input-bottom-border" @change="setTestData" />
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛氬瓟瀛愬紑鍒涗簡骞虫皯鍖栫殑鏁欒偛銆�
@@ -759,7 +843,7 @@
greatly promoted the development of ancient Chinese civilization.
</p>
<p>
- <input v-model="testData.ts.two" type="text" class="input-bottom-border" />
+ <input v-model="testData.ts.two" type="text" class="input-bottom-border" @change="setTestData" />
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛氬珮绁栧彂鏄庝簡涓浗缂笣鎶�鏈紝杩欐瀬澶у湴淇冭繘浜嗕腑鍥藉彜浠ｆ枃鏄庣殑鍙戝睍銆�
@@ -769,7 +853,7 @@
tea culture in depth.
</p>
<p>
- <input v-model="testData.ts.three" type="text" class="input-bottom-border" />
+ <input v-model="testData.ts.three" type="text" class="input-bottom-border" @change="setTestData" />
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛氶檰缇斤紝銆婅尪缁忋�嬬殑浣滆�咃紝瀵逛腑鍥借尪閬撹繘琛屼簡娣卞叆鐨勭爺绌躲��
@@ -779,7 +863,7 @@
Chinese medical science.
</p>
<p>
- <input v-model="testData.ts.four" type="text" class="input-bottom-border" />
+ <input v-model="testData.ts.four" type="text" class="input-bottom-border" @change="setTestData" />
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛氬紶浠叉櫙鏄竴浣嶅涓浗鍖诲鏈夌潃閲嶅ぇ褰卞搷鐨勫尰瀛﹀銆�
@@ -803,7 +887,7 @@
meal.
</p>
<p>
- <b>If</b><input v-model="testData.gr.one" type="text" class="input-bottom-border" />.
+ <b>If</b><input v-model="testData.gr.one" type="text" class="input-bottom-border" @change="setTestData" />.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欼f you try using sticks, you can enjoy the fun of having a
@@ -814,7 +898,7 @@
there.
</p>
<p>
- <b>If</b><input v-model="testData.gr.two" type="text" class="input-bottom-border" />.
+ <b>If</b><input v-model="testData.gr.two" type="text" class="input-bottom-border" @change="setTestData" />.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欼f you go to my Chinese New Year party, you will meet my
@@ -822,7 +906,7 @@
</p>
<p>3.Drink some Longjing tea,and you will love it.</p>
<p>
- <b>If</b><input type="text" v-model="testData.gr.three" class="input-bottom-border" />.
+ <b>If</b><input type="text" v-model="testData.gr.three" class="input-bottom-border" @change="setTestData" />.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欼f you drink some Longjing tea, you will love it.
@@ -832,7 +916,7 @@
warriors.
</p>
<p>
- <b>If</b><input v-model="testData.gr.four" type="text" class="input-bottom-border" />.
+ <b>If</b><input v-model="testData.gr.four" type="text" class="input-bottom-border" @change="setTestData" />.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛欼f I go to Xi鈥檃n one day, I will visit the terracotta
@@ -843,7 +927,7 @@
Chicken would possibly be in top three.
</p>
<p>
- <b>If</b><input v-model="testData.gr.five" type="text" class="input-bottom-border" />.
+ <b>If</b><input v-model="testData.gr.five" type="text" class="input-bottom-border" @change="setTestData" />.
</p>
<p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
绛旀锛� If you ask foreigners about their favorite Chinese food,
@@ -855,7 +939,7 @@
</p>
<p>
1.I was wondering<input v-model="testData.cm.one" type="text" class="input-bottom-border"
- style="width: 60px" />to go for a walk in the Summer Palace.
+ style="width: 60px" @change="setTestData" />to go for a walk in the Summer Palace.
</p>
<p>
2.We can spend the afternoon on the beach<input v-model="testData.cm.two" type="text"
@@ -863,14 +947,14 @@
</p>
<p>
3.I called Wang to find out<input v-model="testData.cm.three" type="text" class="input-bottom-border"
- style="width: 60px" />or not he really went to see the Peking opera show.
+ style="width: 60px" @change="setTestData" />or not he really went to see the Peking opera show.
</p>
<p>
4.We鈥檙e not interested in<input v-model="testData.cm.four" type="text" class="input-bottom-border"
- style="width: 60px" />we get great jobs and that kind of thing.
+ style="width: 60px" @change="setTestData" />we get great jobs and that kind of thing.
</p>
<p>
- 5.<input v-model="testData.cm.five" type="text" class="input-bottom-border" style="width: 60px" />I go to
+ 5.<input v-model="testData.cm.five" type="text" class="input-bottom-border" style="width: 60px" @change="setTestData" />I go to
Sichuan,I will visit Chengdu Research Base of Giant
Panda Breeding.
</p>
@@ -886,9 +970,6 @@
</button>
</li>
<li>
- <button @click="setTestData" class="btn-border btn-w">
- 淇濆瓨
- </button>
</li>
<li>
<button @click="changeTestData" class="btn-border btn-w">
@@ -1211,7 +1292,7 @@
</p>
<p class="center">
1.
- <select v-model="dropdownData.one.value">
+ <select class="select-border" v-model="dropdownData.one.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1245,7 +1326,7 @@
</p>
<p class="center">
2.
- <select v-model="dropdownData.two.value">
+ <select class="select-border" v-model="dropdownData.two.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1282,7 +1363,7 @@
</p>
<p class="center">
3.
- <select v-model="dropdownData.three.value">
+ <select class="select-border" v-model="dropdownData.three.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1316,7 +1397,7 @@
</p>
<p class="center">
4.
- <select v-model="dropdownData.four.value">
+ <select class="select-border" v-model="dropdownData.four.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1353,7 +1434,7 @@
</p>
<p class="center">
5.
- <select v-model="dropdownData.five.value">
+ <select class="select-border" v-model="dropdownData.five.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1387,7 +1468,7 @@
</p>
<p class="center">
6.
- <select v-model="dropdownData.six.value">
+ <select class="select-border" v-model="dropdownData.six.value" @change="setDropdownData">
<option v-for="(item, index) in dropDownList" :key="index" :value="item">
{{ item }}
</option>
@@ -1420,9 +1501,6 @@
<div class="fl ju-ev mt-40" style="width: 80%">
<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">
閲嶅仛
@@ -2385,7 +2463,11 @@
},
},
testData: {
- check: [],
+ check: {
+ isRight:null,
+ answer:["Culture","Cuisine","Landscapes"],
+ value:[]
+ },
tx: {
one: "",
two: "",
@@ -2399,6 +2481,8 @@
three: "",
four: "",
five: "",
+ isRight:null,
+ answer:'cuisine,landscapes,civilization,explore,unique'
},
line: {
one: "",
@@ -2500,7 +2584,11 @@
changeTestData() {
localStorage.removeItem("english-testOne");
this.testData = {
- check: [],
+ check: {
+ isRight:null,
+ answer:["Culture","Cuisine","Landscapes"],
+ value:[]
+ },
tx: {
one: "",
two: "",
@@ -2514,6 +2602,8 @@
three: "",
four: "",
five: "",
+ isRight:null,
+ answer:['uisine','andscapes','ivilization','xplore','nique']
},
line: {
one: "",
@@ -2628,7 +2718,30 @@
);
},
saveData() {
+ const item = this.testData['check']
+ const sortedArr1 = item.answer.slice().sort();
+ const sortedArr2 = item.value.slice().sort();
+ const isRight = sortedArr1.every(
+ (value, index) => value === sortedArr2[index]
+ );
+ const inData = this.testData['in']
+ let inString = []
+ for (let key in inData) {
+ const citem = inData[key];
+ if(key != 'answer' && key !== 'isRight') {
+ console.log(key);
+ inString.push(citem)
+ }
+
+
+ }
+ const inRight = inData.answer == inString
+ console.log('in',inData.answer,inString);
+ this.$set(this.testData['in'],'isRight',inRight)
+ this.$set(this.testData['check'],'isRight',isRight)
+ this.setTestData()
console.log(this.testData);
+
},
audioPlay() {
this.$emit("closeMiniAudio");
@@ -2711,4 +2824,11 @@
right: 0;
background-color: red;
}
+.select-border {
+ border: 0;
+ border-bottom: 1px solid #767676;
+ &:focus {
+ outline: none;
+ }
+}
</style>
diff --git a/src/books/English/view/components/index.vue b/src/books/English/view/components/index.vue
index 321bc0b..fbd36e9 100644
--- a/src/books/English/view/components/index.vue
+++ b/src/books/English/view/components/index.vue
@@ -155,8 +155,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- setTimeout(() => {
- this.gotoPage(5,64);
+ // setTimeout(() => {
+ // this.gotoPage(4,59);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
diff --git a/src/books/artAndDrama/view/components/chapter003.vue b/src/books/artAndDrama/view/components/chapter003.vue
index 010c51b..0c0f667 100644
--- a/src/books/artAndDrama/view/components/chapter003.vue
+++ b/src/books/artAndDrama/view/components/chapter003.vue
@@ -73,7 +73,7 @@
<p class="center openImgBox"><img class="img-e" alt="" src="../../assets/images/3-2.gif" /></p>
<p class="text"><span class="hs1">鈼�</span>璇锋妸铓傝殎闃熼暱鐨勫彴璇嶅拰浠栫殑鍐呭績鐙櫧杩炶捣鏉ュ惂锛�</p>
<!-- 杩炵嚎棰� -->
- <matching :rawData="rawData" :question="question" class="macthing" :primaryColor="'transparent'">
+ <matching :rawData="rawData" :question="question" class="macthing" :primaryColor="'transparent'" :bordercolor="'transparent'">
</matching>
</div>
<!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue
index 5496adf..239aaef 100644
--- a/src/books/childHealth/view/content/components/chapter001.vue
+++ b/src/books/childHealth/view/content/components/chapter001.vue
@@ -4947,7 +4947,7 @@
},
async getVideoPath() {
this.$data.pathOne = await getResourcePath(
- "f6f6588a75086576b87bed2fb9ca1ec1"
+ "ff5f340a49615a01d5ee723624cdeff9"
);
this.$data.pathTwo = await getResourcePath(
"e5993b62684fe55d13190cfe52bf00ed"
diff --git a/src/components/dragQuestion/index.vue b/src/components/dragQuestion/index.vue
index 13fe8dc..f3d8d04 100644
--- a/src/components/dragQuestion/index.vue
+++ b/src/components/dragQuestion/index.vue
@@ -14,7 +14,47 @@
<span v-if="typeof ditem == 'string'">
{{ ditem }}
</span>
- <span class="space" v-else>{{ item.userAnswer[ditem.num].txt }}</span>
+ <span class="space" v-else>
+ {{ item.userAnswer[ditem.num].txt }}
+ <span>
+ <svg
+ v-if="getItemRight(index,ditem.num)"
+ t="1716986419862"
+ class="icon"
+ viewBox="0 0 1820 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="18767"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="40"
+ height="20"
+ >
+ <path
+ d="M1439.374222 216.007111s-169.472 56.490667-367.179852 282.443852C888.604444 703.222519 846.241185 787.949037 775.632593 900.93037 768.568889 893.866667 662.651259 689.095111 380.207407 540.814222l148.290371-141.226666s134.162963 91.790222 225.953185 261.262222c0 0 233.016889-360.116148 684.923259-536.642371v91.799704z m0 0"
+ fill="#1AFA29"
+ p-id="18768"
+ ></path>
+ </svg>
+ <svg
+ v-if="getItemRight(index,ditem.num) == false"
+ t="1716987085767"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="25745"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="20"
+ height="20"
+ >
+ <path
+ d="M116.579135 38.64349531L38.703935 103.74399781c138.82075969 102.96027281 268.24660875 221.31426938 381.68489719 339.96758156C246.29374906 618.40145938 109.95003031 790.19602344 38.10817906 859.25288281l148.35573469 123.62658094c52.61360812-108.17625656 167.23381594-272.86683656 320.56281844-445.01635875 153.50744156 173.21056312 268.36844625 338.43166313 321.38977781 447.49243969 0 0 144.5682225-152.96636906 157.47435281-129.29729625-55.80632344-62.49011156-191.37776625-244.16501625-374.17990593-430.27403438 104.68422375-107.1132975 222.15274031-213.10127719 347.60304468-306.24740437L925.17746562 56.03842156C782.85412063 126.51895625 647.69328031 231.09093594 526.07845437 342.39755 403.34886594 226.82662719 264.46095125 116.16373719 116.579135 38.64349531L116.579135 38.64349531zM116.579135 38.64349531"
+ fill="#d81e06"
+ p-id="25746"
+ ></path>
+ </svg>
+ </span>
+ </span>
</span>
</div>
@@ -30,7 +70,6 @@
<div class="analysis" v-if="item.isComplete">
<el-collapse
v-model="item.isUnfold"
- @change="handleChange(item)"
accordion
v-if="item.questionType != 'shortAnswer'"
>
@@ -76,7 +115,7 @@
/>
</p>
<!-- 姝ｇ‘閿欒鍥炬爣 -->
- <span class="mr-10 judge-icon">
+ <!-- <span class="mr-10 judge-icon">
<svg
v-if="item.isRight"
t="1716986419862"
@@ -113,7 +152,7 @@
p-id="25746"
></path>
</svg>
- </span>
+ </span> -->
<div class="headerConent sitgBox">
<p v-if="!item.isUnfold">
@@ -157,11 +196,11 @@
watch: {
question: {
handler(newValue, oldValue) {
- console.log("鐩戝惉浼犲��", newValue);
let oldAnswer = localStorage.getItem(
this.config.activeBook.name + "-drag-" + this.page
);
if (oldAnswer) {
+ this.submitState = true
oldAnswer = JSON.parse(oldAnswer);
for (let index = 0; index < newValue.length; index++) {
// 鏃х瓟妗堣祴鍊�
@@ -198,7 +237,6 @@
};
},
mounted() {
- console.log("浼犲��", this.question);
},
methods: {
// 1.閫夐」鎷栨嫿
@@ -208,7 +246,6 @@
e.preventDefault();
if(this.submitState) return false
this.isLift = false
- console.log("榧犳爣鎸変笅", e);
this.moveDom = e.toElement;
this.parentDom = this.getParentWithClass(e.toElement, "question-box");
this.questionIndex = this.parentDom.getAttribute("num");
@@ -218,7 +255,6 @@
this.parentY = parentInfo.y;
this.maxX = parentInfo.x + this.parentDom.clientWidth;
this.maxY = parentInfo.y + this.parentDom.clientHeight;
- console.log("鐖剁洅瀛�", parentInfo);
},
// 榧犳爣绉诲姩
mousemove(e) {
@@ -230,18 +266,19 @@
const moveY = e.y - this.parentY;
this.moveDom.style.left = moveX + "px";
this.moveDom.style.top = moveY + "px";
- // 濡傛灉绉诲姩鍒扮┖鏍艰寖鍥村唴,灏嗙瓟妗堝～鍏ョ┖鏍�
+ // 濡傛灉杩樻湁鏈夌┖鏍�
if (this.spaceList.length) {
for (let index = 0; index < this.spaceList.length; index++) {
- const item = this.spaceList[index];
+ let item = this.spaceList[index];
+ if(!item) return false
if (
e.x >= item.minX &&
e.x <= item.maxX &&
e.y >= item.minY &&
e.y <= item.maxY
) {
+ // 濡傛灉绉诲姩鍒扮┖鏍艰寖鍥村唴,涓旈紶鏍囨姮璧峰悗,灏嗙瓟妗堝～鍏ョ┖鏍�,骞跺皢璇ョ┖鏍肩殑鏁版嵁娓呯┖(绌烘牸涓嶈兘鍒犻櫎,鍙兘娓呯┖,鍚﹀垯瀵艰嚧鏁扮粍绱㈠紩鏀瑰彉,涓嶈兘姝ｇ‘鍐欏叆鍒版寚瀹氱┖鏍间腑)
if(!this.isLift) return false
- this.spaceList = this.spaceList.filter(citem => citem !== item)
this.$set(
this.drageQuestion[this.questionIndex].userAnswer,
index,
@@ -250,8 +287,18 @@
txt:this.moveDom.textContent.slice(2)
}
);
- this.moveDom.style.display = "none";
- this.moveDom = null;
+ if(this.drageQuestion[this.questionIndex].userAnswer[index]) {
+ this.moveDom.style.display = "none";
+ this.moveDom = null;
+ this.$set(this.spaceList,index,{})
+ }
+ } else {
+ if(this.isLift && this.moveDom) {
+ // 鍦ㄩ潪绌烘牸鍖哄煙鎶捣榧犳爣
+ this.moveDom.style.position = "";
+ this.moveDom.style.left = "0px";
+ this.moveDom.style.top = "0px";
+ }
}
}
}
@@ -270,17 +317,17 @@
getSpaceInfo(parentDom) {
let arr = [];
const list = parentDom.querySelectorAll(".space");
+
for (let index = 0; index < list.length; index++) {
const itemInfo = list[index].getBoundingClientRect();
arr.push({
- minX: itemInfo.x -10,
- maxX: itemInfo.x + itemInfo.width + 10,
- minY: itemInfo.y - 2 ,
- maxY: itemInfo.y + itemInfo.height + 2,
+ minX: itemInfo.x,
+ maxX: itemInfo.x + itemInfo.width,
+ minY: itemInfo.y + 3 ,
+ maxY: itemInfo.y + itemInfo.height,
});
}
this.spaceList = arr;
- console.log("绌烘牸鑼冨洿", arr);
},
// 鑾峰彇鐖跺厓绱�
getParentWithClass(element, className) {
@@ -320,7 +367,6 @@
item.isRight = JSON.stringify(arr) == JSON.stringify(item.answer)
item.isComplete = true
}
- console.log(arr,this.drageQuestion[0]);
},
redio() {
this.submitState = false
@@ -332,6 +378,7 @@
for (let index = 0; index < this.drageQuestion.length; index++) {
const item = this.drageQuestion[index];
item.isComplete = false
+ item.isRight = null
for (let cindex = 0; cindex < item.option.length; cindex++) {
const citem = item.option[cindex];
arr.push(
@@ -343,7 +390,6 @@
}
item.userAnswer = arr
}
- console.log(this.drageQuestion);
const optionList = (
this.container ? this.container : document
).querySelectorAll(".drag-option");
@@ -353,6 +399,7 @@
item.style.top = null
item.style.left = null
}
+ this.spaceList = []
},
seeAnswer() {
for (let index = 0; index < this.drageQuestion.length; index++) {
@@ -391,6 +438,19 @@
}
}
},
+ // 鏄剧ず瀵归敊鏂规硶
+ getItemRight(num,number) {
+ if(!this.submitState) return null
+ let flag = null
+ const item = this.question[num]
+ console.log(item,num,number);
+ const answer = item.answer[number]
+ const userAns = item.userAnswer[number].value
+ if(answer && userAns) {
+ flag = answer == userAns
+ }
+ return flag
+ }
},
};
</script>
@@ -405,8 +465,8 @@
.space {
display: inline-block;
text-align: center;
- min-width: 60px !important;
- min-height: 15px !important;
+ min-width: 65px !important;
+ height: 20px !important;
text-indent: 0em;
}
.option-box {
@@ -415,11 +475,17 @@
}
.drag-option {
cursor: pointer;
+ // border: 1px solid #e9e9e9;
+ // border-radius: 18px;
+ // padding: 6px;
}
.stem {
text-indent: 2em;
line-height: 2em;
}
+.stem-box {
+ display: inline-block;
+}
.drag-bottom-btn {
width: 100%;
margin-top: 40px;
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index a1f76a1..bcc4cc4 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -15,7 +15,7 @@
:key="index"
ref="left"
@mousedown="(e) => touchstart(e, item, index)"
- :style="{ backgroundColor: primaryColor }"
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
v-html="item.label.txt"
></div>
</div>
@@ -25,7 +25,7 @@
v-for="(item, index) in rightArr"
:key="index"
ref="right"
- :style="{ backgroundColor: primaryColor }"
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
v-html="item.label.txt"
></div>
</div>
@@ -46,11 +46,11 @@
<!-- 鎸夐挳 -->
<div class="btn-bottom">
<el-button @click="submitData">鎻愪氦</el-button>
- <el-button @click="saveData" :style="{ borderColor: primaryColor }"
+ <el-button @click="saveData" :style="{ borderColor: bordercolor }"
>淇濆瓨</el-button
>
<el-button @click="redo">閲嶅仛</el-button>
- <el-button @click="handleAnswer" :style="{ borderColor: primaryColor }"
+ <el-button @click="handleAnswer" :style="{ borderColor: bordercolor }"
>鏌ョ湅绛旀</el-button
>
</div>
@@ -112,8 +112,12 @@
},
primaryColor: {
type: String,
- default: "#0bab87",
+ default: "#fff",
},
+ bordercolor:{
+ type:String,
+ default:'#f49a4c'
+ }
},
watch: {
rawData: {
--
Gitblit v1.9.1