From 94397fef956e5181bd3f905e844d61dcb96814e3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 24 六月 2024 19:30:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/artAndDrama/view/components/chapter001.vue |  332 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 218 insertions(+), 114 deletions(-)

diff --git a/src/books/artAndDrama/view/components/chapter001.vue b/src/books/artAndDrama/view/components/chapter001.vue
index 68b2c5b..0dd86a0 100644
--- a/src/books/artAndDrama/view/components/chapter001.vue
+++ b/src/books/artAndDrama/view/components/chapter001.vue
@@ -59,43 +59,26 @@
     </div>
     <div class="page-box" page="6">
       <div v-if="showPageList.indexOf(6) > -1">
-        <img src="../../assets/images/page6-header-green.png" alt="" style="height: auto; width: 100%" />     
+        <img src="../../assets/images/page6-header-green.png" alt="" style="height: auto; width: 100%" />
         <div class="bodystyle">
           <h3 class="lefth3" id="c001"><img class="img-gn1" alt="" src="../../assets/images/czysj.jpg" /></h3>
           <p class="text"><span class="hs1">鈼�</span>璇烽�夊嚭浣犺涓烘纭殑绛旀銆�</p>
           <p class="center openImgBox">
             <img class="img-e" alt="" src="../../assets/images/1-2铓傝殎涓惧ぇ鏍�.gif" />
           </p>
-          <p class="text">铓傝殎鏄吀鍨嬬殑锛堛��銆�锛夋槅铏�傦紙澶氶�夛級</p>
-          <p class="text">A.缇ゅ眳</p>
-          <p class="text">B.绀句細鎬�</p>
-          <p class="text">C.鐙眳</p>
-          <p class="text">铓傝殎鍐呴儴鏈夛紙銆�銆�锛夊垎宸ャ�傦紙澶氶�夛級</p>
-          <p class="text">A.鏄庣‘鐨�</p>
-          <p class="text">B.濂囨�殑</p>
-          <p class="text">C.鏈夊簭鐨�</p>
-          <p class="text">涓�涓紙銆�銆�锛夌兢浣撳皯涓嶄簡榛樺鐨勯厤鍚堛�傦紙澶氶�夛級</p>
-          <p class="text">A.鍥㈢粨鐨�</p>
-          <p class="text">B.浼樼鐨�</p>
-          <p class="text">C.鏉炬暎鐨�</p>
-          <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true"
-            x5-video-orientation="h5" x5-video-player-fullscreen="true" x5-playsinline="" controls
-            controlslist="nodownload" class="w100 video"  @play="videoPlay"
-            style="margin-top: 40px; border-radius: 10px; border: 2px solid green;"></video>
-            <p class="center videoname">
+          <choice class="text" :questions="questions" :primaryColor="accentColor"  hoverBackgroundColor="#F58200" hoverColor="white"></choice>
+          <p class="center text">
+            <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true"
+              x5-video-orientation="h5" x5-video-player-fullscreen="true" x5-playsinline="" controls
+              controlslist="nodownload" class="w100 video " @play="videoPlay"
+              style="margin-top: 40px; border-radius: 10px; border: 2px solid green;"></video>
+          </p>
+          <p class="center videoname">
             <span>瑙嗛锛氭垜浠槸涓�瀹朵汉 </span>
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
-              placement="top-start"
-            >
-              <img
-                :src="chapterData.isCollectVideo ? collectCheck : collectImg"
-                alt=""
-                class="collect-btn"
-                @click="handleCollect('video')"
-              />
+            <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
+              placement="top-start">
+              <img :src="chapterData.isCollectVideo ? collectCheck : collectImg" alt="" class="collect-btn"
+                @click="handleCollect('video')" />
             </el-tooltip>
           </p>
         </div>
@@ -191,12 +174,12 @@
             涓冨勾绾т笂鍐屻�嬶紝2椤碉紝鍖椾含锛屼汉姘戞暀鑲插嚭鐗堢ぞ锛�2016銆�
           </p>
         </div>
-         <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-right">5</div>
-      </div> 
-    </div>
+        <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-right">5</div>
+        </div>
+      </div>
     </div>
     <div class="page-box" page="9">
       <div v-if="showPageList.indexOf(9) > -1">
@@ -212,20 +195,23 @@
             <img class="img-e" alt="" src="../../assets/images/1-4.gif" style="height: auto; width: 50%" />
           </h1>
           <p class="text">
