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/chapter003.vue |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/books/lifeCare/view/chapter003.vue b/src/books/lifeCare/view/chapter003.vue
index b752559..1319c71 100644
--- a/src/books/lifeCare/view/chapter003.vue
+++ b/src/books/lifeCare/view/chapter003.vue
@@ -2275,7 +2275,7 @@
         <h4 id="d031">
           鈻垛柖 搴旂敤涓庡疄璺�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
         </h4>
-        <div class="tips-bk">
+        <!-- <div class="tips-bk">
           <div class="bj-tip">
             浜戞祴璇曪細鍗曞厓涓夊簲鐢ㄤ笌瀹炶返<img
               src="../icons/sub.png"
@@ -2289,7 +2289,7 @@
           >
             <examinations :cardList="chapter003.qustionData[3]" />
           </div>
-        </div>
+        </div> -->
         <!-- <div class="bk-sys">
           <div class="bj1-sys">
             <p class="left">
@@ -2412,15 +2412,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="chapter003.idOpenThree && chapter003.qustionData[48]"
+            class="tips-file"
+          >
+            <examinations :cardList="chapter003.qustionData[48]" />
+          </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: "chapter003",
@@ -2807,24 +2822,24 @@
     };
   },
   components: {
-    // examinations,
+    examinations,
   },
   created() {
     const localData = JSON.parse(localStorage.getItem("chapter003"));
     if (localData) {
       this.chapter003 = { ...Object.assign(this.chapter003, localData) };
     }
-    // this.chapter003.videOneUrl = getResourcePath("459ab85d46207bfcca4801dc9b319b9b");
-    // this.chapter003.videoTwoUrl = getResourcePath("3817bea302b25b865ff938140939a8de");
-    // this.chapter003.videoFourUrl = getResourcePath("7af72da649f6656c3b2164e708f5c132");
-    // this.chapter003.videoFiveUrl = getResourcePath("e24de9b0cdd889cb73e9b472ad6f4731");
-    // this.chapter003.videoSixUrl = getResourcePath("d95740ab777d9c7ca074c33317a835c4");
-    // this.chapter003.videoSevenUrl = getResourcePath("0b330926f3e6ed510b48144a83199fb3");
-    // this.chapter003.videoEigthUrl = getResourcePath("9f63cc4dcba6a87cbfe82a9ec4d7c77e");
-    // this.chapter003.videoNineUrl = getResourcePath("c2ecf6f102a6e9b210f3db49b17b58a4");
-    // this.chapter003.videoTenUrl = getResourcePath("b6943018923c0cbad4e414dc2097cb9a");
-    // this.chapter003.videoEleUrl = getResourcePath("eb604885f7c01cdf2d95df839c9c233a");
-    // this.chapter003.videoTevUrl = getResourcePath("f12a50c2ac57da78ff02f3d5f430163b");
+    this.chapter003.videOneUrl = getResourcePath("459ab85d46207bfcca4801dc9b319b9b");
+    this.chapter003.videoTwoUrl = getResourcePath("3817bea302b25b865ff938140939a8de");
+    this.chapter003.videoFourUrl = getResourcePath("7af72da649f6656c3b2164e708f5c132");
+    this.chapter003.videoFiveUrl = getResourcePath("e24de9b0cdd889cb73e9b472ad6f4731");
+    this.chapter003.videoSixUrl = getResourcePath("d95740ab777d9c7ca074c33317a835c4");
+    this.chapter003.videoSevenUrl = getResourcePath("0b330926f3e6ed510b48144a83199fb3");
+    this.chapter003.videoEigthUrl = getResourcePath("9f63cc4dcba6a87cbfe82a9ec4d7c77e");
+    this.chapter003.videoNineUrl = getResourcePath("c2ecf6f102a6e9b210f3db49b17b58a4");
+    this.chapter003.videoTenUrl = getResourcePath("b6943018923c0cbad4e414dc2097cb9a");
+    this.chapter003.videoEleUrl = getResourcePath("eb604885f7c01cdf2d95df839c9c233a");
+    this.chapter003.videoTevUrl = getResourcePath("f12a50c2ac57da78ff02f3d5f430163b");
     this.chapter003.videOneUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=459ab85d46207bfcca4801dc9b319b9b";
     this.chapter003.videoTwoUrl =
@@ -2847,7 +2862,7 @@
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=eb604885f7c01cdf2d95df839c9c233a";
     this.chapter003.videoTevUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=f12a50c2ac57da78ff02f3d5f430163b";
-    // this.chapter003.qustionData = await getQuestionData("3",testData[3]);
+    this.chapter003.qustionData = await getQuestionData("3",testData[3],this.config.activeBook);
   },
   methods: {
     activityOne() {

--
Gitblit v1.9.1