From 53c71572f88a86514a41f0a8f489fccfcaeed6e2 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期三, 19 六月 2024 11:31:48 +0800
Subject: [PATCH] 艺术戏剧(连线题验证)

---
 src/books/artAndDrama/assets/images/matching-one.png |    0 
 src/books/artAndDrama/view/components/chapter003.vue |   47 ++++++++-------
 src/books/artAndDrama/view/components/chapter001.vue |  109 ++++++++++++++++++-----------------
 src/books/artAndDrama/assets/images/matching-two.png |    0 
 src/App.vue                                          |    2 
 5 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ef3b19b..77be6ac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@
         process.env.VUE_APP_RESOURCE_CTX +
           (process.env.VUE_APP_ENV == "product"
             ? process.env.VUE_APP_BOOK_ID
-            : "english")
+            : "artAndDrama")
       );
       // 娴嬭瘯璇曡30椤�
       // this.activeBook.tryPageCount = 10;
diff --git a/src/books/artAndDrama/assets/images/matching-one.png b/src/books/artAndDrama/assets/images/matching-one.png
new file mode 100644
index 0000000..133b491
--- /dev/null
+++ b/src/books/artAndDrama/assets/images/matching-one.png
Binary files differ
diff --git a/src/books/artAndDrama/assets/images/matching-two.png b/src/books/artAndDrama/assets/images/matching-two.png
new file mode 100644
index 0000000..6491044
--- /dev/null
+++ b/src/books/artAndDrama/assets/images/matching-two.png
Binary files differ
diff --git a/src/books/artAndDrama/view/components/chapter001.vue b/src/books/artAndDrama/view/components/chapter001.vue
index b96d112..68b2c5b 100644
--- a/src/books/artAndDrama/view/components/chapter001.vue
+++ b/src/books/artAndDrama/view/components/chapter001.vue
@@ -46,7 +46,7 @@
             <audio :src="auidoPathTwo" controls class="audio" @play="audioPlay"></audio>
           </h1>
           <!-- 杩炵嚎棰� -->
-          <matching :rawData="rawData" :item="question" class="macthing" :primaryColor="'transparent'"></matching>
+          <matching :rawData="rawData" :question="question" class="macthing" :primaryColor="'transparent'"></matching>
           <p class="text">灏忔彁绀猴細鍔犵偣鐨勬枃瀛椾负鏈彞璇濅腑鐨勯�昏緫閲嶉煶锛屽湪鏈楄鍙戦煶鏃惰閲嶈銆�</p>
         </div>
         <p><br /></p>
@@ -399,7 +399,7 @@
     },
     primaryColor: {
       type: String,
-      default: "red"
+      default: "red",
     }
   },
   //鍦ㄨ繖閲屽璋冪敤鐨勬柟娉曡繘琛屾寕杞�
@@ -428,19 +428,20 @@
         left: [
           {
             oldId: "FB34",
-            txt: "鎴戣浣犲悆鑻规灉鍚э紒",
+            txt: " <span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
+
           },
           {
             oldId: "64D6",
-            txt: "鎴戣浣犲悆鑻规灉鍚э紒",
+            txt: "鎴�<span class='un1'>璇�</span>浣犲悆鑻规灉鍚э紒",
           },
           {
             oldId: "2ED4",
-            txt: "鎴戣浣犲悆鑻规灉鍚э紒",
+            txt: "鎴戣<span class='un1'>浣�</span>鍚冭嫻鏋滃惂锛�",
           },
           {
             oldId: "44DE",
-            txt: "鎴戣浣犲悆鑻规灉鍚э紒",
+            txt: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
           },
         ],
         right: [
@@ -449,15 +450,15 @@
             txt: "寮鸿皟鏄瀹�",
           },
           {
-            oldId: "FB34",
+            oldId: "2ED4",
             txt: "寮鸿皟璇风殑鏄�滀綘鈥�",
           },
           {
-            oldId: "2ED4",
+            oldId: "44DE",
             txt: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
           },
           {
-            oldId: "44DE",
+            oldId: "FB34",
             txt: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
           },
         ],
