From ffb938e7a65c0dab30dd8ed00a13c68dcf7bd77c Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 25 十月 2024 16:48:36 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/view/components/chapter007.vue | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/src/books/sportsAndHealth/view/components/chapter007.vue b/src/books/sportsAndHealth/view/components/chapter007.vue
index b542d1a..a61f852 100644
--- a/src/books/sportsAndHealth/view/components/chapter007.vue
+++ b/src/books/sportsAndHealth/view/components/chapter007.vue
@@ -34,7 +34,6 @@
</div>
<!-- 217 -->
<div class="page-box" page="228">
-
<div v-if="showPageList.indexOf(228) > -1">
<div class="header-odd">
<span class="mk">鎷撳睍妯″潡</span>
@@ -1148,6 +1147,7 @@
<div class="subsectionContent">
锛�2锛夊缁冨缓璁�
+ <div class="subsectionContent">鈶犻檰涓婃ā浠跨粌涔犮��</div>
<div class="subsectionContent">
鍗曡噦鍒掓墜涓庡懠鍚哥殑閰嶅悎缁冧範锛氬憟寮撴绔欑珛浜庢睜杈癸紝涓�鍙墜鎾戜綇鑶濆叧鑺傦紝鍙︿竴鍙墜鍒掕噦鍚�
鏃堕厤鍚堝懠鍚搞�傛缁冧範鐨勭洰鐨勫湪浜庢帉鎻″垝鑷備笌鍛煎惛鐨勯厤鍚堢粏鑺傚姩浣溿��
@@ -1697,7 +1697,9 @@
<div class="swiper-button-prev"></div>
</div>
</div>
-
+ <p class="img" style="color: #ac92c4; font-size: 14px">
+ 鍥� 7-2-2鈥� 鍙嶈洐娉�
+ </p>
<p>
鈶�
鍙嶈洐娉宠吙閮ㄧ殑鎶�鏈被浼艰洐娉炽�傛敹鑵跨粨鏉熸椂锛屼袱鑶濈害瀹戒簬鑲╋紝澶ц吙鍜屽皬鑵垮唴渚у悜鍚庡
@@ -1757,7 +1759,9 @@
<div class="swiper-button-prev"></div>
</div>
</div>
-
+ <p class="img" style="color: #ac92c4; font-size: 14px">
+ 鍥� 7-2-3鈥� 韪╂按
+ </p>
<p>
涓よ吙鍚屾椂韫す姘存妧鏈細涓庤洐娉宠吙閮ㄥ姩浣滅浉浼硷紝澶ц吙鐨勫姩
浣滃箙搴﹀皬銆傚綋涓よ吙杩樻湭瀹屽叏韫洿鏃舵敹鑵匡紝鍔ㄤ綔瑕佽繛璐��
@@ -2178,9 +2182,10 @@
</div>
<p class="zt-cs">3. 绌烘按鎶�鏈�</p>
<p>濡傛汉姘磋�呭枬姘磋繃澶氾紝鍒欏簲鎺掑嚭鑵规按銆�</p>
- <p>鍔ㄤ綔瑕侀锛氭柦鏁戣�呬竴鑵胯藩鍦帮紝鍙︿竴鑵垮眻鑶濓紝灏嗘汉姘磋�呰吂閮ㄦ斁鍦ㄥ眻鑶濈殑澶ц吙涓婏紝浣垮叾澶撮儴
- 涓嬪瀭锛堝ご閮ㄦ按骞充綅缃綆浜庤吂閮級锛屽啀鐢ㄤ竴鎵嬫壎浣忔汉姘磋�呭ご閮紝灏嗗叾鑵逛腑鐨勬按鎺掑嚭銆�</p>
-
+ <p>
+ 鍔ㄤ綔瑕侀锛氭柦鏁戣�呬竴鑵胯藩鍦帮紝鍙︿竴鑵垮眻鑶濓紝灏嗘汉姘磋�呰吂閮ㄦ斁鍦ㄥ眻鑶濈殑澶ц吙涓婏紝浣垮叾澶撮儴
+ 涓嬪瀭锛堝ご閮ㄦ按骞充綅缃綆浜庤吂閮級锛屽啀鐢ㄤ竴鎵嬫壎浣忔汉姘磋�呭ご閮紝灏嗗叾鑵逛腑鐨勬按鎺掑嚭銆�
+ </p>
</div>
</div>
</div>
@@ -2197,17 +2202,17 @@
<p class="zt-cs">4. 蹇冭偤澶嶈嫃鎶�鏈�</p>
<p>璇﹁绗竴鍗曞厓涓撻鍏��</p>
-
-
<p class="zt-ls">锛堜簩锛夌粍鍚堟妧鑳界粌涔�</p>
<p class="zt-cs">鏁村宀镐笂鎬ユ晳鎶�鏈粌涔�</p>
<p>璇峰悓瀛︿滑鎸夌収濡備笅宀镐笂鎬ユ晳娴佺▼鐨勫畬鏁磋繃绋嬶紝杩涜缁勫悎鎶�鑳界粌涔犮��</p>
<p>缁煎悎妫�鏌モ啋鐣呴�氬懠鍚搁亾鈫掔┖姘粹啋蹇冭偤澶嶈嫃銆�</p>
- <p>鍦ㄧ粌涔犺繃绋嬩腑锛屽簲娉ㄦ剰锛氫竴鏄墍鏈夌殑姝ラ涓嶅彲閬楁紡鎴栭鍊掞紝闇�涓ユ牸鎸夌収涓婅堪姝ラ鏉ヨ繘琛岋紱
+ <p>
+ 鍦ㄧ粌涔犺繃绋嬩腑锛屽簲娉ㄦ剰锛氫竴鏄墍鏈夌殑姝ラ涓嶅彲閬楁紡鎴栭鍊掞紝闇�涓ユ牸鎸夌収涓婅堪姝ラ鏉ヨ繘琛岋紱
浜屾槸鎵�鏈夋楠ら』杩炶疮璧锋潵锛屼竴姘斿懙鎴愶紝蹇呴』鐔熺粌鎺屾彙浠庡紑濮嬫鏌ヨ嚦鏈�缁堝畬鎴愭晳鎶ょ殑鍏ㄥ鎶�鏈�
鍔ㄤ綔銆傚悓瀛︿滑鍔″繀娉ㄦ剰锛氶亣鍒版汉姘磋�呴渶瑕佹�ユ晳鏃讹紝涓�瀹氳鍙婃椂瀵绘眰涓撲笟浜哄憳鐨勫府鍔╋紱鍦ㄧ瓑寰�
- 涓撲笟浜哄憳鍒版潵鐨勮繃绋嬩腑锛岀Н鏋佽繘琛屾晳鎶わ紝浠ュ厤閿欒繃鏈�浣虫晳鎶ゆ椂鏈恒��</p>
+ 涓撲笟浜哄憳鍒版潵鐨勮繃绋嬩腑锛岀Н鏋佽繘琛屾晳鎶わ紝浠ュ厤閿欒繃鏈�浣虫晳鎶ゆ椂鏈恒��
+ </p>
<div class="imgBox-003 openImgBox">
<div class="swiper-container swiper-img">
@@ -2277,13 +2282,16 @@
鍥� 7-2-13鈥� 宀镐笂鎬ユ晳
</p>
-
<h4 class="h4-dy3" id="d066">
<span class="h4-dy3s">涓�</span>鈥冨弬涓庡疄鐢ㄦ父娉虫晳鐢熸瘮璧�
</h4>
- <p>璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴锛屼簡瑙ｈ嚜宸辨劅鍏磋叮鐨勬瘮璧涙椿鍔ㄧ殑鏂规硶銆佽姹傚拰娉ㄦ剰浜嬮」绛夛紝鑷
- 缁勭粐姣旇禌锛屽湪绔炶禌涓珐鍥哄缁冩垚鏋溿��</p>
- <p>妯″潡涓�姣旇禌鏈夛細韪╂按 5 绫虫帴鍔涜禌銆佹姮澶寸埇娉� + 娼滄按鎹炵墿璧涖�佽揪鏍囨瘮璧涖��</p>
+ <p>
+ 璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴锛屼簡瑙ｈ嚜宸辨劅鍏磋叮鐨勬瘮璧涙椿鍔ㄧ殑鏂规硶銆佽姹傚拰娉ㄦ剰浜嬮」绛夛紝鑷
+ 缁勭粐姣旇禌锛屽湪绔炶禌涓珐鍥哄缁冩垚鏋溿��
+ </p>
+ <p>
+ 妯″潡涓�姣旇禌鏈夛細韪╂按 5 绫虫帴鍔涜禌銆佹姮澶寸埇娉� + 娼滄按鎹炵墿璧涖�佽揪鏍囨瘮璧涖��
+ </p>
<p>妯″潡浜屾瘮璧涙湁锛�50 绫虫嫋甯︽帴鍔涜禌銆佽揪鏍囨瘮璧涖��</p>
<p>妯″潡涓夋瘮璧涙湁锛�30 娆¤兏澶栨寜鍘嬭禌銆佽揪鏍囨瘮璧�</p>
@@ -2303,11 +2311,12 @@
</div>
</div>
-
<h4 class="h4-dy3" id="d066">
<span class="h4-dy3s">鍥�</span>鈥冨疄鏂借嚜涓昏瘎浠�
</h4>
- <p>鍦ㄥ墠闈㈠銆佺粌銆佽禌鐨勮繃绋嬩腑锛屽悓瀛︿滑瀵硅嚜宸卞拰韬竟鍚屽鐨勫涔犳晥鏋滄湁浜嗗垵姝ョ殑璇勫垽锛岄偅涔堝浣曠郴缁熷湴璇勪环鑷繁瀵瑰疄鐢ㄦ父娉虫晳鐢熸妧鏈殑鎺屾彙绋嬪害鍜屾暣涓繍鍔ㄧ殑鐞嗚В绋嬪害鍛紵璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴锛岃繘琛岀郴缁熴�佸叏闈㈢殑鑷富璇勪环銆�</p>
+ <p>
+ 鍦ㄥ墠闈㈠銆佺粌銆佽禌鐨勮繃绋嬩腑锛屽悓瀛︿滑瀵硅嚜宸卞拰韬竟鍚屽鐨勫涔犳晥鏋滄湁浜嗗垵姝ョ殑璇勫垽锛岄偅涔堝浣曠郴缁熷湴璇勪环鑷繁瀵瑰疄鐢ㄦ父娉虫晳鐢熸妧鏈殑鎺屾彙绋嬪害鍜屾暣涓繍鍔ㄧ殑鐞嗚В绋嬪害鍛紵璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴锛岃繘琛岀郴缁熴�佸叏闈㈢殑鑷富璇勪环銆�
+ </p>
<div class="pdf-text">
<div class="pdf-con pdf-con-15">
@@ -2341,7 +2350,6 @@
</div>
</div>
-
<div class="pdf-text">
<div class="pdf-con pdf-con-15">
<div class="pdf-view">
@@ -2372,12 +2380,15 @@
<span class="sub-page">237</span>
</div>
<div class="bodystyle">
-
<h4 class="h4-dy3" id="d066">
<span class="h4-dy3s">浜�</span>鈥冭缁冧笓椤逛綋鑳�
</h4>
- <p>鎯宠鏇村ソ鍦板彂鎸ヨ嚜宸辩殑姘村钩锛岀涓嶅紑涓撻」浣撹兘鐨勬敮鎾戙�傚悓瀛︿滑闇�瑕佷笉鏂湴璁粌骞舵彁鍗囪嚜宸辩殑涓撻」浣撹兘锛屼负浠婂悗鏇村畨鍏ㄣ�佹洿鍚堢悊鍦板弬涓庡疄鐢ㄦ父娉虫晳鐢燂紝涔冭嚦鍦ㄨ亴鍦轰腑灞曠幇鍑烘洿濂界殑韬綋绱犺川鎵撶墷鍩虹銆�</p>
- <p>璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴杩涜鍙屾墜涓婁妇鍘熷湴韪╂按缁冧範銆佹嫋甯︾粌涔犲拰璐熼噸娓歌繘缁冧範鐨勪笓椤逛綋鑳借缁冦��</p>
+ <p>
+ 鎯宠鏇村ソ鍦板彂鎸ヨ嚜宸辩殑姘村钩锛岀涓嶅紑涓撻」浣撹兘鐨勬敮鎾戙�傚悓瀛︿滑闇�瑕佷笉鏂湴璁粌骞舵彁鍗囪嚜宸辩殑涓撻」浣撹兘锛屼负浠婂悗鏇村畨鍏ㄣ�佹洿鍚堢悊鍦板弬涓庡疄鐢ㄦ父娉虫晳鐢燂紝涔冭嚦鍦ㄨ亴鍦轰腑灞曠幇鍑烘洿濂界殑韬綋绱犺川鎵撶墷鍩虹銆�
+ </p>
+ <p>
+ 璇峰悓瀛︿滑鐧诲綍璇剧▼骞冲彴杩涜鍙屾墜涓婁妇鍘熷湴韪╂按缁冧範銆佹嫋甯︾粌涔犲拰璐熼噸娓歌繘缁冧範鐨勪笓椤逛綋鑳借缁冦��
+ </p>
<div class="pdf-text">
<div class="pdf-con pdf-con-15">
<div class="pdf-view">
@@ -2396,10 +2407,22 @@
</div>
</div>
</div>
+
+ <el-dialog :visible.sync="dialogVisible" width="60vw" top="2vh" append-to-body lock-scroll :show-close="false"
+ class="custom-dialog">
+ <div slot="title" class="header_title">
+ <span>{{ pdfTitle }}</span>
+ <span @click="closeDialog"> x </span>
+ </div>
+ <div class="pdfModal" v-if="dialogVisible">
+ <preView :isClear="dialogVisible" :md5="p_md5"></preView>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
+import preView from '@/components/pdfview'
import { getResourcePath } from '@/assets/methods/resources'
export default {
name: 'chapter007-page',
@@ -2415,9 +2438,14 @@
default: false,
},
},
- components: {},
+ components: {
+ preView,
+ },
data() {
return {
+ pdfTitle: '',
+ p_md5: '',
+ dialogVisible: false,
isShowXyx01: false,
isShowXyx02: false,
isShowXyx03: false,
@@ -2502,8 +2530,6 @@
md5: '08943bce75bfea1b0aae66a90630453f',
name: '瀹炵敤娓告吵鏁戠敓涓撻」浣撹兘璁粌',
},
-
-
},
videoMd5: {
v1: {
@@ -2547,16 +2573,14 @@
this.chapter007.videoUrl[val] = data
},
+ closeDialog() {
+ this.dialogVisible = false
+ },
toUrl(val) {
if (val) {
- const obj = {
- type: 'pdf',
- data: {
- md5: this.chapter007.pdfMd5[val].md5,
- title: this.chapter007.pdfMd5[val].name,
- },
- }
- this.$emit('openPDFChange', obj)
+ this.dialogVisible = true
+ this.p_md5 = this.chapter007.pdfMd5[val].md5
+ this.pdfTitle = this.chapter007.pdfMd5[val].name
}
},
@@ -2610,5 +2634,3 @@
},
}
</script>
-
-<style lang="less" scoped></style>
--
Gitblit v1.9.1