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/chapter001.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/books/lifeCare/view/chapter001.vue b/src/books/lifeCare/view/chapter001.vue
index 752c37e..99521c7 100644
--- a/src/books/lifeCare/view/chapter001.vue
+++ b/src/books/lifeCare/view/chapter001.vue
@@ -1370,7 +1370,7 @@
v-if="chapter001.idOpenThree && chapter001.qustionData[9]"
class="tips-file"
>
- <examinations :cardList="chapter001.qustionData[9]" />
+ <examinations :primaryColor="'#f49a4c'" :cardList="chapter001.qustionData[9]" />
</div>
</div>
</div>
@@ -1379,10 +1379,10 @@
</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: "chapter001",
@@ -1406,16 +1406,16 @@
};
},
components: {
- // examinations,
+ examinations,
},
- created() {
+ async created() {
const localData = JSON.parse(localStorage.getItem("chapter001"));
if (localData) {
this.chapter001 = { ...Object.assign(this.chapter001, localData) };
}
- // this.chapter001.videOneUrl = getResourcePath("68ebd5c05bcb742999a9ebdce4b4bd53");
- // this.qustionData = await getQuestionData('1',testData[1]);
+ this.chapter001.videOneUrl = getResourcePath("68ebd5c05bcb742999a9ebdce4b4bd53");
+ this.chapter001.qustionData = await getQuestionData('1',testData[1],this.config.activeBook);
},
methods: {
activityOne() {
--
Gitblit v1.9.1