@@ -469,64 +470,64 @@
         answer: [
           {
             id: "FB34",
-            linkValue: "鎴戣浣犲悆鑻规灉鍚э紒",
-            value: "寮鸿皟鏄瀹�",
+            linkValue: "<span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
+            value: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
           },
           {
             id: "64D6",
-            linkValue: "鎴戣浣犲悆鑻规灉鍚э紒",
+            linkValue: "鎴�<span class='un1'>璇�</span>浣犲悆鑻规灉鍚э紒",
+            value: "寮鸿皟鏄瀹�",
+          },  
+          {
+            id: "2ED4",
+            linkValue: "鎴戣<span class='un1'>浣�</span>鍚冭嫻鏋滃惂锛�",
             value: "寮鸿皟璇风殑鏄�滀綘鈥�",
           },
           {
-            id: "2ED4",
-            linkValue: "鎴戣浣犲悆鑻规灉鍚э紒",
-            value: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
-          },
-          {
             id: "44DE",
-            linkValue: "鎴戣浣犲悆鑻规灉鍚э紒",
-            value: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
+            linkValue: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
+            value: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
           },
         ],
         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: "44DE",
-              txt: "It was first discovered and drank in China and my favoriteLongjing tea is produced near the West Lake in Hangzhou.",
-            },
-            {
-              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: "FB34",
+            txt: "<span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
+
+          },
+          {
+            oldId: "64D6",
+            txt: "鎴�<span class='un1'>璇�</span>浣犲悆鑻规灉鍚э紒",
+          },
+          {
+            oldId: "2ED4",
+            txt: "鎴戣<span class='un1'>浣�</span>鍚冭嫻鏋滃惂锛�",
+          },
+          {
+            oldId: "44DE",
+            txt: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
+          },
           ],
           values: [
-            {
-              oldId: "FB34",
-              txt: "Martin  Silk",
-            },
-            {
-              oldId: "64D6",
-              txt: "The Great Wall",
-            },
-            {
-              oldId: "2ED4",
-              txt: "Chinese Food",
-            },
-            {
-              oldId: "44DE",
-              txt: "Chinese Tea",
-            },
+          {
+            oldId: "64D6",
+            txt: "寮鸿皟鏄瀹�",
+          },
+          {
+            oldId: "2ED4",
+            txt: "寮鸿皟璇风殑鏄�滀綘鈥�",
+          },
+          {
+            oldId: "44DE",
+            txt: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
+          },
+          {
+            oldId: "FB34",
+            txt: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
+          },
           ],
         },
         questionType: "matching",
@@ -537,7 +538,7 @@
         titleDescription: "1",
         userChoise: [],
         value: [],
-        // answerImg: require("../../assets/images/matching-one.png"),
+        answerImg: require("../../assets/images/matching-one.png"),
       },
       questionData: {
         warnUp: {
@@ -547,6 +548,8 @@
           four: "",
           five: "",
           six: "",
+          seven: "",
+          enight: "",
         },
         reading: {
           one: "",
diff --git a/src/books/artAndDrama/view/components/chapter003.vue b/src/books/artAndDrama/view/components/chapter003.vue
index 2a3261b..5ccfa2e 100644
--- a/src/books/artAndDrama/view/components/chapter003.vue
+++ b/src/books/artAndDrama/view/components/chapter003.vue
@@ -42,7 +42,11 @@
                     <h3 class="lefth3" id="c022" style="margin-top: 7%"><img class="img-gn1" alt=""
                             src="../../assets/images/czysj.jpg" /></h3>
                     <p class="text"><span class="hs1">鈼�</span>閭�璇峰皬浼欎即鍒嗚鑹叉湕璇甸檮褰曚腑鐨勫墽鏈�夋1锝�2锛岄噸璇诲姞鐐规枃瀛椼��</p>
+                     <p class="block3" style=""><span class="hs">鍓ф湰</span></p>
+                    <p class="center1 text" style="font-size: 25px; margin: 3% 0;"><span class="hs">涓�鍧楀ザ閰�</span></p>
                     <p class="center text"><img class="img-e" alt="" src="../../assets/images/0024-1.jpg" /></p>
+                     <i class="el-icon-folder-opened text" style="color: brown;">閫夋1</i>
+                     <i class="el-icon-folder-opened text" style="color: brown;">閫夋2</i>
                 </div>
                 <p><br /></p>
                 <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
@@ -66,7 +70,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" :item="question" class="macthing" :primaryColor="'transparent'">
+                    <matching :rawData="rawData" :question="question" class="macthing" :primaryColor="'transparent'">
                     </matching>
                 </div>
                 <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
@@ -221,6 +225,10 @@
         showPageList: {
             type: Array,
         },
+        primaryColor: {
+            type: String,
+            default: "red",
+        }
     },
     //鍦ㄨ繖閲屽璋冪敤鐨勬柟娉曡繘琛屾寕杞�
     mounted() {
@@ -263,11 +271,11 @@
                         txt: "涓嶈兘涓㈡帀鍟婏紝濡傛灉鑳界粰鎴戝悆灏卞お濂戒簡锛�",
                     },
                     {
-                        oldId: "FB34",
+                        oldId: "2ED4",
                         txt: "瑕佷笉鎴戞妸濂堕叒鍋峰伔鍚冧簡鍚с��",
                     },
                     {
-                        oldId: "2ED4",
+                        oldId: "FB34",
                         txt: "濂藉彲鎯滃晩锛岃繖涔堢編鍛崇殑濂堕叒锛�",
                     },
                 ],