-            <span class="hs1">鈼�</span>鐢熸椿涓紝鎴戜滑鎬讳細閬囧埌鍚勭鍚勬牱鐨勮鎯戙�傞潰瀵硅鎯戞椂锛屾垜浠殑鍐呭績甯稿父浼氭湁涓や釜涓嶅悓鐨勫0闊冲嚭鐜帮細涓�涓0闊宠姹傛垜浠弗浜庡緥宸憋紝鍙︿竴涓0闊宠姹傛垜浠殢蹇冩墍娆层�傝浣犲垎鏋愪竴涓嬶紝褰撹殏铓侀槦闀块潰瀵规帀钀界殑濂堕叒娓g殑璇辨儜鏃讹紝浠栧唴蹇冪殑涓や釜澹伴煶浼氳浜涗粈涔堝憿锛�
+            <span
+              class="hs1">鈼�</span>鐢熸椿涓紝鎴戜滑鎬讳細閬囧埌鍚勭鍚勬牱鐨勮鎯戙�傞潰瀵硅鎯戞椂锛屾垜浠殑鍐呭績甯稿父浼氭湁涓や釜涓嶅悓鐨勫0闊冲嚭鐜帮細涓�涓0闊宠姹傛垜浠弗浜庡緥宸憋紝鍙︿竴涓0闊宠姹傛垜浠殢蹇冩墍娆层�傝浣犲垎鏋愪竴涓嬶紝褰撹殏铓侀槦闀块潰瀵规帀钀界殑濂堕叒娓g殑璇辨儜鏃讹紝浠栧唴蹇冪殑涓や釜澹伴煶浼氳浜涗粈涔堝憿锛�
           </p>
           <p class="text">姝d箟闃熼暱锛氣��
-            <input v-model="questionData.warnUp.one" class="input-bottom-border input-w-60"  @change="setBookQuestion" />銆傗��
+            <input v-model="questionData.warnUp.one" class="input-bottom-border input-w-60"
+              @change="setBookQuestion" />銆傗��
           </p>
-          <p class="text">榛戞殫闃熼暱锛氣�� <input v-model="questionData.warnUp.two" class="input-bottom-border input-w-60" @change="setBookQuestion" />銆傗��
+          <p class="text">榛戞殫闃熼暱锛氣�� <input v-model="questionData.warnUp.two" class="input-bottom-border input-w-60"
+              @change="setBookQuestion" />銆傗��
           </p>
         </div>
         <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-left">6</div>
-      </div> 
-    </div>
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-left">6</div>
+        </div>
+      </div>
     </div>
     <div class="page-box" page="10">
       <div v-if="showPageList.indexOf(10) > -1">
@@ -277,12 +263,12 @@
             涓冨勾绾т笂鍐屻�嬶紝2椤碉紝鍖椾含锛屼汉姘戞暀鑲插嚭鐗堢ぞ锛�2016銆�
           </p>
         </div>
-      <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-right">7</div>
-      </div> 
-    </div>
+        <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-right">7</div>
+        </div>
+      </div>
     </div>
     <div class="page-box" page="11">
       <div v-if="showPageList.indexOf(11) > -1">
@@ -299,12 +285,12 @@
             <span class="hs1">鈼�</span>铓傝殎闃熼暱鎶婂ザ閰福鐣欑粰浜嗗勾榫勬渶灏忕殑铓傝殎锛岃耽寰椾簡澶у鐨勮鍙�傚湪鐢熸椿涓紝浣犳浘缁忓儚鈥滆殏铓侀槦闀库�濅竴鏍风埍鎶ゅ急灏忓悧锛熸垨鑰呭儚鈥滃皬铓傝殎鈥濅竴鏍峰緱鍒拌繃鍝ュ摜濮愬浠殑鍏崇埍鍚楋紵
           </p>
         </div>
-      <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-left">8</div>
-      </div> 
-    </div>
+        <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-left">8</div>
+        </div>
+      </div>
     </div>
     <div class="page-box" page="12">
       <div v-if="showPageList.indexOf(12) > -1">
@@ -333,12 +319,12 @@
             鎯宠薄鑷繁绔欏湪涓�搴ч珮灞变笂锛屽ソ鏈嬪弸鈥滈樋姣涒�濈珯鍦ㄥ闈㈢殑楂樺北涓婏紝浣犺濡備綍鍠婁粬鍛紵
           </p>
         </div>
-       <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-right">9</div>
+        <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-right">9</div>
+        </div>
       </div>
-    </div>
     </div>
     <div class="page-box" page="13">
       <div v-if="showPageList.indexOf(13) > -1">
