From 530f8bc6a8438a95ad6582f85362da87b911dcf8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 23 五月 2024 15:24:05 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/lifeCare/view/chapter005.vue |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/books/lifeCare/view/chapter005.vue b/src/books/lifeCare/view/chapter005.vue
index 4f16150..eb49198 100644
--- a/src/books/lifeCare/view/chapter005.vue
+++ b/src/books/lifeCare/view/chapter005.vue
@@ -2611,21 +2611,6 @@
         <h4 id="d061">
           鈻垛柖 搴旂敤涓庡疄璺�<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="chapter005.idOpenThree && chapter005.qustionData[3]"
-            class="tips-file"
-          >
-            <examinations :cardList="chapter005.qustionData[3]" />
-          </div>
-        </div>
         <p><br /></p>
         <!-- <p><br /></p>
         <div class="bk-sys">
@@ -2739,15 +2724,30 @@
             @blur="onBlurChange('desc')"
           ></textarea>
         </div>
+        <div class="tips-bk">
+          <div class="bj-tip">
+            浜戞祴璇曪細鍗曞厓浜斿簲鐢ㄤ笌瀹炶返<img
+              src="../icons/sub.png"
+              @click="activityThree"
+              alt=""
+            />
+          </div>
+          <div
+            v-if="chapter005.idOpenThree && chapter005.qustionData[94]"
+            class="tips-file"
+          >
+            <examinations :cardList="chapter005.qustionData[94]" />
+          </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: "chapter005",
@@ -3172,17 +3172,17 @@
     };
   },
   components: {
-    // examinations,
+    examinations,
   },
   created() {
     const localData = JSON.parse(localStorage.getItem("chapter005"));
     if (localData) {
       this.chapter005 = { ...Object.assign(this.chapter005, localData) };
     }
-    // this.chapter005.videOneUrl = getResourcePath("439b0bde62a5098875c77e2492676577");
-    // this.chapter005.videoTwoUrl = getResourcePath("1a878261410b01ee8e4e0602a1fe935f");
-    // this.chapter005.videoFourUrl = getResourcePath("6cf2619beb704b3d79de04f0775c8ba3");
-    // this.chapter005.videoFiveUrl = getResourcePath("8400384441ad9236d5eab24f500ec2c7");
+    this.chapter005.videOneUrl = getResourcePath("439b0bde62a5098875c77e2492676577");
+    this.chapter005.videoTwoUrl = getResourcePath("1a878261410b01ee8e4e0602a1fe935f");
+    this.chapter005.videoFourUrl = getResourcePath("6cf2619beb704b3d79de04f0775c8ba3");
+    this.chapter005.videoFiveUrl = getResourcePath("8400384441ad9236d5eab24f500ec2c7");
     this.chapter005.videOneUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=439b0bde62a5098875c77e2492676577";
     this.chapter005.videoTwoUrl =
@@ -3191,7 +3191,7 @@
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=6cf2619beb704b3d79de04f0775c8ba3";
     this.chapter005.videoFiveUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=8400384441ad9236d5eab24f500ec2c7";
-    // this.chapter005.qustionData = await getQuestionData("5",testData[5]);
+    this.chapter005.qustionData = await getQuestionData("5",testData[5],this.config.activeBook);
   },
   methods: {
     activityOne() {

--
Gitblit v1.9.1