@@ -279,7 +287,7 @@
                     {
                         id: "FB34",
                         linkValue: "鈥滄帀浜嗕竴涓锛岃繖璇ユ�庝箞鍔烇紒鈥�",
-                        value: "瑕佷笉鎴戞妸濂堕叒鍋峰伔鍚冧簡鍚с��",
+                        value: "濂藉彲鎯滃晩锛岃繖涔堢編鍛崇殑濂堕叒锛�",
                     },
                     {
                         id: "64D6",
@@ -289,7 +297,7 @@
                     {
                         id: "2ED4",
                         linkValue: "鈥滄垜瑕佹槸鍋峰槾璋佷篃鐪嬩笉瑙併�傗��",
-                        value: "濂藉彲鎯滃晩锛岃繖涔堢編鍛崇殑濂堕叒锛�",
+                        value: "瑕佷笉鎴戞妸濂堕叒鍋峰伔鍚冧簡鍚с��",
                     },
                 ],
                 optionStyle: undefined,
@@ -297,38 +305,30 @@
                 options: {
                     linkValues: [
                         {
-                            oldId: "64D6",
-                            txt: "It is one of China's must-see sights for visitors, which shows thewisdom of Chinese people.",
-                        },
-                        {
-                            oldId: "44DE",
-                            txt: "It was first discovered and drank in China and my favoriteLongjing tea is produced near the West Lake in Hangzhou.",
-                        },
-                        {
                             oldId: "FB34",
-                            txt: "The clothing material is quite popular among Roman women inancient times.",
+                            txt: "鈥滄帀浜嗕竴涓锛岃繖璇ユ�庝箞鍔烇紒鈥�",
+                        },
+                        {
+                            oldId: "64D6",
+                            txt: "鈥滀涪鎺夛紝瀹炲湪澶彲鎯滐紒鈥�",
                         },
                         {
                             oldId: "2ED4",
-                            txt: "It is very delicious and I like the hot and spicy Sichuan lavor hest.",
+                            txt: "鈥滄垜瑕佹槸鍋峰槾璋佷篃鐪嬩笉瑙併�傗��",
                         },
                     ],
                     values: [
                         {
-                            oldId: "FB34",
-                            txt: "Martin  Silk",
-                        },
-                        {
                             oldId: "64D6",
-                            txt: "The Great Wall",
+                            txt: "涓嶈兘涓㈡帀鍟婏紝濡傛灉鑳界粰鎴戝悆灏卞お濂戒簡锛�",
                         },
                         {
                             oldId: "2ED4",
-                            txt: "Chinese Food",
+                            txt: "瑕佷笉鎴戞妸濂堕叒鍋峰伔鍚冧簡鍚с��",
                         },
                         {
-                            oldId: "44DE",
-                            txt: "Chinese Tea",
+                            oldId: "FB34",
+                            txt: "濂藉彲鎯滃晩锛岃繖涔堢編鍛崇殑濂堕叒锛�",
                         },
                     ],
                 },
@@ -340,6 +340,7 @@
                 titleDescription: "1",
                 userChoise: [],
                 value: [],
+                answerImg: require("../../assets/images/matching-two.png"),
             },
             questionData: {
                 warnUp: {

--
Gitblit v1.9.1