@@ -354,53 +340,45 @@
           <p class="text">
             瀛旇瀺鍥涘瞾灏辨噦绀艰矊銆佺煡璋﹁锛屾槸鎴戜滑瀛︿範鐨勫ソ姒滄牱锛岃鎴戜滑杩愮敤鏈崟鍏冪殑鎴忓墽鐭ヨ瘑锛屾妸浠栫殑鏁呬簨琛ㄦ紨鍑烘潵鍚э紒
           </p>
-          <p class="center">
+          <p class="center text">
             <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" playsinline="true"
               x5-video-orientation="h5" x5-video-player-fullscreen="true" x5-playsinline="" controls
-              controlslist="nodownload" class="w100 video"  @play="videoPlay"
+              controlslist="nodownload" class="w100 video" @play="videoPlay"
               style="margin-top: 40px; border-radius: 10px; border: 2px solid green;"></video>
           </p>
           <p class="center videoname">
             <span>瑙嗛锛氭垜浠槸涓�瀹朵汉 </span>
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
-              placement="top-start"
-            >
-              <img
-                :src="chapterData.isCollectVideo ? collectCheck : collectImg"
-                alt=""
-                class="collect-btn"
-                @click="handleCollect('video')"
-              />
+            <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'"
+              placement="top-start">
+              <img :src="chapterData.isCollectVideo ? collectCheck : collectImg" alt="" class="collect-btn"
+                @click="handleCollect('video')" />
             </el-tooltip>
           </p>
         </div>
-            <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
-      <div class="page-footer">
-        <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
-        <div class="page-footer-number-left">10</div>
+        <!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
+        <div class="page-footer">
+          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
+          <div class="page-footer-number-left">10</div>
+        </div>
       </div>
-    </div>
     </div>
   </div>
 </template>
 
 <script>
 import matching from "@/components/matching/matching.vue";
