From cecad57b1f746a49d6bff8132fa05d3705a13d2b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 31 五月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter005.vue | 28 ++++++++-
src/books/lifeCare/css/default.less | 55 ++++++++++++-----
src/books/lifeCare/view/chapter007.vue | 85 +++++++++++++++++++++++++---
3 files changed, 139 insertions(+), 29 deletions(-)
diff --git a/src/books/lifeCare/css/default.less b/src/books/lifeCare/css/default.less
index 6e165c4..9b068d6 100644
--- a/src/books/lifeCare/css/default.less
+++ b/src/books/lifeCare/css/default.less
@@ -11,7 +11,8 @@
border-color: #f49a4c;
height: 100%;
- .swiper-button-prev, .swiper-button-next {
+ .swiper-button-prev,
+ .swiper-button-next {
color: #F49A4C;
}
@@ -28,8 +29,8 @@
max-width: 653px;
min-height: 100px;
}
-
- .coverImg{
+
+ .coverImg {
position: absolute;
top: 0;
left: 0;
@@ -68,7 +69,7 @@
.drawflow-node {
background-color: #fff;
- border:0px solid #f49a4c;
+ border: 0px solid #f49a4c;
box-shadow: 1px 1px 5px 0 #f49a4c;
.contentWall {
@@ -326,7 +327,7 @@
}
}
-
+
}
.textareaInput {
@@ -454,9 +455,40 @@
}
}
+ .btnUpload-list {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 35px;
+ height: 30px;
+ border-radius: 5px;
+ background-color: #f49a4c;
+ border: 1px solid #f49a4c;
+ cursor: pointer;
+
+ svg {
+ fill: #fff;
+ }
+ }
+
+ .btnUpload-list:hover {
+ background-color: #fff;
+
+ svg {
+ fill: #F49A4C;
+ }
+ }
+
+ .pic-wall {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ }
+
.bk-inputUpload {
width: 100%;
- height: 200px;
+ display: block;
+ min-height: 100px;
input {
width: 250px;
@@ -472,17 +504,6 @@
justify-content: center;
align-items: center;
font-size: 50px;
- cursor: pointer;
- }
-
- .btnUpload-list {
- width: 40px;
- height: 40px;
- border: 2px dashed #f49a4c;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 40px;
cursor: pointer;
}
}
diff --git a/src/books/lifeCare/view/chapter005.vue b/src/books/lifeCare/view/chapter005.vue
index ad7a97a..812bcc1 100644
--- a/src/books/lifeCare/view/chapter005.vue
+++ b/src/books/lifeCare/view/chapter005.vue
@@ -383,7 +383,30 @@
</div>
<p><br /></p>
<p>3.灏忕粍璁ㄨ鍒嗘瀽鍚勪綅鎴愬憳鐨勪竴鏃ラ璋憋紝璇勫嚭鏈�浣充竴鏃ラ璋便��</p>
- <p>锛�1锛夎鐢ㄥ浘鐗囧舰寮忓憟鐜帮紝骞惰创鍦ㄤ笅闈€��</p>
+ <p class="pic-wall">锛�1锛夎鐢ㄥ浘鐗囧舰寮忓憟鐜帮紝骞惰创鍦ㄤ笅闈€��<span class="btnUpload-list" @click="handFile('fileTwo')">
+ <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">
<textarea
v-model="chapter005.textAreaItem.text7"
@@ -412,7 +435,6 @@
id="fileTwo"
@change="handUploadFile($event, '2')"
/>
- <span class="btnUpload-list" @click="handFile('fileTwo')">+</span>
</div>
</div>
</div>
@@ -3664,7 +3686,7 @@
});
},
handFile(str) {
- let dom = document.getElementById(str);
+ let dom = (this.container ? this.container : document).getElementById(str);
dom.click();
},
drawflowDataClick(val) {
diff --git a/src/books/lifeCare/view/chapter007.vue b/src/books/lifeCare/view/chapter007.vue
index 0d5ced2..ed6877b 100644
--- a/src/books/lifeCare/view/chapter007.vue
+++ b/src/books/lifeCare/view/chapter007.vue
@@ -557,7 +557,31 @@
@blur="onBlurChange('text12')"
></textarea>
</div>
- <p>3.瑙傚療骞舵敹闆嗗┐骞煎効鐨勭潯鐪犱俊鍙枫�傝嫢鏈夌収鐗囷紝鍙创鍦ㄤ笅闈€��</p>
+ <p class="pic-wall">
+ 3.瑙傚療骞舵敹闆嗗┐骞煎効鐨勭潯鐪犱俊鍙枫�傝嫢鏈夌収鐗囷紝鍙创鍦ㄤ笅闈€��
+ <span class="btnUpload-list" @click="handFile('fileTwo')">
+ <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">
<div
class="upload-list"
@@ -577,7 +601,6 @@
id="fileTwo"
@change="handUploadFile($event, '2')"
/>
- <span class="btnUpload-list" @click="handFile('fileTwo')">+</span>
</div>
</div>
<p>4.鏌ラ槄闃呰鎵嬪唽锛岀爺璁ㄥ強褰掔撼濠村辜鍎跨殑鐫＄湢淇″彿銆�</p>
@@ -1376,7 +1399,28 @@
id="fileOne"
@change="handUploadFile($event, 1)"
/>
- <span class="btnUpload" @click="handFile('fileOne')">+</span>
+ <span class="btnUpload" @click="handFile('fileOne')">
+ <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="200"
+ height="200"
+ >
+ <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>
</div>
<div
style="width: 100%; height: 100%"
@@ -1594,7 +1638,31 @@
</div>
</div>
<div class="bodystyle">
- <p>2.鎷嶆憚鎴栫粯鍒跺┐骞煎効鐨勫悇绉嶇潯濮裤��</p>
+ <p class="pic-wall">
+ 2.鎷嶆憚鎴栫粯鍒跺┐骞煎効鐨勫悇绉嶇潯濮裤��
+ <span class="btnUpload-list" @click="handFile('fileThree')">
+ <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">
<div
class="upload-list"
@@ -1614,9 +1682,6 @@
id="fileThree"
@change="handUploadFile($event, '3')"
/>
- <span class="btnUpload-list" @click="handFile('fileThree')"
- >+</span
- >
</div>
</div>
<div class="bk-qjms">
@@ -2841,7 +2906,7 @@
localStorage.setItem("chapter007", JSON.stringify(this.chapter007));
},
showSwdt() {
- this.$emit('eventSwdt','swdt')
+ this.$emit("eventSwdt", "swdt");
},
handUploadFile(e, type) {
var that = this;
@@ -2880,7 +2945,9 @@
});
},
handFile(str) {
- let dom = (document).getElementById(str);
+ let dom = (this.container ? this.container : document).getElementById(
+ str
+ );
dom.click();
},
},
--
Gitblit v1.9.1