From 3d27635c7ac693c461dd2ca01e8f5bebb1f0c642 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 27 五月 2024 17:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/lifeCare/view/chapter004.vue |   81 +++++++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/books/lifeCare/view/chapter004.vue b/src/books/lifeCare/view/chapter004.vue
index 951bcd7..c64f929 100644
--- a/src/books/lifeCare/view/chapter004.vue
+++ b/src/books/lifeCare/view/chapter004.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="chapter">
+  <div class="chapter" num="4">
     <div class="page-box" page="55">
       <div class="bodystyle topImg">
         <h2 id="b004">
@@ -1111,21 +1111,6 @@
         <h4 id="d042">
           鈻垛柖 搴旂敤涓庡疄璺�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
         </h4>
-        <div class="tips-bk">
-          <div class="bj-tip">
-            浜戞祴璇曪細鍗曞厓鍥涘簲鐢ㄤ笌瀹炶返<img
-              src="../icons/sub.png"
-              @click="activityThree"
-              alt=""
-            />
-          </div>
-          <div
-            v-if="chapter004.idOpenThree && chapter004.qustionData[4]"
-            class="tips-file"
-          >
-            <examinations :cardList="chapter004.qustionData[4]" />
-          </div>
-        </div>
         <p><br /></p>
         <!-- <p><br /></p>
         <div class="bk-sys">
@@ -1218,43 +1203,67 @@
         <p class="block">B.鍚炲捊鍙嶅皠</p>
         <p class="block">C.鍚稿惍鍙嶅皠</p>
         <p class="block">D.鏉′欢鍙嶅皠</p>
-        <p>7.鍩瑰吇鑹ソ鐨勪簩渚夸範鎯拰鐢熸椿鏂瑰紡鏈夊埄浜庯紙銆�<input
+        <p>
+          7.鍩瑰吇鑹ソ鐨勪簩渚夸範鎯拰鐢熸椿鏂瑰紡鏈夊埄浜庯紙銆�<input
             v-model="chapter004.radio.text7"
             @blur="onRadioText()"
-          />銆�锛夈��</p>
+          />銆�锛夈��
+        </p>
         <p class="block">A.鎻愰珮濠村辜鍎垮姩浣滅殑鐏垫椿鎬�</p>
         <p class="block">B.鎻愰珮濠村辜鍎跨殑绀句細浜ゅ線鑳藉姏</p>
         <p class="block">C.鎻愰珮濠村辜鍎挎満浣撶殑宸ヤ綔鏁堢巼</p>
         <p class="block">D.淇冭繘濠村辜鍎跨殑鏅哄姏鍙戝睍</p>
-        <p>8.鍩瑰吇濠村辜鍎跨殑浜屼究涔犳儻瑕侊紙銆�<input
+        <p>
+          8.鍩瑰吇濠村辜鍎跨殑浜屼究涔犳儻瑕侊紙銆�<input
             v-model="chapter004.radio.text8"
             @blur="onRadioText()"
-          />銆�锛夈��</p>
+          />銆�锛夈��
+        </p>
         <p class="block">A.鎶撳噯闂撮殧鏃堕棿鎻愬墠鎻愰啋</p>
         <p class="block">B.鎻愭棭璁粌</p>
         <p class="block">C.浠ュ闀跨殑濞佷弗鍒舵湇濠村効</p>
         <p class="block">D.鐢ㄩ鐗╅�楀紩濠村効</p>
-        <p>9.濠村辜鍎夸簩渚垮悗涓嶆纭殑娓呮磥鏂规硶鏄紙銆�<input
+        <p>
+          9.濠村辜鍎夸簩渚垮悗涓嶆纭殑娓呮磥鏂规硶鏄紙銆�<input
             v-model="chapter004.radio.text9"
             @blur="onRadioText()"
-          />銆�锛夈��</p>
+          />銆�锛夈��
+        </p>
         <p class="block">A.渚垮悗娲楁墜</p>
         <p class="block">B.鐢ㄦ俯姘存礂灞佽偂</p>
         <p class="block">C.渚垮悗渚跨泦娓呮礂娑堟瘨</p>
         <p class="block">D.濂冲┐澶т究鍚庝竴瀹氳浠庡悗鍚戝墠鎿�</p>
+        <div class="tips-bk">
+          <div class="bj-tip">
+            浜戞祴璇曪細鍗曞厓鍥涘簲鐢ㄤ笌瀹炶返<img
+              src="../icons/sub.png"
+              @click="activityThree"
+              alt=""
+            />
+          </div>
+          <div
+            v-if="chapter004.idOpenThree && chapter004.qustionData[65]"
+            class="tips-file"
+          >
+            <examinations
+              :primaryColor="'#f49a4c'"
+              :cardList="chapter004.qustionData[65]"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-// import getResourcePath from "@/assets/methods/resources.js";
-// import getQuestionData from "@/assets/methods/examination.js";
+import getResourcePath from "@/assets/methods/resources.js";
+import getQuestionData from "@/assets/methods/examination.js";
 import testData from "../js/examinationList.js";
-// import examinations from "@/components/examinations/index.vue";
+import examinations from "@/components/examinations/index.vue";
 export default {
   name: "chapter004",
   components: {
-    // examinations
+    examinations,
   },
   data() {
     return {
@@ -1312,21 +1321,31 @@
       },
     };
   },
-  created() {
+  async created() {
     const localData = JSON.parse(localStorage.getItem("chapter004"));
     if (localData) {
       this.chapter004 = { ...Object.assign(this.chapter004, localData) };
     }
-    // this.chapter004.videOneUrl = getResourcePath("c276be12bae3b1df0b3ce4aa01b14e1e");
-    // this.chapter004.videoTwoUrl = getResourcePath("7eb7fe2e3c13885a96143110ca4f5654");
-    // this.chapter004.videoFourUrl = getResourcePath("1b04691b60e5b5b207b3a4967c495d29");
+    this.chapter004.videOneUrl = getResourcePath(
+      "c276be12bae3b1df0b3ce4aa01b14e1e"
+    );
+    this.chapter004.videoTwoUrl = getResourcePath(
+      "7eb7fe2e3c13885a96143110ca4f5654"
+    );
+    this.chapter004.videoFourUrl = getResourcePath(
+      "1b04691b60e5b5b207b3a4967c495d29"
+    );
     this.chapter004.videOneUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=c276be12bae3b1df0b3ce4aa01b14e1e";
     this.chapter004.videoTwoUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=7eb7fe2e3c13885a96143110ca4f5654";
     this.chapter004.videoFourUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=1b04691b60e5b5b207b3a4967c495d29";
-    // this.chapter004.qustionData = await getQuestionData("4",testData[4]);
+    this.chapter004.qustionData = await getQuestionData(
+      "4",
+      testData[4],
+      this.config.activeBook
+    );
   },
   methods: {
     activityOne() {

--
Gitblit v1.9.1