+import choice from "@/components/choice/choice.vue"
 import { getResourcePath } from "@/assets/methods/resources";
 export default {
   name: "chapterOne",
-  components: { matching },
+  components: {
+    matching,
+    choice,
+  },
   props: {
     showPageList: {
       type: Array,
     },
-    primaryColor: {
-      type: String,
-      default: "red",
-    }
   },
   //鍦ㄨ繖閲屽璋冪敤鐨勬柟娉曡繘琛屾寕杞�
   mounted() {
@@ -470,30 +448,46 @@
         answer: [
           {
             id: "FB34",
-            linkValue: "<span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
-            value: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
+            linkValue: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
+            value: "<span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
           },
           {
             id: "64D6",
-            linkValue: "鎴�<span class='un1'>璇�</span>浣犲悆鑻规灉鍚э紒",
-            value: "寮鸿皟鏄瀹�",
-          },  
+            linkValue: "寮鸿皟鏄瀹�",
+            value: "鎴�<span class='un1'>璇�</span>浣犲悆鑻规灉鍚э紒",
+          },
           {
             id: "2ED4",
-            linkValue: "鎴戣<span class='un1'>浣�</span>鍚冭嫻鏋滃惂锛�",
-            value: "寮鸿皟璇风殑鏄�滀綘鈥�",
+            linkValue: "寮鸿皟璇风殑鏄�滀綘鈥�",
+            value: "鎴戣<span class='un1'>浣�</span>鍚冭嫻鏋滃惂锛�",
           },
           {
             id: "44DE",
-            linkValue: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
-            value: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
+            linkValue: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
+            value: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
           },
         ],
         optionStyle: undefined,
         id: 489306,
         options: {
-          linkValues: [
+          linkValues: [{
+            oldId: "64D6",
+            txt: "寮鸿皟鏄瀹�",
+          },
           {
+            oldId: "2ED4",
+            txt: "寮鸿皟璇风殑鏄�滀綘鈥�",
+          },
+          {
+            oldId: "44DE",
+            txt: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
+          },
+          {
+            oldId: "FB34",
+            txt: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
+          },
+          ],
+          values: [{
             oldId: "FB34",
             txt: "<span class='un1'>鎴�</span>璇蜂綘鍚冭嫻鏋滃惂锛�",
 
@@ -511,24 +505,6 @@
             txt: "鎴戣浣犲悆<span class='un1'>鑻规灉</span>鍚э紒",
           },
           ],
-          values: [
-          {
-            oldId: "64D6",
-            txt: "寮鸿皟鏄瀹�",
-          },
-          {
-            oldId: "2ED4",
-            txt: "寮鸿皟璇风殑鏄�滀綘鈥�",
-          },
-          {
-            oldId: "44DE",
-            txt: "寮鸿皟鍚冪殑涓滆タ鏄�滆嫻鏋溾��",
-          },
-          {
-            oldId: "FB34",
-            txt: "寮鸿皟璇峰鐨勪汉鏄�滄垜鈥�",
-          },
-          ],
         },
         questionType: "matching",
         stem: {
@@ -540,6 +516,134 @@
         value: [],
         answerImg: require("../../assets/images/matching-one.png"),
       },
+      questions: [
+        {
+          analysisCon: "undefined",
+          answer: ['A', 'B'],
+          difficulty: 0,
+          id: 47772,
+          isCollect: false,
+          isComplete: false,
+          isRight: null,
+          isUnfold: "",
+          isUserAnswer: false,
+          number: 1,
+          options: [
+            {
+              "img": "",
+              "index": "3CA6",
+              "txt": "缇ゅ眳",
+              "value": "A"
+            },
+            {
+              "img": "",
+              "index": "73EE",
+              "txt": "绀句細鎬�",
+              "value": "B"
+            },
+            {
+              "img": "",
+              "index": "6AEF",
+              "txt": "鐙眳",
+              "value": "C"
+            },
+          ],
+          optionStyle: "Image",
+          questionType: "singleChoice",
+          score: 2,
+          stem: {
+            "stemTxt": "1銆佽殏铓佹槸鍏稿瀷鐨�(  )鏄嗚櫕銆�(澶氶��)"
+          },
+          stemStyle: "Txt",
+          userAnswer: "",
+          // 鍗曢�夐杩欓噷鐨勫瓧娈靛唴瀹瑰氨鏄�"鍗曢�夐"
+          type: 'multi'
+        },
+        {
+          analysisCon: "undefined",
+          answer: ['A', 'C'],
+          difficulty: 0,
+          id: 47773,
+          isCollect: false,
+          isComplete: false,
+          isRight: null,
+          isUnfold: "",
+          isUserAnswer: false,
+          number: 1,
+          options: [
+            {
+              "img": "",
+              "index": "3CA6",
+              "txt": "鏄庣‘鐨�",
+              "value": "A"
+            },
+            {
+              "img": "",
+              "index": "73EE",
+              "txt": "濂囨�殑",
+              "value": "B"
+            },
+            {
+              "img": "",
+              "index": "6AEF",
+              "txt": "鏈夊簭鐨�",
+              "value": "C"
+            },
+          ],
+          optionStyle: "Image",
+          questionType: "singleChoice",
+          score: 2,
+          stem: {
+            "stemTxt": "2銆佽殏铓佸唴閮ㄥ張(  )鍒嗗伐銆�(澶氶��)"
+          },
+          stemStyle: "Txt",
+          userAnswer: "",
+          // 鍗曢�夐杩欓噷鐨勫瓧娈靛唴瀹瑰氨鏄�"鍗曢�夐"
+          type: 'multi'
+        },
+        {
+          analysisCon: "undefined",
+          answer: ['A', 'B'],
+          difficulty: 0,
+          id: 47774,
+          isCollect: false,
+          isComplete: false,
+          isRight: null,
+          isUnfold: "",
+          isUserAnswer: false,
+          number: 1,
+          options: [
+            {
+              "img": "",
+              "index": "3CA6",
+              "txt": "鍥㈢粨鐨�",
+              "value": "A"
+            },
+            {
+              "img": "",
+              "index": "73EE",
+              "txt": "浼樼鐨�",
+              "value": "B"
+            },
+            {
+              "img": "",
+              "index": "6AEF",
+              "txt": "鏉炬暎鐨�",
+              "value": "C"
+            },
+          ],
+          optionStyle: "Image",
+          questionType: "singleChoice",
+          score: 2,
+          stem: {
+            "stemTxt": "3銆佷竴涓�(  )缇や綋灏戜笉浜嗛粯濂戠殑閰嶅悎銆�(澶氶��)"
+          },
+          stemStyle: "Txt",
+          userAnswer: "",
+          // 鍗曢�夐杩欓噷鐨勫瓧娈靛唴瀹瑰氨鏄�"鍗曢�夐"
+          type: 'multi'
+        },
+      ],
       questionData: {
         warnUp: {
           one: "",
@@ -596,7 +700,7 @@
       this.$emit('closeAudio', e.srcElement.currentSrc)
     },
     videoPlay(e) {
-      this.$emit('closeVideo',e.srcElement.currentSrc)
+      this.$emit('closeVideo', e.srcElement.currentSrc)
     },
     handleChapterData() {
       localStorage.setItem(

--
Gitblit v1.9.1