From 558de7a1274017280509a14866c8b6d1d46286a2 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期三, 19 六月 2024 10:08:11 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
.env.product | 4
src/books/English/view/components/chapter001.vue | 17
src/books/artAndDance/assets/images/06.gif | 0
src/books/artAndDance/view/components/chapter003.vue | 2
src/books/lifeCare/view/components/index.vue | 20
src/books/lifeCare/css/default.less | 12
src/books/artAndDance/assets/images/01-2.gif | 0
src/books/artAndDance/assets/main.less | 25 ++
src/books/lifeCare/view/components/front001.vue | 4
src/books/sportsAndHealth/view/components/text.html | 20 +
src/books/mathBook/view/components/chapter001.vue | 29 ++
src/books/sportsAndHealth/view/components/chapter001.vue | 62 ++++
src/books/sportsAndHealth/view/components/front001.vue | 2
src/books/artAndDance/assets/images/08.gif | 0
src/books/artAndDance/assets/images/07.gif | 0
src/books/sportsAndHealth/view/components/testDynaicTable.vue | 16
src/components/examinations/index.vue | 6
src/books/sportsAndHealth/image/li-tip.png | 0
src/books/sportsAndHealth/css/default.less | 257 +++++++++++++++++----
src/components/pdfview/index.vue | 37 +-
src/books/sportsAndHealth/view/components/testPp.vue | 16
src/books/sportsAndHealth/view/components/index.vue | 20
src/books/mathBook/assets/main.less | 23 +
src/components/matching/matching.vue | 142 +++++++----
src/App.vue | 2
25 files changed, 524 insertions(+), 192 deletions(-)
diff --git a/.env.product b/.env.product
index eb40f51..76a6d12 100644
--- a/.env.product
+++ b/.env.product
@@ -1,6 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/childHealth'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
-VUE_APP_BOOK_ID = 'childHealth'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'mathBook'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 77be6ac..ef3b19b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "artAndDrama")
+ : "english")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index 34edb72..109862d 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -527,7 +527,7 @@
<li>Speakers銆�Chinese Cultural Symbols</li>
<li style="width: 40%; text-align: center">Descriptions</li>
</ul>
- <matching :rawData="rawData" :item="question"></matching>
+ <matching :rawData="rawData" :question="question"></matching>
</div>
<h3 id="c003" class="fl al-cn">
<span class="bjh3">Reading</span>
@@ -826,15 +826,19 @@
</p>
<div class="bkbj">
<p>
- <i>making you feel more active and healthy</i> foodie /藞fu藧di/
- <i>n.</i> 鍚冭揣锛涚編椋熷
+ <i>making you feel more active and healthy</i>
</p>
</div>
- <p>
- <i
+ <p>foodie /藞fu藧di/<i>n.</i> 鍚冭揣锛涚編椋熷</p>
+ <div class="bkbj">
+ <p>
+ <i
>a person who is very interested in cooking and eating different
kinds of food</i
>
+ </p>
+ </div>
+ <p>
unique /ju<i>藞</i>ni藧k/ <i>adj.</i> 鍞竴鐨勶紱鐙竴鏃犱簩鐨�
</p>
<div class="bkbj">
@@ -2564,7 +2568,7 @@
"online shopping",
"facial recognition",
"electronic payment",
- "intercity train",
+ "intercity train",
"shared bike",
"take-away service",
],
@@ -2735,6 +2739,7 @@
item.value == item.answer
? (item.isRight = true)
: (item.isRight = false);
+ console.log(item.value,item.answer);
}
}
this.dropdownData = dropdownDatas;
diff --git a/src/books/artAndDance/assets/images/01-2.gif b/src/books/artAndDance/assets/images/01-2.gif
index ba833ea..6750fe1 100644
--- a/src/books/artAndDance/assets/images/01-2.gif
+++ b/src/books/artAndDance/assets/images/01-2.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/06.gif b/src/books/artAndDance/assets/images/06.gif
index d898022..4f4f37c 100644
--- a/src/books/artAndDance/assets/images/06.gif
+++ b/src/books/artAndDance/assets/images/06.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/07.gif b/src/books/artAndDance/assets/images/07.gif
index b1ea008..4dcef17 100644
--- a/src/books/artAndDance/assets/images/07.gif
+++ b/src/books/artAndDance/assets/images/07.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/images/08.gif b/src/books/artAndDance/assets/images/08.gif
index e1d2936..1c31550 100644
--- a/src/books/artAndDance/assets/images/08.gif
+++ b/src/books/artAndDance/assets/images/08.gif
Binary files differ
diff --git a/src/books/artAndDance/assets/main.less b/src/books/artAndDance/assets/main.less
index b437c3d..6b92359 100644
--- a/src/books/artAndDance/assets/main.less
+++ b/src/books/artAndDance/assets/main.less
@@ -476,4 +476,27 @@
}
}
}
-}
\ No newline at end of file
+}
+
+
+::-webkit-scrollbar {
+ width: 8px;
+ height: 10px;
+}
+
+::-webkit-scrollbar-track-piece {
+ background-color: rgba(0, 0, 0, 0.1);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:vertical {
+ height: 5px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:horizontal {
+ width: 5px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
+}
diff --git a/src/books/artAndDance/view/components/chapter003.vue b/src/books/artAndDance/view/components/chapter003.vue
index 875a4de..85aa071 100644
--- a/src/books/artAndDance/view/components/chapter003.vue
+++ b/src/books/artAndDance/view/components/chapter003.vue
@@ -3,7 +3,7 @@
<div class="page-box" page="12">
<div v-if="showPageList.indexOf(12) > -1">
<img class="img-0" alt="" src="../../assets/images/dy3.jpg" />
- <img src="../../assets/images/07.gif" alt="" style="width: 56%;" class="cover-gif">
+ <img src="../../assets/images/07.gif" alt="" style="width: 54%;" class="cover-gif">
</div>
</div>
<div class="page-box" page="13">
diff --git a/src/books/lifeCare/css/default.less b/src/books/lifeCare/css/default.less
index 6361597..6f520ea 100644
--- a/src/books/lifeCare/css/default.less
+++ b/src/books/lifeCare/css/default.less
@@ -1906,10 +1906,10 @@
@media screen and (max-width: 800px) {
.coverImg {
- img {
- height: 100%;
- }
+ img {
+ height: 100%;
}
+ }
.chapter {
@@ -1922,7 +1922,7 @@
width: 100% !important;
position: absolute;
left: 0%;
- top: 4%;
+ top: 3%;
}
.pdf-content {
@@ -2036,6 +2036,10 @@
.page-box {
min-height: 800px !important;
}
+
+ .table111 tr th ,.table112 tr th {
+ padding: 8px 0;
+ }
}
}
diff --git a/src/books/lifeCare/view/components/front001.vue b/src/books/lifeCare/view/components/front001.vue
index 637fe44..8788112 100644
--- a/src/books/lifeCare/view/components/front001.vue
+++ b/src/books/lifeCare/view/components/front001.vue
@@ -127,7 +127,7 @@
<div class="pageHeader-first">
<div class="header-bj"></div>
<div class="content">
- <div class="pageStr"> </div>
+ <div class="pageStr"> </div>
<div class="title">
<img src="../../image/chapter.png" alt="" />
<span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ疯鍔ㄦ墜鍐�</span>
@@ -194,7 +194,7 @@
<div class="pageHeader-first">
<div class="header-bj"></div>
<div class="content">
- <div class="pageStr"> </div>
+ <div class="pageStr"> </div>
<div class="title">
<img src="../../image/chapter.png" alt="" />
<span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ疯鍔ㄦ墜鍐�</span>
diff --git a/src/books/lifeCare/view/components/index.vue b/src/books/lifeCare/view/components/index.vue
index 4d4b4a4..468620c 100644
--- a/src/books/lifeCare/view/components/index.vue
+++ b/src/books/lifeCare/view/components/index.vue
@@ -727,23 +727,23 @@
autoplay: {
//鑷姩寮�濮�
delay: 3000, //鏃堕棿闂撮殧
- disableOnInteraction: false, //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
+ disableOnInteraction: false //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
},
paginationClickable: true,
slidesPerView: 1, // 涓�缁勪笁涓�
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
- observeParents: true,
+ observeParents: true
// // 濡傛灉闇�瑕佸垎椤靛櫒
// pagination: {
// el: (this.container ? this.container : document).querySelector(
@@ -766,12 +766,12 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
@@ -790,8 +790,8 @@
var paginationInfoEl = dom.querySelector(".pageBox");
if (paginationInfoEl)
paginationInfoEl.textContent = currentPage + "/" + totalPages;
- },
- },
+ }
+ }
});
}
},
diff --git a/src/books/mathBook/assets/main.less b/src/books/mathBook/assets/main.less
index b390996..4fc2485 100644
--- a/src/books/mathBook/assets/main.less
+++ b/src/books/mathBook/assets/main.less
@@ -841,3 +841,26 @@
}
}
}
+
+
+::-webkit-scrollbar {
+ width: 8px;
+ height: 10px;
+}
+
+::-webkit-scrollbar-track-piece {
+ background-color: rgba(0, 0, 0, 0.1);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:vertical {
+ height: 5px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:horizontal {
+ width: 5px;
+ background-color: rgba(125, 125, 125, 0.3);
+ -webkit-border-radius: 6px;
+}
\ No newline at end of file
diff --git a/src/books/mathBook/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
index f0c2321..55f50d7 100644
--- a/src/books/mathBook/view/components/chapter001.vue
+++ b/src/books/mathBook/view/components/chapter001.vue
@@ -565,6 +565,7 @@
<div class="bj">
<examinations
:cardList="questionData"
+ :hideCollect="true"
inputBc="#d3edfa"
v-if="questionData"
:isReal="false"
@@ -576,11 +577,37 @@
<!-- 鍑芥暟鎺т欢寮圭獥 -->
<el-dialog
- title=""
:visible.sync="dialogVisible"
width="60%"
:append-to-body="true"
+ :show-close="false"
>
+ <div slot="title" style="padding: 0 0 15px 0;position: relative;">
+ <svg
+ style="position: absolute; right:10px;cursor: pointer;"
+ @click="dialogVisible = false"
+ t="1718596022986"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="4252"
+ width="20"
+ height="20"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ >
+ <path
+ d="M176.661601 817.172881C168.472798 825.644055 168.701706 839.149636 177.172881 847.338438 185.644056 855.527241 199.149636 855.298332 207.338438 846.827157L826.005105 206.827157C834.193907 198.355983 833.964998 184.850403 825.493824 176.661601 817.02265 168.472798 803.517069 168.701706 795.328267 177.172881L176.661601 817.172881Z"
+ fill="#979797"
+ p-id="4253"
+ ></path>
+ <path
+ d="M795.328267 846.827157C803.517069 855.298332 817.02265 855.527241 825.493824 847.338438 833.964998 839.149636 834.193907 825.644055 826.005105 817.172881L207.338438 177.172881C199.149636 168.701706 185.644056 168.472798 177.172881 176.661601 168.701706 184.850403 168.472798 198.355983 176.661601 206.827157L795.328267 846.827157Z"
+ fill="#979797"
+ p-id="4254"
+ ></path>
+ </svg>
+ </div>
<iframe
src="https://www.geogebra.org/calculator"
frameborder="0"
diff --git a/src/books/sportsAndHealth/css/default.less b/src/books/sportsAndHealth/css/default.less
index 1bcee05..61eedbb 100644
--- a/src/books/sportsAndHealth/css/default.less
+++ b/src/books/sportsAndHealth/css/default.less
@@ -44,25 +44,29 @@
box-sizing: border-box;
}
- .bodystyle-chapter001 {
+ .gif-Con {
+ max-width: 200px;
+ }
+
+ .bodystyle-chapter {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
position: relative;
- .bj-chapter001-bj-icon {
+ .bj-chapter-bj-icon {
width: 100%;
padding-top: 15px;
}
- .bj-chapter001-con {
+ .bj-chapter-con {
width: 60%;
position: absolute;
left: 0;
top: 5%;
- .bj-chapter001-con-icon {
+ .bj-chapter-con-icon {
width: 100%;
img {
@@ -70,6 +74,74 @@
width: 100%;
}
}
+ }
+ }
+
+ .header-odd {
+ width: 100%;
+ height: 100px;
+ display: flex;
+ justify-content: flex-end;
+ align-items: flex-end;
+
+ span {
+ margin-right: 28px;
+ font-family: 'FZLTXIHJW';
+ font-size: 18px;
+ }
+ span:nth-child(3) {
+ margin-right: 0;
+ }
+
+ .mk {
+ color: #f39938;
+ font-weight: 700;
+ }
+
+ .sub {
+ color: #808285;
+ font-weight: 600;
+ }
+
+ .sub-title {
+ color: #a8a9ad;
+ }
+
+ .sub-page {
+ color: #a8a9ad;
+ }
+ }
+
+ .line-page {
+ width: 1px;
+ height: 100%;
+ border-left: 2px dotted #eee;
+ margin:0 14px;
+ }
+
+ .header-even {
+ width: 100%;
+ height: 100px;
+ display: flex;
+ justify-content: flex-start;
+ align-items: flex-end;
+ span {
+ margin-left: 28px;
+ font-family: 'FZLTXIHJW';
+ font-size: 18px;
+ }
+
+ .sub-page {
+ color: #a8a9ad;
+ }
+
+ .book-title {
+ color: #f39938;
+ font-weight: 700;
+ }
+
+ span:nth-child(3){
+ margin-left: 0;
}
}
@@ -274,6 +346,10 @@
}
}
+ .textHeader {
+ min-height: 1150px;
+ }
+
.bj-img {
position: absolute;
left: 0;
@@ -286,18 +362,20 @@
background-repeat: no-repeat;
display: flex;
justify-content: flex-start;
+ }
- .bj-empyt-chapter01 {
- width: 40%;
- height: 100%;
- }
+ .bj-empyt-chapter {
+ width: 40%;
+ height: 100%;
+ margin-right: 5%;
+ }
- .bj-text01 {
- width: 60%;
- height: 50%;
- padding-top: 60%;
- padding-right: 10%;
- }
+ .bj-text {
+ padding-top: 60%;
+ padding-right: 10%;
+ float: right;
+ height: auto;
+ width: 100%;
}
.bj-img02 {
@@ -312,18 +390,6 @@
background-repeat: no-repeat;
display: flex;
justify-content: flex-start;
-
- .bj-empyt-chapter02 {
- width: 40%;
- height: 100%;
- }
-
- .bj-text02 {
- width: 60%;
- height: 50%;
- padding-top: 60%;
- padding-right: 10%;
- }
}
.bj-img03 {
@@ -338,18 +404,6 @@
background-repeat: no-repeat;
display: flex;
justify-content: flex-start;
-
- .bj-empyt-chapter03 {
- width: 40%;
- height: 100%;
- }
-
- .bj-text03 {
- width: 60%;
- height: 50%;
- padding-top: 50%;
- padding-right: 10%;
- }
}
.bj-byb {
@@ -746,7 +800,7 @@
font-family: "瀹嬩綋";
font-size: 18px;
text-align: justify;
- padding: 10% 10%;
+ padding: 6% 10% 10% 10%;
box-sizing: border-box;
line-height: 30px;
}
@@ -1683,22 +1737,19 @@
.pdf-wall {
max-width: 180px;
position: relative;
- left: 30px;
- top: 25px;
- border: 2px dotted #5d78bb;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
- border: 2px dotted #5d78bb;
padding: 10px;
box-sizing: border-box;
border-radius: 10px;
+ top: 0 !important;
.pdf-item {
display: flex;
flex-direction: column;
- justify-content: flex-start;
+ justify-content: center;
align-items: center;
img {
@@ -1706,7 +1757,6 @@
}
span {
- min-width: 150px;
font-size: 14px;
text-align: center;
font-family: 'FZLTXIHJW';
@@ -1736,15 +1786,52 @@
justify-content: center;
flex-wrap: wrap;
}
+
+
+ .bj-img {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 50%;
+ }
+
+ .bj-img02 {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 50%;
+ }
+
+ .bj-img02 {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 50%;
+ }
+
+ .bj-empyt-chapter {
+ height: 50%;
+ }
+
+ .bj-text {
+ width: 100%;
+ padding-top: 0%;
+ padding: 0 10%;
+ box-sizing: border-box;
+ }
+
+ .tablePublic table tr th{
+ padding: 0;
+ width: auto !important;
+ }
+
+ div.bk-xyx {
+ padding: 2.5em 1.2em;
+ }
}
}
@media screen and (max-width:700px) {
- // .coverImg {
- // img {
- // height: 100%;
- // }
- // }
.chapter {
@@ -1755,6 +1842,20 @@
.page-box {
min-height: 800px !important;
}
+
+ .img-float {
+ width: 130px;
+ }
+
+ .bodystyle-chapter {
+ flex-direction: column;
+
+ .bj-chapter-con {
+ width: auto;
+ position: relative;
+ }
+ }
+
}
}
@@ -1769,6 +1870,60 @@
.page-box {
min-height: 500px !important;
margin-bottom: 20px;
+ }
+
+ .bj-img {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 30%;
+ }
+
+ .bj-img02 {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 30%;
+ }
+
+ .bj-img03 {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ background-size: 100% 20%;
+
+ .bj-text {
+ width: 100%;
+ padding-top: 0%;
+ padding: 35% 10% 0 10% !important;
+ box-sizing: border-box;
+
+ p {
+ line-height: 28px;
+ }
+ }
+ }
+
+ .pdf-text {
+ .pdf-con {
+ flex-direction: column;
+
+ .pdf-view {
+ margin-bottom: 10px;
+ }
+ }
+ }
+
+
+ .bj-empyt-chapter {
+ height: 30%;
+ }
+
+ .bj-text {
+ width: 100%;
+ padding-top: 0%;
+ padding: 0 10%;
+ box-sizing: border-box;
}
}
}
@@ -1796,6 +1951,8 @@
.custom-dialog {
+ overflow: hidden !important;
+
.el-dialog__body {
padding: 0;
}
diff --git a/src/books/sportsAndHealth/image/li-tip.png b/src/books/sportsAndHealth/image/li-tip.png
index 6adc57b..900fafb 100644
--- a/src/books/sportsAndHealth/image/li-tip.png
+++ b/src/books/sportsAndHealth/image/li-tip.png
Binary files differ
diff --git a/src/books/sportsAndHealth/view/components/chapter001.vue b/src/books/sportsAndHealth/view/components/chapter001.vue
index be51e21..7268d6f 100644
--- a/src/books/sportsAndHealth/view/components/chapter001.vue
+++ b/src/books/sportsAndHealth/view/components/chapter001.vue
@@ -3,13 +3,13 @@
<div class="page-box" page="12">
<div v-if="showPageList.indexOf(12) > -1">
<div class="bodystyle">
- <div class="bodystyle-chapter001">
- <div class="bj-chapter001-bj-icon">
+ <div class="bodystyle-chapter">
+ <div class="bj-chapter-bj-icon">
<h1 class="lefth1" id="a007">
<img class="img-gh1" alt="" src="../../image/jcmk.png" />
</h1>
</div>
- <div class="bj-chapter001-con">
+ <div class="bj-chapter-con">
<div>
<p>
鍩虹妯″潡鏄�婁腑绛夎亴涓氬鏍′綋鑲蹭笌鍋ュ悍璇剧▼鏍囧噯銆嬭瀹氱殑蹇呬慨鍐呭锛屽寘鍚仴搴锋暀鑲插拰浣撹兘鍙戝睍涓ゅぇ閮ㄥ垎銆備汉姘戝仴搴锋槸姘戞棌鏄岀洓鍜屽浗瀹跺己鐩涚殑閲嶈鏍囧織锛涙妸淇濋殰浜烘皯鍋ュ悍鏀惧湪浼樺厛鍙戝睍鐨勬垬鐣ヤ綅缃�傚仴搴锋暀鑲茬撼鍏ュ浗姘戞暀鑲蹭綋绯伙紝鏄暀鑲查樁娈电礌璐ㄦ暀鑲茬殑閲嶈鍐呭锛屼篃鏄煿鍏诲痉鏅轰綋缇庡姵鍏ㄩ潰鍙戝睍鐨勭ぞ浼氫富涔夊缓璁捐�呭拰鎺ョ彮浜虹殑蹇呰淇濋殰銆傝壇濂界殑浣撹兘涓嶄粎鑳藉涓烘棩甯哥敓娲讳腑鐨勮繍鍔ㄥ瀹氬潥瀹炵殑鍩虹锛岃�屼笖鑳戒负涓撻」杩愬姩涓簿鍑嗚�岀伒娲诲湴鍙戞尌鎶�鑳芥按骞虫彁渚涗繚闅滐紝鏇磋兘涓烘垜浠湪鑱屼笟宀椾綅涓婂睍鐜伴珮瓒呮妧鑹烘彁渚涘姪鍔涖��
@@ -18,7 +18,7 @@
绯荤粺瀛︿範鈥滃仴搴锋暀鑲测�濆拰鈥滀綋鑳藉彂灞曗�濅袱涓崟鍏冪殑鍐呭锛岃兘澶熷府鍔╁悓瀛︿滑鏇村ソ鍦板皢鍋ュ悍鎺屾彙鍦ㄨ嚜宸辨墜涓紝鎻愬崌浣撹兘鍙戝睍姘村钩锛岀粌灏卞己鍋ヤ綋榄勶紝浣块敾鐐艰韩浣撴垚涓轰竴绉嶄範鎯拰鑳藉姏銆�
</p>
</div>
- <div class="bj-chapter001-con-icon">
+ <div class="bj-chapter-con-icon">
<img src="../../image/sports02.png" alt="" />
</div>
</div>
@@ -28,10 +28,10 @@
</div>
<div class="page-box" page="13">
<div v-if="showPageList.indexOf(13) > -1">
- <div class="bodystyle">
+ <div class="bodystyle textHeader">
<div class="bj-img">
- <div class="bj-empyt-chapter01"></div>
- <div class="bj-text01">
+ <div class="bj-empyt-chapter"></div>
+ <div class="bj-text">
<p>
鍋ュ悍涓庤澶氬洜绱犳湁鍏筹紝涓嶄粎娑夊強韬綋锛岃繕娑夊強蹇冪悊銆佺ぞ浼氶�傚簲绛夋柟闈€�傚仴搴锋槸浜轰滑鎵�杩芥眰鐨勭洰鏍囷紝楂樿川閲忕殑鐢熷懡绂讳笉寮�鍋ュ悍锛屽垢绂忕殑浜虹敓涔熺涓嶅紑鍋ュ悍銆傚杩涙皯鐢熺绁夈�佹彁楂樹汉姘戠敓娲诲搧璐ㄧ殑閲嶈涓炬帾鍦ㄤ簬鎺ㄨ繘鍋ュ悍涓浗寤鸿銆傜敓鍛姐�佸仴搴峰拰骞哥涓夎�呯殑鏍稿績鏄仴搴枫�傚浣曟嫢鏈夊仴搴凤紝淇濇寔鍋ュ悍鐨勭姸鎬侊紵涓烘锛屽悓瀛︿滑闇�瑕佹爲绔嬧�滃仴搴风涓�鈥濈殑鐞嗗康锛涢渶瑕佺粨鍚堢幇闃舵鐢熺悊銆佸績鐞嗙瓑鍙戝睍鐗圭偣锛屼互鍙婅繍鍔ㄧ殑鈥滃弻鍒冨墤鈥濈壒鐐癸紝鎶婃彙淇冭繘鍋ュ悍鐨勮寰嬶紱闇�瑕佺粨鍚堟湭鏉ユ墍浠庝簨鑱屼笟鐨勭壒鐐癸紝褰㈡垚棰勯槻鍚勭鑱屼笟鐥呯殑鑳藉姏锛涢渶瑕佹帉鎻＄揣鎬ユ晳鎶ゅ拰瀹夊叏閬块櫓鐨勭煡璇嗕笌鎶�鑳斤紝淇濇姢鑷韩鐨勭敓鍛藉畨鍏紱鏇磋濉戦�犱綋鑲茬簿绁烇紝鍔╁姏鎴愬氨浜虹敓鐨勬ⅵ鎯筹紝鍔涙眰涓虹鍥藉仴搴峰伐浣滀簲鍗佸勾锛屽垢绂忕敓娲讳竴杈堝瓙銆�
</p>
@@ -45,6 +45,13 @@
</div>
<div class="page-box" page="14">
<div v-if="showPageList.indexOf(14) > -1">
+ <div class="header-odd">
+ <span class="mk">鍩虹妯″潡</span>
+ <span class="sub">绗竴鍗曞厓</span>
+ <span class="sub-title">鍋ュ悍鏁欒偛</span>
+ <div class="line-page"></div>
+ <span class="sub-page">003</span>
+ </div>
<div class="bodystyle">
<h3 id="c001">涓撻涓� 鏍戠珛鈥滃仴搴风涓�鈥濈殑鐞嗗康</h3>
<div class="bk-ztgs">
@@ -483,6 +490,11 @@
</div>
<div class="page-box" page="15">
<div v-if="showPageList.indexOf(15) > -1">
+ <div class="header-even">
+ <span class="sub-page">004</span>
+ <div class="line-page"></div>
+ <span class="book-title">浣撹偛涓庡仴搴�</span>
+ </div>
<div class="bodystyle">
<div class="img-float openImgBox">
<img class="img-c" alt="" src="../../image/0017-1.jpg" />
@@ -858,6 +870,13 @@
</div>
<div class="page-box" page="16">
<div v-if="showPageList.indexOf(16) > -1">
+ <div class="header-odd">
+ <span class="mk">鍩虹妯″潡</span>
+ <span class="sub">绗竴鍗曞厓</span>
+ <span class="sub-title">鍋ュ悍鏁欒偛</span>
+ <div class="line-page"></div>
+ <span class="sub-page">005</span>
+ </div>
<div class="bodystyle">
<p>
锛堝鍚勫櫒瀹樼殑鍔熻兘鐘舵�併�佹満浣撶殑鍏嶇柅鑳藉姏锛夌瓑銆傜敓鐗╅仐浼犲洜绱犵洿鎺ュ叧绯荤潃鎴戜滑鐨勫仴搴凤紝瀵硅澶氱柧鐥呯殑鍙戠敓銆佸彂灞曞強鍒嗗竷鍏锋湁閲嶈褰卞搷銆傝櫧鐒堕仐浼犲洜绱犳棤娉曟敼鍙橈紝浣嗘槸蹇冪悊鍥犵礌鍏锋湁鍙鎬с�備繚鎸佺Н鏋佺殑蹇冪悊鐘舵�佹槸缁存寔鍜屽杩涘仴搴风殑蹇呰鏉′欢銆�
@@ -2283,6 +2302,11 @@
</div>
<div class="page-box" page="17">
<div v-if="showPageList.indexOf(17) > -1">
+ <div class="header-even">
+ <span class="sub-page">006</span>
+ <div class="line-page"></div>
+ <span class="book-title">浣撹偛涓庡仴搴�</span>
+ </div>
<div class="bodystyle">
<div class="bk-xspj">
<p class="bj-sbx">瀛︿範璇勪环</p>
@@ -2375,6 +2399,13 @@
</div>
<div class="page-box" page="18">
<div v-if="showPageList.indexOf(18) > -1">
+ <div class="header-odd">
+ <span class="mk">鍩虹妯″潡</span>
+ <span class="sub">绗竴鍗曞厓</span>
+ <span class="sub-title">鍋ュ悍鏁欒偛</span>
+ <div class="line-page"></div>
+ <span class="sub-page">007</span>
+ </div>
<div class="bodystyle">
<h4 id="d006">浜屻�佷腑鑱屽鐢熺殑鍋ュ悍鐢熸椿鏂瑰紡</h4>
<p>瀵瑰悓瀛︿滑鏉ヨ锛屽仴搴风敓娲绘柟寮忓叿浣撹〃鐜板湪濡備笅鍑犱釜鏂归潰銆�</p>
@@ -2410,6 +2441,11 @@
</div>
<div class="page-box" page="19">
<div v-if="showPageList.indexOf(19) > -1">
+ <div class="header-even">
+ <span class="sub-page">008</span>
+ <div class="line-page"></div>
+ <span class="book-title">浣撹偛涓庡仴搴�</span>
+ </div>
<div class="bodystyle">
<p>
绫诲強鍚堢悊鏁伴噺銆侀�傚疁鐨勮韩浣撴椿鍔ㄩ噺鍙婇ギ姘撮噺鍙傝�冿紝骞朵互鑶抽瀹濆鐨勫舰寮忕洿瑙傚睍鐜帮紝鏄垜浠棩甯搁ギ椋熷簲閬靛畧鐨勫熀鏈噯鍒欙紙瑙佸浘1-2-1锛夈��
@@ -2658,6 +2694,13 @@
</div>
<div class="page-box" page="20">
<div v-if="showPageList.indexOf(20) > -1">
+ <div class="header-odd">
+ <span class="mk">鍩虹妯″潡</span>
+ <span class="sub">绗竴鍗曞厓</span>
+ <span class="sub-title">鍋ュ悍鏁欒偛</span>
+ <div class="line-page"></div>
+ <span class="sub-page">009</span>
+ </div>
<div class="bodystyle">
<h5 id="e009">锛堜簲锛夊煿鍏昏壇濂界殑鍏磋叮鐖卞ソ锛岃繙绂诲拰鎴掗櫎闄嬩範</h5>
<p>
@@ -3111,6 +3154,11 @@
</div>
<div class="page-box" page="21">
<div v-if="showPageList.indexOf(21) > -1">
+ <div class="header-even">
+ <span class="sub-page">010</span>
+ <div class="line-page"></div>
+ <span class="book-title">浣撹偛涓庡仴搴�</span>
+ </div>
<div class="bodystyle">
<div class="bk-xspj">
<p class="bj-sbx">瀛︿範璇勪环</p>
diff --git a/src/books/sportsAndHealth/view/components/front001.vue b/src/books/sportsAndHealth/view/components/front001.vue
index 4fb7022..db85d08 100644
--- a/src/books/sportsAndHealth/view/components/front001.vue
+++ b/src/books/sportsAndHealth/view/components/front001.vue
@@ -194,7 +194,7 @@
<p class="block">
鏈暀鏉愪弗鏍间緷鎹�婁腑绛夎亴涓氬鏍′綋鑲蹭笌鍋ュ悍璇剧▼鏍囧噯銆嬬紪鍐欙紝鍏卞垎涓�9涓崟鍏冦�備负浜嗚姣忎釜鍗曞厓鐨勪笓棰樻垨椤圭洰鐨勫涔犲舰寮忔洿鍔犱赴瀵岋紝鍒囧疄钀藉疄绔嬪痉鏍戜汉銆佷互浣撹偛浜猴紝鏈暀鏉愬湪閬典粠鈥滃鈥旂粌鈥旇禌鈥旇瘎鈥濆涔犳鏋剁殑鍓嶆彁涓嬶紝澧炶浜嗕竴浜涘惎鍙戝鐢熸�濊�冦�佸紩棰嗗鐢熺粌涔犮�佷績杩涘笀鐢熶簰鍔ㄧ殑灏忔爮鐩�傚悇鏍忕洰鍏蜂綋璇存槑濡備笅銆�
</p>
- <p class="center">
+ <p class="center openImgBox">
<img class="img-0" alt="" src="../../image/0010-1.jpg" />
</p>
<p>
diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue
index 1629e9a..155b932 100644
--- a/src/books/sportsAndHealth/view/components/index.vue
+++ b/src/books/sportsAndHealth/view/components/index.vue
@@ -724,23 +724,23 @@
autoplay: {
//鑷姩寮�濮�
delay: 3000, //鏃堕棿闂撮殧
- disableOnInteraction: false, //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
+ disableOnInteraction: false //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
},
paginationClickable: true,
slidesPerView: 1, // 涓�缁勪笁涓�
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
- observeParents: true,
+ observeParents: true
// // 濡傛灉闇�瑕佸垎椤靛櫒
// pagination: {
// el: (this.container ? this.container : document).querySelector(
@@ -763,12 +763,12 @@
spaceBetween: 30, // 闂撮殧
// 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳
navigation: {
- nextEl: (this.container ? this.container : document).querySelector(
+ nextEl: dom.querySelector(
".swiper-button-next"
),
- prevEl: (this.container ? this.container : document).querySelector(
+ prevEl: dom.querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
@@ -787,8 +787,8 @@
var paginationInfoEl = dom.querySelector(".pageBox");
if (paginationInfoEl)
paginationInfoEl.textContent = currentPage + "/" + totalPages;
- },
- },
+ }
+ }
});
}
},
diff --git a/src/books/sportsAndHealth/view/components/testDynaicTable.vue b/src/books/sportsAndHealth/view/components/testDynaicTable.vue
index ec82452..130998f 100644
--- a/src/books/sportsAndHealth/view/components/testDynaicTable.vue
+++ b/src/books/sportsAndHealth/view/components/testDynaicTable.vue
@@ -2,10 +2,10 @@
<div class="chapter" num="2">
<div class="page-box" page="22">
<div v-if="showPageList.indexOf(22) > -1">
- <div class="bodystyle">
+ <div class="bodystyle textHeader">
<div class="bj-img02">
- <div class="bj-empyt-chapter02"></div>
- <div class="bj-text02">
+ <div class="bj-empyt-chapter"></div>
+ <div class="bj-text">
<p>
浣撹兘鏄績杩涘仴搴枫�佸姪鍔涙妧鑳芥帉鎻′笌鑱屼笟鍙戝睍鐨勫熀纭�銆備竴鑸綋鑳戒繚闅滄棩甯哥敓娲讳腑鍚屽浠殑鍩烘湰娲诲姩锛屼績杩涙満浣撳仴搴凤紱涓撻」浣撹兘涓轰笓椤硅繍鍔ㄧ殑瀛︿範鎻愪緵淇濋殰锛涜亴涓氫綋鑳戒负鐩稿簲鑱屼笟鍙戝睍鍙戞尌鍔╂帹浣滅敤锛屼粠鑰屾彁鍗囪亴涓氬彂灞曟按骞炽�傛湰鍗曞厓鑱氱劍涓�鑸綋鑳藉拰鑱屼笟浣撹兘鐨勫缁冿紝涓撻」浣撹兘鐩稿叧鍐呭鏀惧湪浜嗘嫇灞曟ā鍧楃殑鍚勪笓椤硅繍鍔ㄤ箣涓�備綋鑳介敾鐐艰璁茬┒绉戝鐨勬柟娉曪紝瑕佹湁绯荤粺鎬с�侀拡瀵规�с�備笉鍚岀殑浜烘湁涓嶄竴鏍风殑浣撹兘鍩虹銆備綋鑳戒竴鏂归潰鍙楅仐浼犲洜绱犲奖鍝嶏紝鍙︿竴鏂归潰瑕佷緷闈犲悗澶╅敾鐐笺�傛澶勪簬闈掓槬鏈熼樁娈电殑涓亴瀛︾敓锛岄渶瑕佺瀛︾簿鍑嗗湴閿荤偧浣撹兘銆佸己鍋ヤ綋榄勶紝涓哄皢鏉ユ墍浠庝簨鐨勮亴涓氬偍澶囬噸瑕佸姏閲忥紝涓虹鍥界殑寤鸿鍋氬嚭搴旀湁鐨勮础鐚��
</p>
@@ -40,10 +40,10 @@
<table>
<thead>
<tr>
- <th style="width: 70px">璁粌绫诲瀷</th>
- <th style="width: 70px">璁粌閮ㄤ綅</th>
- <th style="width: 70px">鍔ㄤ綔鍚嶇О</th>
- <th>鍔ㄤ綔绀轰緥</th>
+ <th>璁粌绫诲瀷</th>
+ <th>璁粌閮ㄤ綅</th>
+ <th>鍔ㄤ綔鍚嶇О</th>
+ <th style="max-width: 200px;">鍔ㄤ綔绀轰緥</th>
<th>棰戞</th>
</tr>
</thead>
@@ -55,7 +55,7 @@
<tr>
<td>绔欏Э T 瀛�</td>
<td class="gif-Con openImgBox">
- <img width="200px" src="../../image/gif/T-zi.gif" alt="" />
+ <img width="100%" src="../../image/gif/T-zi.gif" alt="" />
</td>
<td>
<span>娆℃暟锛�20 娆� </span><br /><span>缁勬暟锛�2 缁�</span
diff --git a/src/books/sportsAndHealth/view/components/testPp.vue b/src/books/sportsAndHealth/view/components/testPp.vue
index 634947f..d95e2f5 100644
--- a/src/books/sportsAndHealth/view/components/testPp.vue
+++ b/src/books/sportsAndHealth/view/components/testPp.vue
@@ -3,13 +3,13 @@
<div class="page-box" page="24">
<div v-if="showPageList.indexOf(24) > -1">
<div class="bodystyle">
- <div class="bodystyle-chapter001">
- <div class="bj-chapter001-bj-icon">
+ <div class="bodystyle-chapter">
+ <div class="bj-chapter-bj-icon">
<h1 class="lefth1" id="a007">
<img class="img-gh1" alt="" src="../../image/kzmk.png" />
</h1>
</div>
- <div class="bj-chapter001-con">
+ <div class="bj-chapter-con">
<div>
<p>
鏃犺鏄负浜嗙粓韬弬涓庝綋鑲查敾鐐硷紝杩樻槸涓轰簡鎻愬崌鑱屼笟鍙戝睍鎵�闇�鐨勮繍鍔ㄨ兘鍔涳紝姣忎釜鍚屽閮介渶瑕佸涔犲苟鐔熺粌鎺屾彙1锝�2椤硅繍鍔ㄦ妧鑳姐�傘�婁腑绛夎亴涓氬鏍′綋鑲蹭笌鍋ュ悍璇剧▼鏍囧噯銆嬩腑鐨勮繍鍔ㄩ」鐩寘鍚悆绫昏繍鍔ㄣ�佺敯寰勭被杩愬姩銆佷綋鎿嶇被杩愬姩銆佹鏈笌姘戞棌姘戦棿浼犵粺浣撹偛绫昏繍鍔ㄣ�佹按涓婄被杩愬姩銆佸啺闆被杩愬姩銆佹柊鍏翠綋鑲茬被杩愬姩涓冨ぇ绫汇�傛瘡涓�绫昏繍鍔ㄩ兘鏈夊叾鐙壒鐨勪环鍊煎拰鍏磋叮鐐癸紝鍚屽浠彲浠ヤ粠杩欎簺绫诲瀷鐨勮繍鍔ㄤ腑鑷富閫夋嫨鑷繁鍠滅埍鐨勩�侀�傚疁鐨勮繍鍔ㄣ�傚悓瀛︿滑鍦ㄥ叿浣撻�夊鏌愪竴椤硅繍鍔ㄧ殑鏃跺�欙紝鏈�濂借兘澶熸寜鐓р�滄兂瀛︺�佽兘瀛︺�佸浼氣�濈殑鏍囧噯鏉ョ患鍚堝垽瀹氥�傗�滄兂瀛︹�濇槸鎸囧鏌愰」杩愬姩鏈夊叴瓒ｏ紝鈥滆兘瀛︹�濇槸鎸囧叿澶囧缁冪殑鏉′欢锛屸�滃浼氣�濇槸涓�绉嶇粨鏋滆拷姹傘�傚缁冩帉鎻�1锝�2椤硅繍鍔ㄦ妧鑳斤紝杩欒兘澶熺湡姝ｅ湴涓虹粓韬綋鑲插強鑱屼笟鍙戝睍濂犲畾鍩虹銆�
@@ -18,7 +18,7 @@
甯屾湜鍚屽浠湪婊¤冻鍏磋叮鐖卞ソ涓庤繍鍔ㄩ渶姹傜殑鍩虹涓婏紝璁ょ湡瀛︾粌浣犱滑鑷富閫夋嫨鐨勬嫇灞曟ā鍧椾腑鐨勪笓椤硅繍鍔紝鑳藉叿澶囦竴瀹氱殑杩愬姩鐗归暱锛屽煿鍏诲嚭涓�瀹氱殑杩愬姩鑳藉姏锛屼负淇冭繘鍋ュ悍鍜岀粓韬弬涓庝綋鑲查敾鐐煎く瀹炴牴鍩恒��
</p>
</div>
- <div class="bj-chapter001-con-icon">
+ <div class="bj-chapter-con-icon">
<img src="../../image/sports02.png" alt="" />
</div>
</div>
@@ -28,10 +28,10 @@
</div>
<div class="page-box" page="25">
<div v-if="showPageList.indexOf(25) > -1">
- <div class="bodystyle">
+ <div class="bodystyle textHeader">
<div class="bj-img03">
- <div class="bj-empyt-chapter03"></div>
- <div class="bj-text03">
+ <div class="bj-empyt-chapter"></div>
+ <div class="bj-text">
<p>
绔炰簤鏄悆绫昏繍鍔ㄦ渶绐佸嚭鐨勭壒寰併�傛棤璁烘槸闆嗕綋鍚堜綔瀹屾垚鐨勬煇椤硅繍鍔紝杩樻槸鍗曟灙鍖归┈涓庡鎵嬩氦閿嬬殑鐞冪被椤圭洰锛岄兘鍏锋湁杈冨己鐨勭珵浜夋�с�傛澶栵紝闆嗕綋椤圭洰杩樿兘鍏呭垎鍩瑰吇鍚屽浠洟闃熷悎浣滅殑鎰忚瘑鍜岃兘鍔涖�傚洜姝わ紝涓亴瀛︾敓鏈夊繀瑕侀�夋嫨鏌愪簺鐞冪被杩愬姩杩涜瀛︿範锛屼互鎻愰珮鏈潵璧板悜绀句細鎵�闇�鐨勭珵浜変笌鍚堜綔鐨勬剰璇嗗拰鑳藉姏銆傛湰鍗曞厓鐞冪被杩愬姩涓缃簡瀛︽牎鏈�甯稿紑灞曠殑绡悆銆佽冻鐞冦�佹帓鐞冦�佺窘姣涚悆銆佷箳涔撶悆銆佺綉鐞冿紙淇楃О鈥滀笁澶х悆鈥濆拰鈥滀笁灏忕悆鈥濓級椤圭洰锛岃繖浜涢」鐩篃鏄ぇ澶氭暟鍚屽鐖卞銆佺埍缁冦�佺埍璧涚殑椤圭洰銆傜悆绫昏繍鍔ㄧ殑鍏磋叮鐐逛富瑕侀泦涓湪鈥滃緱鍒嗏�濅笂銆傛棤璁烘槸绡悆鐨勬姇绡緱鍒嗭紝杩樻槸瓒崇悆姣旇禌涓殑灏勯棬寰楀垎绛夛紝閮藉ぇ澶у惛寮曠潃姣旇禌瑙傜湅鑰呭拰姣旇禌鍙備笌鑰呯殑娉ㄦ剰鍔涖�傚湪鐞冪被杩愬姩涓紝鍚屽浠兘澶熶笉鏂綋楠岀悆鎶�鎻愰珮鐨勮幏寰楁劅锛屽湪姣旇禌杩囩▼涓緱鍒嗚幏鑳滅殑鎴愬氨鎰燂紝浠ュ強涓庡悓浼村悎浣滄垨涓庡鎵嬬珵浜夌殑鎰夋偊鎰熴�傚悓鏃讹紝鍚屽浠篃瑕佸浼氭帴鍙椾竴鏃舵瘮璧涘け鍒╁甫鏉ョ殑娌抚锛屾棦瑕佷韩鍙楁垚鍔燂紝涔熻鍧︾劧闈㈠澶卞埄銆�
</p>
@@ -1460,7 +1460,9 @@
<el-dialog
:visible.sync="dialogVisible"
width="60vw"
+ top="2vh"
append-to-body
+ lock-scroll
:show-close="false"
class="custom-dialog"
>
diff --git a/src/books/sportsAndHealth/view/components/text.html b/src/books/sportsAndHealth/view/components/text.html
index 51ffb83..e6d9482 100644
--- a/src/books/sportsAndHealth/view/components/text.html
+++ b/src/books/sportsAndHealth/view/components/text.html
@@ -3800,6 +3800,26 @@
+ <!-- 鍋舵暟椤� -->
+ <div class="header-even">
+ <span class="sub-page">004</span>
+ <div class="line-page"></div>
+ <span class="book-title">浣撹偛涓庡仴搴�</span>
+ </div>
+
+ <!-- 濂囨暟椤� -->
+ <div class="header-odd">
+ <span class="mk">鍩虹妯″潡</span>
+ <span class="sub">绗竴鍗曞厓</span>
+ <span class="sub-title">鍋ュ悍鏁欒偛</span>
+ <div class="line-page"></div>
+ <span class="sub-page">003</span>
+ </div>
+
+
+
+
+
diff --git a/src/components/examinations/index.vue b/src/components/examinations/index.vue
index f2bdffd..68fef34 100644
--- a/src/components/examinations/index.vue
+++ b/src/components/examinations/index.vue
@@ -92,7 +92,7 @@
v-cloak
></p>
</div>
- <img :src="value.isCollect ? isHeart : heart" alt="" class="collect-png" @click="handleCollect(nindex,index)" >
+ <img :src="value.isCollect ? isHeart : heart" alt="" class="collect-png" @click="handleCollect(nindex,index)" v-if="!(hideCollect && value.questionType == 'shortAnswer')" >
<!-- 鏀惰棌 -->
</div>
<div class="questionContent">
@@ -500,6 +500,10 @@
type: String,
default: "#fff",
},
+ hideCollect:{
+ type:Boolean,
+ default:false
+ }
},
data() {
return {
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index 15dd62d..f0d49c7 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -15,10 +15,9 @@
:key="index"
ref="left"
@mousedown="(e) => touchstart(e, item, index)"
- :style="{backgroundColor:primaryColor}"
- >
- {{ item.label.txt }}
- </div>
+ :style="{ backgroundColor: primaryColor }"
+ v-html="item.label.txt"
+ ></div>
</div>
<div class="answer-box">
<div
@@ -26,10 +25,9 @@
v-for="(item, index) in rightArr"
:key="index"
ref="right"
- :style="{backgroundColor:primaryColor}"
- >
- {{ item.label.txt }}
- </div>
+ :style="{ backgroundColor: primaryColor }"
+ v-html="item.label.txt"
+ ></div>
</div>
</div>
<canvas
@@ -48,17 +46,24 @@
<!-- 鎸夐挳 -->
<div class="btn-bottom">
<el-button @click="submitData">鎻愪氦</el-button>
- <el-button @click="saveData" :style="{borderColor:primaryColor}">淇濆瓨</el-button>
- <el-button @click="redo" >閲嶅仛</el-button>
- <el-button @click="handleAnswer" :style="{borderColor:primaryColor}">鏌ョ湅绛旀</el-button>
+ <el-button @click="saveData" :style="{ borderColor: primaryColor }"
+ >淇濆瓨</el-button
+ >
+ <el-button @click="redo">閲嶅仛</el-button>
+ <el-button @click="handleAnswer" :style="{ borderColor: primaryColor }"
+ >鏌ョ湅绛旀</el-button
+ >
</div>
<!-- 瑙ｆ瀽 -->
<ul class="show-answer" v-if="isShowAnswer">
- <li v-if="isRight !== null">绛旀缁撴灉锛�<span v-if="isRight" style="color: #83e089;">姝ｇ‘</span> <span v-if="isRight == false" style="color:#d81e06">閿欒</span></li>
+ <li v-if="isRight !== null">
+ 绛旀缁撴灉锛�<span v-if="isRight" style="color: #83e089">姝ｇ‘</span>
+ <span v-if="isRight == false" style="color: #d81e06">閿欒</span>
+ </li>
<li class="show-answer-box">
<div>绛旀:</div>
<div>
- <img :src="item.answerImg" alt="" class="w100">
+ <img :src="question.answerImg" alt="" class="w100" />
</div>
</li>
</ul>
@@ -85,8 +90,8 @@
checkItemIndex: null,
isShowAnswer: false,
isRight: null,
- value:[],
- pageNum:null
+ value: [],
+ pageNum: null,
};
},
props: {
@@ -99,16 +104,16 @@
};
},
},
- item: {
+ question: {
type: Object,
default: () => {
return [];
},
},
- primaryColor:{
- type:String,
- default:"#0bab87"
- }
+ primaryColor: {
+ type: String,
+ default: "#0bab87",
+ },
},
watch: {
rawData: {
@@ -120,7 +125,7 @@
},
mounted() {
// 鑾峰彇褰撳墠椤电爜锛岀敤浜庡尮閰嶆湰娆″瓨鍌ㄩ鐩暟鎹�
- this.pageNum = this.handlePage()
+ this.pageNum = this.handlePage();
// 娣诲姞婊氬姩浜嬩欢 鐩戝惉 瑙ｅ喅鍥犱负婊氬姩寮曡捣鐨勬嫋鍔ㄧ嚎涓嶅鐨勯棶棰�
window.addEventListener(
"scroll",
@@ -142,7 +147,7 @@
this.$nextTick(() => {
this.drawing();
});
- this.getAnswer()
+ this.getAnswer();
},
methods: {
init() {
@@ -182,14 +187,15 @@
// 瑙︽懜缁撴潫
touchend(e, index) {
this.isDragging = false;
- if (this.item.showAnswer) {
+ if (this.question.showAnswer) {
return false;
}
// let event = e.changedTouches[0];
// document.elementFromPoint 閲嶇偣锛屾牴鎹畑,y鍧愭爣 鍙栧綋鍓嶅厓绱� 鎵�鏈夎兘杩愯鐨勯�昏緫 閮戒緷鎵樹簬杩欓噷銆�
- let dom = (
- this.container ? this.container : document
- ).elementFromPoint(e.pageX, e.pageY);
+ let dom = (this.container ? this.container : document).elementFromPoint(
+ e.pageX,
+ e.pageY
+ );
// 鍙宠竟鐨刣om鏄摢涓�
let right = this.rightDom.find((r) => r.bom === dom);
// 涓嶇鏄摢涓兘娓呴櫎鎺� 搴曢儴鐨勭嚎
@@ -220,7 +226,7 @@
})
.filter((r) => r.right !== undefined);
this.$emit("input", model);
- this.item.userChoise = model;
+ this.question.userChoise = model;
// console.log(JSON.stringify(model));
},
// 瑙︽懜寮�濮�
@@ -239,7 +245,7 @@
// touchmove(e, item) {
// if(!this.isDragging) return false
// console.log('绉诲姩',e);
- // if (this.item.showAnswer) {
+ // if (this.question.showAnswer) {
// return false;
// }
// // let event = e.targetTouches[0];
@@ -251,7 +257,7 @@
// 绉诲姩涓�
mousemove(e) {
if (!this.isDragging) return false;
- if (this.item.showAnswer) {
+ if (this.question.showAnswer) {
return false;
}
this.checkItem.line[2] = e.pageX;
@@ -329,10 +335,10 @@
// 鎻愪氦
submitData() {
const answerArr = [];
- const values = this.item.options.values;
+ const values = this.question.options.values;
for (let index = 0; index < values.length; index++) {
const item = values[index];
- const rightIndex = this.item.options.linkValues.findIndex(
+ const rightIndex = this.question.options.linkValues.findIndex(
(citem) => citem.oldId == item.oldId
);
answerArr.push({
@@ -340,22 +346,21 @@
right: rightIndex,
});
}
- this.isRight = this.areArraysEqual(this.item.userChoise,answerArr)
- this.isShowAnswer =true
+ this.isRight = this.areArraysEqual(this.question.userChoise, answerArr);
+ this.isShowAnswer = true;
},
// 鑾峰彇褰撳墠椤电爜
handlePage() {
- let pageNum = null
+ let pageNum = null;
const element = (
this.container ? this.container : document
).querySelector("matching");
if (element) {
- pageNum = this.getParentWithClass(
- element,
- "page-box"
- ).getAttribute("page");
+ pageNum = this.getParentWithClass(element, "page-box").getAttribute(
+ "page"
+ );
}
- return pageNum
+ return pageNum;
},
getParentWithClass(element, className) {
while (element.parentElement) {
@@ -367,31 +372,38 @@
},
// 鑾峰彇鏈湴瀛樺偍棰樼洰绛旀
getAnswer() {
- const data = localStorage.getItem(this.config.activeBook.name + '-matching-' + this.pageNum)
- if(data) {
- this.value = JSON.parse(data)
+ const data = localStorage.getItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum
+ );
+ if (data) {
+ this.value = JSON.parse(data);
}
},
// 淇濆瓨
saveData() {
- if(this.item.userChoise.length)
- localStorage.setItem(this.config.activeBook.name + '-matching-' + this.pageNum,JSON.stringify(this.item.userChoise))
+ if (this.question.userChoise.length)
+ localStorage.setItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum,
+ JSON.stringify(this.question.userChoise)
+ );
// console.log('淇濆瓨鎴愬姛',this.config.activeBook.name,this.pageNum);
},
// 閲嶅仛
redo() {
- this.item.showAnswer = false
- localStorage.removeItem(this.config.activeBook.name + '-matching-' + this.pageNum)
- this.value = []
+ this.question.showAnswer = false;
+ localStorage.removeItem(
+ this.config.activeBook.name + "-matching-" + this.pageNum
+ );
+ this.value = [];
for (let index = 0; index < this.leftArr.length; index++) {
const item = this.leftArr[index];
- item.value = []
- item.line = []
+ item.value = [];
+ item.line = [];
}
- this.leftArr
- this.drawing()
- this.isShowAnswer = false
- }
+ this.leftArr;
+ this.drawing();
+ this.isShowAnswer = false;
+ },
},
};
</script>
@@ -459,7 +471,7 @@
height: min-content;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
li {
- padding:10px
+ padding: 10px;
}
}
.btn-bottom {
@@ -467,10 +479,26 @@
margin: 70px auto 0 auto;
display: flex;
justify-content: space-evenly;
+ flex-wrap: wrap;
+ .el-button {
+ margin-top: 10px;
+ }
}
.el-button {
- height:30px;
- padding:7px;
- min-width: 78px
+ height: 30px;
+ padding: 7px;
+ min-width: 78px;
+}
+.answer-box-item {
+ /deep/ .un1 {
+ -webkit-text-emphasis-style: dot;
+ -moz-text-emphasis-style: dot;
+ -ms-text-emphasis-style: dot;
+ text-emphasis-style: dot;
+ -webkit-text-emphasis-position: under;
+ -moz-text-emphasis-position: under;
+ -ms-text-emphasis-position: under;
+ text-emphasis-position: under;
+ }
}
</style>
diff --git a/src/components/pdfview/index.vue b/src/components/pdfview/index.vue
index 4e64d88..a7405cb 100644
--- a/src/components/pdfview/index.vue
+++ b/src/components/pdfview/index.vue
@@ -2,23 +2,22 @@
<div class="preview" v-if="this.preViewMd5">
<div id="imageParent" class="imageBox"></div>
<div class="bottom_tool">
- <svg
+ <!-- <svg
+ t="1718330411310"
@click="downloadPdf"
- t="1718251204993"
class="icon"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
- p-id="4418"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- width="25"
- height="25"
+ p-id="7121"
+ width="20"
+ height="20"
>
<path
- d="M557 564.974l153.188-181.04c16.054-18.972 44.448-21.34 63.42-5.286 18.972 16.054 21.338 44.448 5.284 63.42L550.56 711.92a44.982 44.982 0 0 1-8.95 10.254 44.872 44.872 0 0 1-15.082 8.432A44.944 44.944 0 0 1 512 733c-16.264 0-30.512-8.628-38.42-21.556L245.65 442.068c-16.052-18.972-13.686-47.366 5.286-63.42 18.972-16.052 47.366-13.686 63.42 5.286l152.646 180.4V157c0-24.852 20.148-45 45-45s45 20.148 45 45v407.974zM823 630c0-24.852 20.148-45 45-45s45 20.148 45 45v238c0 24.87-20.176 45.026-45.046 45l-710-0.726c-24.834-0.026-44.954-20.166-44.954-45V630c0-24.852 20.148-45 45-45s45 20.148 45 45v192.32l620 0.634V630z"
- p-id="4419"
+ d="M1022.955204 522.570753c0 100.19191-81.516572 181.698249-181.718715 181.698249l-185.637977 0c-11.2973 0-20.466124-9.168824-20.466124-20.466124 0-11.307533 9.168824-20.466124 20.466124-20.466124l185.637977 0c77.628008 0 140.786467-63.148226 140.786467-140.766001 0-77.423347-62.841234-140.448776-140.203182-140.766001-0.419556 0.030699-0.818645 0.051165-1.217734 0.061398-5.945409 0.143263-11.686157-2.292206-15.687284-6.702656-4.001127-4.400217-5.894244-10.335393-5.167696-16.250102 1.330298-10.806113 1.944282-19.760043 1.944282-28.192086 0-60.763922-23.658839-117.884874-66.617234-160.833035-42.968627-42.968627-100.089579-66.617234-160.843268-66.617234-47.368844 0-92.742241 14.449084-131.208321 41.781592-37.616736 26.738991-65.952084 63.700811-81.925894 106.884332-2.425236 6.538927-8.012488 11.399631-14.827707 12.893658-6.815219 1.483794-13.927197-0.603751-18.859533-5.54632-19.289322-19.330254-44.943608-29.972639-72.245418-29.972639-56.322773 0-102.146425 45.813419-102.146425 102.125959 0 0.317225 0.040932 0.982374 0.092098 1.627057 0.061398 0.920976 0.122797 1.831718 0.153496 2.762927 0.337691 9.465582-5.863545 17.928325-15.001669 20.455891-32.356942 8.933463-61.541635 28.550243-82.181721 55.217602-21.305235 27.516704-32.571836 60.508096-32.571836 95.41307 0 86.244246 70.188572 156.422585 156.443052 156.422585l169.981393 0c11.2973 0 20.466124 9.15859 20.466124 20.466124 0 11.2973-9.168824 20.466124-20.466124 20.466124l-169.981393 0c-108.828614 0-197.3753-88.536452-197.3753-197.354833 0-44.053332 14.223956-85.712127 41.126676-120.473839 22.809495-29.460985 53.897537-52.086285 88.710414-64.816215 5.065366-74.322729 67.149353-133.2447 142.751215-133.2447 28.386514 0 55.504128 8.217149 78.651314 23.52581 19.657712-39.868009 48.842405-74.169233 85.497233-100.212376 45.434795-32.295544 99.004875-49.354058 154.918325-49.354058 71.692832 0 139.087778 27.915793 189.782368 78.600149 50.694589 50.694589 78.610382 118.089535 78.610382 189.782368 0 3.704368-0.102331 7.470135-0.296759 11.368932C952.633602 352.568894 1022.955204 429.511287 1022.955204 522.570753zM629.258611 820.711014l-102.023628 102.013395c-3.990894 4.001127-9.230222 5.996574-14.46955 5.996574s-10.478655-1.995447-14.46955-5.996574l-102.023628-102.013395c-7.992021-7.992021-7.992021-20.947078 0-28.939099s20.947078-8.002254 28.939099 0l67.087954 67.077721 0-358.699522c0-11.2973 9.15859-20.466124 20.466124-20.466124 11.307533 0 20.466124 9.168824 20.466124 20.466124l0 358.699522 67.087954-67.077721c7.992021-8.002254 20.947078-7.992021 28.939099 0S637.250632 812.718993 629.258611 820.711014z"
+ p-id="7122"
></path>
- </svg>
+ </svg> -->
</div>
</div>
</template>
@@ -79,9 +78,7 @@
window.open(await getResourcePath(this.preViewMd5));
},
domViewer() {
- let ele = (this.container ? this.container : document).getElementById(
- "imageParent"
- );
+ let ele = document.getElementById("imageParent");
this.viewerCon = new Viewer(ele, {
inline: false,
container: this.container
@@ -93,16 +90,12 @@
});
},
clearDom() {
- let ele = (this.container ? this.container : document).getElementById(
- "imageParent"
- );
+ let ele = document.getElementById("imageParent");
ele.innerHtml = "";
},
createDom(page) {
var that = this;
- let ele = (this.container ? this.container : document).getElementById(
- "imageParent"
- );
+ let ele = document.getElementById("imageParent");
const img = document.createElement("img");
img.src = this.getPageImage(page);
img.alt = "";
@@ -117,9 +110,7 @@
},
scrollBottom() {
var that = this;
- var ele = (this.container ? this.container : document).getElementById(
- "imageParent"
- );
+ var ele = document.getElementById("imageParent");
ele.addEventListener("scroll", function () {
// 璁＄畻婊氬姩鏉¤窛绂诲簳閮ㄧ殑浣嶇疆
const scrollBottom =
@@ -185,8 +176,8 @@
justify-content: flex-end;
align-items: center;
svg {
- margin-right: 10px;
- fill: #999;
+ margin-right: 15px;
+ fill: #d1d1d1;
}
svg:hover {
fill: #fff;
--
Gitblit v1.9.1