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/chapter007.vue | 77 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/src/books/lifeCare/view/chapter007.vue b/src/books/lifeCare/view/chapter007.vue
index ef1b3fe..c73c4d8 100644
--- a/src/books/lifeCare/view/chapter007.vue
+++ b/src/books/lifeCare/view/chapter007.vue
@@ -479,10 +479,7 @@
<tr>
<th
:style="{
- width:
- index == 1 || index == chapter007.groupData.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter007.publicHeader"
:key="index"
@@ -1121,11 +1118,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter007.scoreData1.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter007.publicHeader"
:key="index"
@@ -1315,11 +1308,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter007.scoreData2.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter007.publicHeader"
:key="index"
@@ -2414,7 +2403,7 @@
placeholder="璇疯緭鍏ュ唴瀹�"
rows="3"
class="textareaInput"
- @blur="onBlurChange('text68')"
+ @blur="onBlurChange('text681')"
></textarea>
<p class="left">鍏朵粬</p>
<textarea
@@ -2567,7 +2556,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 { getFileMd5, getPublicImage } from "../js/tool.js";
@@ -2580,6 +2569,10 @@
},
questionData: {
type: Object,
+ },
+ isSearch: {
+ type: Boolean,
+ default: false,
},
},
data() {
@@ -2604,7 +2597,7 @@
pictrueList: [],
pictrueListTwo: [],
pictrueListThree: [],
- pictrueListFour:[],
+ pictrueListFour: [],
qustionData: {},
// 鍒涜鑹ソ鐫＄湢鐜鐨勮瘎鍒嗘爣鍑�
publicHeader: ["搴忓彿", "鑰冩牳鍐呭", "閰嶅垎", "璇勫垎鏍囧噯", "鎵ｅ垎", "寰楀垎"],
@@ -2841,35 +2834,27 @@
examinations,
},
async created() {
- const localData = JSON.parse(localStorage.getItem("chapter007"));
- if (localData) {
- this.chapter007 = { ...Object.assign(this.chapter007, localData) };
+ if (!this.isSearch) {
+ const localData = JSON.parse(localStorage.getItem("chapter007"));
+ if (localData) {
+ this.chapter007 = { ...Object.assign(this.chapter007, localData) };
+ }
+ this.chapter007.videOneUrl = await getResourcePath(
+ "3c35b62a39cf8beddc28c5c1c8a847ec"
+ );
+ this.chapter007.videoTwoUrl = await getResourcePath(
+ "4731be836c5c625584c3c94a61249cc9"
+ );
+ this.chapter007.videoFourUrl = await getResourcePath(
+ "4889c1899ed5716aeea6ca031cd3136d"
+ );
+ this.chapter007.videoFiveUrl = await getResourcePath(
+ "a1d60d7c5322d531939118c1aaf8feb7"
+ );
+ this.chapter007.videoSixUrl = await getResourcePath(
+ "f92c68faa37e1f6ce9ca50f234ddad90"
+ );
}
- this.chapter007.videOneUrl = await getResourcePath(
- "3c35b62a39cf8beddc28c5c1c8a847ec"
- );
- this.chapter007.videoTwoUrl = await getResourcePath(
- "4731be836c5c625584c3c94a61249cc9"
- );
- this.chapter007.videoFourUrl = await getResourcePath(
- "4889c1899ed5716aeea6ca031cd3136d"
- );
- this.chapter007.videoFiveUrl = await getResourcePath(
- "a1d60d7c5322d531939118c1aaf8feb7"
- );
- this.chapter007.videoSixUrl = await getResourcePath(
- "f92c68faa37e1f6ce9ca50f234ddad90"
- );
- // this.chapter007.videOneUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=3c35b62a39cf8beddc28c5c1c8a847ec";
- // this.chapter007.videoTwoUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=4731be836c5c625584c3c94a61249cc9";
- // this.chapter007.videoFourUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=4889c1899ed5716aeea6ca031cd3136d";
- // this.chapter007.videoFiveUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=a1d60d7c5322d531939118c1aaf8feb7";
- // this.chapter007.videoSixUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=f92c68faa37e1f6ce9ca50f234ddad90";
},
methods: {
activityOne() {
@@ -2991,7 +2976,7 @@
that.chapter007.pictrueListFour.push(getPublicImage(e));
}
that.isLoding = false;
- this.$emit('Upload_initViewer',"")
+ this.$emit("Upload_initViewer", "");
localStorage.setItem("chapter007", JSON.stringify(this.chapter007));
}, 1000);
})
--
Gitblit v1.9.1