From ca74870ae474e4dbabf4771bca42f73618ce4b84 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 16 八月 2024 11:22:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/sportsAndHealth/view/components/chapter003.vue | 303 +++++++++++++++++++-------------------------------
1 files changed, 117 insertions(+), 186 deletions(-)
diff --git a/src/books/sportsAndHealth/view/components/chapter003.vue b/src/books/sportsAndHealth/view/components/chapter003.vue
index 237c18f..59f9985 100644
--- a/src/books/sportsAndHealth/view/components/chapter003.vue
+++ b/src/books/sportsAndHealth/view/components/chapter003.vue
@@ -1391,6 +1391,7 @@
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v2"></video>
<span>{{ chapter003.videoMd5.v2.name }}</span>
+
</div>
<div class="videoItem" v-if="chapter003.videoShow1">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
@@ -5350,6 +5351,9 @@
</span>
<span @click="toUrl(1)">涔掍箵鐞冪殑甯哥敤鏈锛堜竴锛�.pdf</span>
</div>
+
+
+
<div class="pdf-view">
<span>
<svg t="1717640665152" class="icon" viewBox="0 0 1024 1024" version="1.1"
@@ -5361,6 +5365,9 @@
</span>
<span @click="toUrl(2)">涔掍箵鐞冪殑甯哥敤鏈锛堜簩锛�.pdf</span>
</div>
+
+
+
</div>
<p>
涔掍箵鐞冭繍鍔ㄦ槸涓�椤圭敱涓ゅ悕鎴栧洓鍚嶈繍鍔ㄥ憳鍦ㄤ箳涔撶悆妗屼笂杩涜闅旂綉鏀诲畧鐨勮繍鍔紝鍦ㄤ笘鐣屼笂璁稿鍦版柟娴佽銆備箳涔撶悆杩愬姩1900骞磋捣婧愪簬鑻卞浗锛�20涓栫邯鍒濆湪娆ф床鍜屼簹娲茶摤鍕冨紑灞曡捣鏉ャ�備箳涔撶悆杩愬姩鏄撲簬寮�灞曪紝鎵撴硶澶氭牱锛岀悆璺彉鍖栦赴瀵岋紝鎶�鏈姩浣滆姹傚崗璋冦�佺伒鏁忋�佺簿纭紝瑙傝祻鎬у己銆備箳涔撶悆杩愬姩鑳芥湁鏁堝彂灞曞姏閲忋�侀�熷害銆佽�愬姏銆佺伒鏁忔�х瓑韬綋绱犺川锛屽悓鏃朵篃鑳介敾鐐煎拰鍩瑰吇鍕囨暍銆侀〗寮恒�佹満鏅恒�佹灉鏂瓑蹇冪悊鍝佽川銆備箳涔撶悆杩愬姩瀵逛粖鍚庝粠浜嬮渶涔呭潗銆佷箙绔欑殑鑱屼笟锛屽挨鍏舵槸闇�瑕佽繘琛岀簿缁嗗寲鎿嶄綔鐨勮亴涓氫汉缇よ韩浣撶姸鍐电殑鏀瑰杽鏈夌Н鏋佺殑浣滅敤銆傗�滀箳涔撶簿绁炩�濇墍钑村惈鐨勬妧鏈垱鏂板拰绮剧泭姹傜簿涔熸槸鍚屽浠簲璇ュ涔犲拰璺佃鐨勮亴涓氱簿绁炪�備箳涔撶悆杩愬姩鍦ㄥ浗鍐呭骞挎硾寮�灞曪紝涔掍箵鐞冧笘鐣屾澂銆佷笘閿﹁禌涓庡ゥ杩愪細骞剁О涓栫晫涔掍箵鐞冧笁澶ц禌浜嬨��
@@ -7437,79 +7444,79 @@
<span>{{ chapter003.videoMd5.v24.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx16">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v25"></video>
<span>{{ chapter003.videoMd5.v25.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx16">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v26"></video>
<span>{{ chapter003.videoMd5.v26.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx16">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v27"></video>
<span>{{ chapter003.videoMd5.v27.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx16">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v28"></video>
<span>{{ chapter003.videoMd5.v28.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx16">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v29"></video>
<span>{{ chapter003.videoMd5.v29.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx17">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v30"></video>
<span>{{ chapter003.videoMd5.v30.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx17">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v31"></video>
<span>{{ chapter003.videoMd5.v31.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx17">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v32"></video>
<span>{{ chapter003.videoMd5.v32.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx17">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v33"></video>
<span>{{ chapter003.videoMd5.v33.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx17">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v34"></video>
<span>{{ chapter003.videoMd5.v34.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx18">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v35"></video>
<span>{{ chapter003.videoMd5.v35.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx18">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v36"></video>
<span>{{ chapter003.videoMd5.v36.name }}</span>
</div>
- <div class="videoItem" v-if="chapter003.isShowXyx15">
+ <div class="videoItem" v-if="chapter003.isShowXyx18">
<video webkit-playsinline="true" x-webkit-airplay="true" playsinline="true" x5-video-orientation="h5"
x5-video-player-fullscreen="true" x5-playsinline="" controls class="video-border w100"
:src="chapter003.videoUrl.v37"></video>
@@ -7520,6 +7527,10 @@
</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">
@@ -7530,6 +7541,7 @@
<preView :isClear="dialogVisible" :md5="p_md5"></preView>
</div>
</el-dialog>
+
</div>
</template>
<script>
@@ -7583,6 +7595,9 @@
isShowXyx13: false,
isShowXyx14: false,
isShowXyx15: false,
+ isShowXyx16: false,
+ isShowXyx17: false,
+ isShowXyx18: false,
score1: 0,
score2: 0,
score3: 0,
@@ -8266,14 +8281,6 @@
created() {
if (!this.isSearch) {
- this.getVideo(this.chapter003.videoMd5.v1.md5, 'v1')
- this.getVideo(this.chapter003.videoMd5.v2.md5, 'v2')
- this.getVideo(this.chapter003.videoMd5.v3.md5, 'v3')
- this.getVideo(this.chapter003.videoMd5.v4.md5, 'v4')
- this.getVideo(this.chapter003.videoMd5.v5.md5, 'v5')
- this.getVideo(this.chapter003.videoMd5.v6.md5, 'v6')
- this.getVideo(this.chapter003.videoMd5.v7.md5, 'v7')
-
this.getVideo(this.chapter003.videoMd5.v8.md5, 'v8')
this.getVideo(this.chapter003.videoMd5.v9.md5, 'v9')
this.getVideo(this.chapter003.videoMd5.v10.md5, 'v10')
@@ -8283,71 +8290,10 @@
this.getVideo(this.chapter003.videoMd5.v14.md5, 'v14')
this.getVideo(this.chapter003.videoMd5.v15.md5, 'v15')
this.getVideo(this.chapter003.videoMd5.v16.md5, 'v16')
-
this.getVideo(this.chapter003.videoMd5.v17.md5, 'v17')
this.getVideo(this.chapter003.videoMd5.v18.md5, 'v18')
this.getVideo(this.chapter003.videoMd5.v19.md5, 'v19')
this.getVideo(this.chapter003.videoMd5.v20.md5, 'v20')
-
- this.getVideo(this.chapter003.videoMd5.v21.md5, 'v21')
- this.getVideo(this.chapter003.videoMd5.v22.md5, 'v22')
- this.getVideo(this.chapter003.videoMd5.v23.md5, 'v23')
- this.getVideo(this.chapter003.videoMd5.v24.md5, 'v24')
- this.getVideo(this.chapter003.videoMd5.v25.md5, 'v25')
- this.getVideo(this.chapter003.videoMd5.v26.md5, 'v26')
- this.getVideo(this.chapter003.videoMd5.v27.md5, 'v27')
- this.getVideo(this.chapter003.videoMd5.v28.md5, 'v28')
- this.getVideo(this.chapter003.videoMd5.v29.md5, 'v29')
- this.getVideo(this.chapter003.videoMd5.v30.md5, 'v30')
- this.getVideo(this.chapter003.videoMd5.v31.md5, 'v31')
- this.getVideo(this.chapter003.videoMd5.v32.md5, 'v32')
- this.getVideo(this.chapter003.videoMd5.v33.md5, 'v33')
- this.getVideo(this.chapter003.videoMd5.v34.md5, 'v34')
- this.getVideo(this.chapter003.videoMd5.v35.md5, 'v35')
- this.getVideo(this.chapter003.videoMd5.v36.md5, 'v36')
- this.getVideo(this.chapter003.videoMd5.v37.md5, 'v37')
-
- this.getVideos(this.chapter003.video2Md5.v1.md5, 'v1')
- this.getVideos(this.chapter003.video2Md5.v2.md5, 'v2')
- this.getVideos(this.chapter003.video2Md5.v3.md5, 'v3')
- this.getVideos(this.chapter003.video2Md5.v4.md5, 'v4')
- this.getVideos(this.chapter003.video2Md5.v5.md5, 'v5')
- this.getVideos(this.chapter003.video2Md5.v6.md5, 'v6')
-
- setTimeout(() => {
- this.getVideos(this.chapter003.video2Md5.v7.md5, 'v7')
- this.getVideos(this.chapter003.video2Md5.v8.md5, 'v8')
- this.getVideos(this.chapter003.video2Md5.v9.md5, 'v9')
- this.getVideos(this.chapter003.video2Md5.v10.md5, 'v10')
- this.getVideos(this.chapter003.video2Md5.v11.md5, 'v11')
- this.getVideos(this.chapter003.video2Md5.v12.md5, 'v12')
- }, 1000)
-
- setTimeout(() => {
- this.getVideos(this.chapter003.video2Md5.v13.md5, 'v13')
- this.getVideos(this.chapter003.video2Md5.v14.md5, 'v14')
- this.getVideos(this.chapter003.video2Md5.v15.md5, 'v15')
- this.getVideos(this.chapter003.video2Md5.v16.md5, 'v16')
- this.getVideos(this.chapter003.video2Md5.v17.md5, 'v17')
- this.getVideos(this.chapter003.video2Md5.v18.md5, 'v18')
- }, 3000)
-
- setTimeout(() => {
- this.getVideos(this.chapter003.video2Md5.v19.md5, 'v19')
- this.getVideos(this.chapter003.video2Md5.v20.md5, 'v20')
- this.getVideos(this.chapter003.video2Md5.v21.md5, 'v21')
- this.getVideos(this.chapter003.video2Md5.v22.md5, 'v22')
- this.getVideos(this.chapter003.video2Md5.v23.md5, 'v23')
- this.getVideos(this.chapter003.video2Md5.v24.md5, 'v24')
- }, 5000)
-
- setTimeout(() => {
- this.getVideos(this.chapter003.video2Md5.v25.md5, 'v25')
- this.getVideos(this.chapter003.video2Md5.v26.md5, 'v26')
- this.getVideos(this.chapter003.video2Md5.v27.md5, 'v27')
- this.getVideos(this.chapter003.video2Md5.v28.md5, 'v28')
- this.getVideos(this.chapter003.video2Md5.v29.md5, 'v29')
- }, 7000)
}
const localData = JSON.parse(localStorage.getItem('chapter003'))
@@ -8368,7 +8314,7 @@
},
activityXyx1() {
this.isShowXyx01 = !this.isShowXyx01
- this.videoShow3 = !this.videoShow3
+ this.videoShow3 = true
},
async getVideo(md5, val) {
const data = await getResourcePath(md5)
@@ -8403,6 +8349,17 @@
activityXyx2() {
this.isShowXyx02 = !this.isShowXyx02
+
+ if (!this.isSearch && !this.chapter003.videoShow1) {
+ this.getVideo(this.chapter003.videoMd5.v1.md5, 'v1')
+ this.getVideo(this.chapter003.videoMd5.v2.md5, 'v2')
+ this.getVideo(this.chapter003.videoMd5.v3.md5, 'v3')
+ this.getVideo(this.chapter003.videoMd5.v4.md5, 'v4')
+ this.getVideo(this.chapter003.videoMd5.v5.md5, 'v5')
+ this.getVideo(this.chapter003.videoMd5.v6.md5, 'v6')
+ this.getVideo(this.chapter003.videoMd5.v7.md5, 'v7')
+ }
+
this.chapter003.videoShow1 = true
setTimeout(() => {
this.chapter003.videoShow2 = true
@@ -8410,14 +8367,56 @@
},
activityXyx20() {
this.isShowXyx020 = !this.isShowXyx020
- this.chapter003.isShowXyx12 = true
+
+ if (!this.isSearch && !this.chapter003.isShowXyx12) {
+ this.getVideos(this.chapter003.video2Md5.v1.md5, 'v1')
+ this.getVideos(this.chapter003.video2Md5.v2.md5, 'v2')
+ this.getVideos(this.chapter003.video2Md5.v3.md5, 'v3')
+ this.getVideos(this.chapter003.video2Md5.v4.md5, 'v4')
+ this.getVideos(this.chapter003.video2Md5.v5.md5, 'v5')
+ this.getVideos(this.chapter003.video2Md5.v6.md5, 'v6')
+
+ setTimeout(() => {
+ this.getVideos(this.chapter003.video2Md5.v7.md5, 'v7')
+ this.getVideos(this.chapter003.video2Md5.v8.md5, 'v8')
+ this.getVideos(this.chapter003.video2Md5.v9.md5, 'v9')
+ this.getVideos(this.chapter003.video2Md5.v10.md5, 'v10')
+ this.getVideos(this.chapter003.video2Md5.v11.md5, 'v11')
+ this.getVideos(this.chapter003.video2Md5.v12.md5, 'v12')
+ this.getVideos(this.chapter003.video2Md5.v13.md5, 'v13')
+ this.getVideos(this.chapter003.video2Md5.v14.md5, 'v14')
+ this.getVideos(this.chapter003.video2Md5.v15.md5, 'v15')
+ this.getVideos(this.chapter003.video2Md5.v16.md5, 'v16')
+ this.getVideos(this.chapter003.video2Md5.v17.md5, 'v17')
+ this.getVideos(this.chapter003.video2Md5.v18.md5, 'v18')
+ }, 1000)
+
+ setTimeout(() => {
+ this.getVideos(this.chapter003.video2Md5.v19.md5, 'v19')
+ this.getVideos(this.chapter003.video2Md5.v20.md5, 'v20')
+ this.getVideos(this.chapter003.video2Md5.v21.md5, 'v21')
+ this.getVideos(this.chapter003.video2Md5.v22.md5, 'v22')
+ this.getVideos(this.chapter003.video2Md5.v23.md5, 'v23')
+ this.getVideos(this.chapter003.video2Md5.v24.md5, 'v24')
+ this.getVideos(this.chapter003.video2Md5.v25.md5, 'v25')
+ this.getVideos(this.chapter003.video2Md5.v26.md5, 'v26')
+ this.getVideos(this.chapter003.video2Md5.v27.md5, 'v27')
+ this.getVideos(this.chapter003.video2Md5.v28.md5, 'v28')
+ this.getVideos(this.chapter003.video2Md5.v29.md5, 'v29')
+ }, 3000)
+ }
+
setTimeout(() => {
- this.chapter003.isShowXyx13 = true
+ this.chapter003.isShowXyx12 = true
}, 1000)
setTimeout(() => {
- this.chapter003.isShowXyx14 = true
+ this.chapter003.isShowXyx13 = true
}, 3000)
+
+ setTimeout(() => {
+ this.chapter003.isShowXyx14 = true
+ }, 5000)
},
activityXyx3() {
this.chapter003.isShowXyx03 = !this.chapter003.isShowXyx03
@@ -8449,7 +8448,38 @@
},
activityXyx12() {
this.isShowXyx12 = !this.isShowXyx12
- this.chapter003.isShowXyx15 = !this.chapter003.isShowXyx15
+
+ if (!this.isSearch && !this.chapter003.isShowXyx15) {
+ this.getVideo(this.chapter003.videoMd5.v21.md5, 'v21')
+ this.getVideo(this.chapter003.videoMd5.v22.md5, 'v22')
+ this.getVideo(this.chapter003.videoMd5.v23.md5, 'v23')
+ this.getVideo(this.chapter003.videoMd5.v24.md5, 'v24')
+ this.getVideo(this.chapter003.videoMd5.v25.md5, 'v25')
+ this.getVideo(this.chapter003.videoMd5.v26.md5, 'v26')
+ this.getVideo(this.chapter003.videoMd5.v27.md5, 'v27')
+ this.getVideo(this.chapter003.videoMd5.v28.md5, 'v28')
+ this.getVideo(this.chapter003.videoMd5.v29.md5, 'v29')
+ this.getVideo(this.chapter003.videoMd5.v30.md5, 'v30')
+ this.getVideo(this.chapter003.videoMd5.v31.md5, 'v31')
+ this.getVideo(this.chapter003.videoMd5.v32.md5, 'v32')
+ this.getVideo(this.chapter003.videoMd5.v33.md5, 'v33')
+ this.getVideo(this.chapter003.videoMd5.v34.md5, 'v34')
+ this.getVideo(this.chapter003.videoMd5.v35.md5, 'v35')
+ this.getVideo(this.chapter003.videoMd5.v36.md5, 'v36')
+ this.getVideo(this.chapter003.videoMd5.v37.md5, 'v37')
+ }
+
+ this.chapter003.isShowXyx15 = true
+
+ setTimeout(() => {
+ this.chapter003.isShowXyx16 = true
+ }, 2000)
+ setTimeout(() => {
+ this.chapter003.isShowXyx17 = true
+ }, 3000)
+ setTimeout(() => {
+ this.chapter003.isShowXyx18 = true
+ }, 5000)
},
submit(val) {
if (val == 1) this.isShowScore1 = true
@@ -8563,102 +8593,3 @@
},
}
</script>
-
-<style lang="less" scoped>
-.pdfModal {
- width: 100%;
- height: 90vh;
-}
-
-.custom-dialog {
- overflow: hidden !important;
-
- /deep/ .el-dialog__body {
- padding: 0;
- }
-
- /deep/ .el-dialog__header {
- background-color: rgba(0, 0, 0, 0.8);
-
- .header_title {
- display: flex;
- justify-content: space-between;
- align-items: center;
- color: #fff;
- font-weight: 900;
- font-size: 16px;
- font-family: 'FZLTXIHJW';
-
- span:nth-child(2):hover {
- cursor: pointer;
- }
- }
-
- /deep/.el-dialog__title,
- /deep/ .el-dialog__headerbtn .el-dialog__close {
- color: #fff;
- font-weight: 900;
- font-size: 16px;
- font-family: 'FZLTXIHJW';
- }
- }
-}
-
-@media screen and (max-width: 1024px) {
- .pdfModal {
- width: 100%;
- height: 80vh;
- }
-
- .custom-dialog {
- /deep/ .el-dialog {
- width: 90vw !important;
- }
- }
-}
-
-@media screen and (max-width: 800px) {
- .pdfModal {
- width: 100%;
- height: 60vh;
- }
-
- .custom-dialog {
- /deep/ .el-dialog {
- width: 90vw !important;
- }
- }
-}
-
-.img {
- font-family: "FZLTXIHJW";
- text-align: center;
- font-size: 0.8em;
- color: #AC92C4 !important;
- margin-left: 0%;
- margin-right: 0%;
- text-indent: 0em;
-}
-</style>
-<style lang="less" scoped>
-// b {
-// color: #F79447;
-// }
-
-.imgBox {
- display: flex !important;
- flex-direction: column-reverse !important;
- position: relative !important;
-
-
- .img {
- position: absolute !important;
- left: 40% !important;
- bottom: -10% !important;
- }
-
- img {
- height: 80%;
- }
-}
-</style>
\ No newline at end of file
--
Gitblit v1.9.1