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/chapter004.vue | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/books/lifeCare/view/chapter004.vue b/src/books/lifeCare/view/chapter004.vue index 951bcd7..b9f9313 100644 --- a/src/books/lifeCare/view/chapter004.vue +++ b/src/books/lifeCare/view/chapter004.vue @@ -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"> @@ -1242,19 +1227,34 @@ <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 :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 { @@ -1317,16 +1317,16 @@ 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