From 23ebc0d9ee7d4b06916478f84b411d0406f11a3a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 05 六月 2024 18:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter007.vue | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/src/books/lifeCare/view/chapter007.vue b/src/books/lifeCare/view/chapter007.vue
index f98b3eb..929798e 100644
--- a/src/books/lifeCare/view/chapter007.vue
+++ b/src/books/lifeCare/view/chapter007.vue
@@ -315,10 +315,53 @@
</div>
</div>
<div class="bodystyle">
- <p>3.璇风粯鍒惰壇濂界殑鐫＄湢鐜鍥俱��</p>
+ <p class="pic-wall">
+ 3.璇风粯鍒惰壇濂界殑鐫＄湢鐜鍥俱��<span
+ class="btnUpload-list"
+ @click="handFile('fileFour')"
+ >
+ <svg
+ t="1717059899765"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="2633"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="18"
+ height="18"
+ >
+ <path
+ d="M256.111993 608.601962c61.628148 0 122.808324 17.790888 183.220549 52.796701 88.122492-119.67252 198.387601-180.788701 328.747453-180.788701 80.122992 0 142.071121 0 191.860009 41.213424V217.522405C959.940004 168.181489 919.750516 127.992 870.345603 127.992h-716.755202A89.5944 89.5944 0 0 0 63.996 217.586401v489.569402c47.165052-64.95594 111.929004-98.489844 192.179989-98.489845z m95.994-159.99a95.994 95.994 0 1 0 0-191.988001 95.994 95.994 0 0 0 0 191.988001z m0 63.996a159.990001 159.990001 0 1 1 0-319.980001 159.990001 159.990001 0 0 1 0 319.980001zM1023.936004 619.097306a254.448097 254.448097 0 0 0-112.63296-41.469408c-38.909568-33.021936-81.27492-33.021936-143.223049-33.021936-116.664708 0-213.682645 58.23636-293.357665 177.716893l-17.726892 26.622336-26.622336-17.726892c-58.940316-39.293544-116.920692-58.620336-174.261109-58.620336-72.699456 0-125.880132 53.564652-163.317793 128.439972l-14.335104 28.606212-14.207112-7.103556A89.5944 89.5944 0 0 0 153.590401 905.031436h425.893381c6.783576 22.782576 16.63896 44.285232 29.182176 63.996H153.590401a153.590401 153.590401 0 0 1-153.590401-153.590401V217.586401A153.590401 153.590401 0 0 1 153.590401 63.996h716.691206A153.654397 153.654397 0 0 1 1023.936004 217.586401v401.510905z"
+ p-id="2634"
+ ></path>
+ <path
+ d="M796.366227 796.430223v-142.199112a28.414224 28.414224 0 0 1 56.892444 0v142.199112h142.199113a28.414224 28.414224 0 0 1 0 56.828448h-142.199113v142.263109a28.414224 28.414224 0 0 1-56.95644 0v-142.263109h-142.135116a28.414224 28.414224 0 0 1 0-56.828448h142.199112z"
+ p-id="2635"
+ ></path>
+ </svg>
+ </span>
+ </p>
<div class="bk-tx">
- <p><br /></p>
- <p><br />銆�</p>
+ <div
+ class="upload-list"
+ v-if="chapter007.pictrueListFour.length > 0"
+ >
+ <div
+ class="demo-image__preview openImgBox"
+ v-for="item in chapter007.pictrueListFour"
+ :key="item"
+ >
+ <img style="height: 100%" :src="item" alt="" />
+ </div>
+ </div>
+ <div class="bk-inputUpload">
+ <input
+ type="file"
+ id="fileFour"
+ @change="handUploadFile($event, '4')"
+ />
+ </div>
</div>
<h4 id="d073">
鈻垛柖 娲诲姩3锛氬垱璁剧潯鐪犵幆澧�<span class="fontsz1">锛烇紴锛烇紴锛烇紴锛烇紴</span>
@@ -1421,6 +1464,7 @@
></path>
</svg>
</span>
+ <span class="upload_text">涓婁紶鍥剧墖</span>
</div>
<div
style="width: 100%; height: 100%"
@@ -2235,7 +2279,9 @@
width:
index == chapter007.headersData173.length - 1
? '350px'
- : index == 0?'60px':'',
+ : index == 0
+ ? '60px'
+ : '',
}"
v-for="(header, index) in chapter007.headersData173"
:key="index"
@@ -2521,7 +2567,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";
@@ -2534,6 +2580,10 @@
},
questionData: {
type: Object,
+ },
+ isSearch: {
+ type: Boolean,
+ default: false,
},
},
data() {
@@ -2558,6 +2608,7 @@
pictrueList: [],
pictrueListTwo: [],
pictrueListThree: [],
+ pictrueListFour: [],
qustionData: {},
// 鍒涜鑹ソ鐫＄湢鐜鐨勮瘎鍒嗘爣鍑�
publicHeader: ["搴忓彿", "鑰冩牳鍐呭", "閰嶅垎", "璇勫垎鏍囧噯", "鎵ｅ垎", "寰楀垎"],
@@ -2794,35 +2845,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 = getResourcePath(
- "3c35b62a39cf8beddc28c5c1c8a847ec"
- );
- this.chapter007.videoTwoUrl = getResourcePath(
- "4731be836c5c625584c3c94a61249cc9"
- );
- this.chapter007.videoFourUrl = getResourcePath(
- "4889c1899ed5716aeea6ca031cd3136d"
- );
- this.chapter007.videoFiveUrl = getResourcePath(
- "a1d60d7c5322d531939118c1aaf8feb7"
- );
- this.chapter007.videoSixUrl = 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() {
@@ -2940,7 +2983,11 @@
if (type == "3") {
that.chapter007.pictrueListThree.push(getPublicImage(e));
}
+ if (type == "4") {
+ that.chapter007.pictrueListFour.push(getPublicImage(e));
+ }
that.isLoding = false;
+ this.$emit("Upload_initViewer", "");
localStorage.setItem("chapter007", JSON.stringify(this.chapter007));
}, 1000);
})
--
Gitblit v1.9.1