From cc7bbbd9b6a859235c9985cc09836effc1157fe8 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 07 六月 2024 10:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter004.vue | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/books/lifeCare/view/chapter004.vue b/src/books/lifeCare/view/chapter004.vue
index dbb86dc..d0f3c91 100644
--- a/src/books/lifeCare/view/chapter004.vue
+++ b/src/books/lifeCare/view/chapter004.vue
@@ -476,10 +476,7 @@
<tr>
<th
:style="{
- width:
- index == 1 || index == chapter004.groupData.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter004.publicHeader"
:key="index"
@@ -1355,7 +1352,7 @@
</div>
</template>
<script>
-import getResourcePath from "@/assets/methods/resources.js";
+import { getResourcePath } from "@/assets/methods/resources.js";
import examinations from "@/components/examinations/index.vue";
import drawflow from "@/components/drawflow";
export default {
@@ -1367,6 +1364,10 @@
},
questionData: {
type: Object,
+ },
+ isSearch: {
+ type: Boolean,
+ default: false,
},
},
components: {
@@ -1446,25 +1447,21 @@
};
},
async created() {
- const localData = JSON.parse(localStorage.getItem("chapter004"));
- if (localData) {
- this.chapter004 = { ...Object.assign(this.chapter004, localData) };
+ if (!this.isSearch) {
+ const localData = JSON.parse(localStorage.getItem("chapter004"));
+ if (localData) {
+ this.chapter004 = { ...Object.assign(this.chapter004, localData) };
+ }
+ this.chapter004.videOneUrl = await getResourcePath(
+ "c276be12bae3b1df0b3ce4aa01b14e1e"
+ );
+ this.chapter004.videoTwoUrl = await getResourcePath(
+ "7eb7fe2e3c13885a96143110ca4f5654"
+ );
+ this.chapter004.videoFourUrl = await getResourcePath(
+ "1b04691b60e5b5b207b3a4967c495d29"
+ );
}
- this.chapter004.videOneUrl = await getResourcePath(
- "c276be12bae3b1df0b3ce4aa01b14e1e"
- );
- this.chapter004.videoTwoUrl = await getResourcePath(
- "7eb7fe2e3c13885a96143110ca4f5654"
- );
- this.chapter004.videoFourUrl = await 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";
},
methods: {
activityOne() {
--
Gitblit v1.9.1