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

---
 src/books/lifeCare/view/chapter006.vue |   66 +++++++++++++++-----------------
 1 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/books/lifeCare/view/chapter006.vue b/src/books/lifeCare/view/chapter006.vue
index 03a7278..13ca757 100644
--- a/src/books/lifeCare/view/chapter006.vue
+++ b/src/books/lifeCare/view/chapter006.vue
@@ -940,21 +940,6 @@
         <h4 id="d070">
           鈻垛柖 搴旂敤涓庡疄璺�<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="chapter006.idOpenThree && chapter006.qustionData[3]"
-            class="tips-file"
-          >
-            <examinations :cardList="chapter006.qustionData[3]" />
-          </div>
-        </div>
         <p><br /></p>
         <p><b>涓�銆佸崟閫夐</b></p>
         <p>
@@ -1045,15 +1030,33 @@
             @blur="onBlurChange('desc1')"
           ></textarea>
         </div>
+        <div class="tips-bk">
+          <div class="bj-tip">
+            浜戞祴璇曪細鍗曞厓鍏簲鐢ㄤ笌瀹炶返<img
+              src="../icons/sub.png"
+              @click="activityThree"
+              alt=""
+            />
+          </div>
+          <div
+            v-if="chapter006.idOpenThree && chapter006.qustionData[108]"
+            class="tips-file"
+          >
+            <examinations
+              :primaryColor="'#f49a4c'"
+              :cardList="chapter006.qustionData[108]"
+            />
+          </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: "chapter006",
@@ -1061,18 +1064,10 @@
     return {
       chapter006: {
         videOneUrl: "",
-        videoTwoUrl: "",
-        videoFourUrl: "",
-        videoFiveUrl: "",
         isGroupOpen: true,
         isOpenOne: true,
-        isOpenTwo: true,
         idOpenThree: true,
-        isOpenFour: true,
-        isOpenFive: true,
         isScore1Open: true,
-        isScore2Open: true,
-        isScore3Open: true,
         qustionData: {},
         // 鍑嗗楗按鐗╁搧鐨勮瘎鍒嗘爣鍑�
         publicHeader: ["搴忓彿", "鑰冩牳鍐呭", "閰嶅垎", "璇勫垎鏍囧噯", "鎵e垎", "寰楀垎"],
@@ -1194,17 +1189,23 @@
     };
   },
   components: {
-    // examinations,
+    examinations,
   },
-  created() {
+  async created() {
     const localData = JSON.parse(localStorage.getItem("chapter006"));
     if (localData) {
       this.chapter006 = { ...Object.assign(this.chapter006, localData) };
     }
-    // this.chapter006.videOneUrl = getResourcePath("04fafb0e896ffe0379edd6d695a92b13");
+    this.chapter006.videOneUrl = getResourcePath(
+      "04fafb0e896ffe0379edd6d695a92b13"
+    );
     this.chapter006.videOneUrl =
       "https://jsek.bnuic.com/file/api/ApiDownload?md5=04fafb0e896ffe0379edd6d695a92b13";
-    // this.chapter006.qustionData = await getQuestionData("5",testData[5]);
+    this.chapter006.qustionData = await getQuestionData(
+      "6",
+      testData[6],
+      this.config.activeBook
+    );
   },
   methods: {
     activityOne() {
@@ -1252,11 +1253,6 @@
       this.$set(this.chapter006.tableData161[rowIndex], cellIndex, value);
       localStorage.setItem("chapter006", JSON.stringify(this.chapter006));
     },
-    // updateCell152(rowIndex, cellIndex, value) {
-    //   // 鏇存柊鍗曞厓鏍兼暟鎹�
-    //   this.$set(this.chapter006.tableData152[rowIndex], cellIndex, value);
-    //   localStorage.setItem("chapter006", JSON.stringify(this.chapter006));
-    // },
     updateCell162(rowIndex, cellIndex, value) {
       // 鏇存柊鍗曞厓鏍兼暟鎹�
       localStorage.setItem("chapter006", JSON.stringify(this.chapter006));

--
Gitblit v1.9.1