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/testPp.vue | 89 +++++++-------------------------------------
1 files changed, 15 insertions(+), 74 deletions(-)
diff --git a/src/books/sportsAndHealth/view/components/testPp.vue b/src/books/sportsAndHealth/view/components/testPp.vue
index 3c57679..eb14457 100644
--- a/src/books/sportsAndHealth/view/components/testPp.vue
+++ b/src/books/sportsAndHealth/view/components/testPp.vue
@@ -1,6 +1,6 @@
<template>
- <div class="chapter" num="3">
- <div class="page-box" page="24">
+ <div class="chapter" num="8">
+ <!-- <div class="page-box" page="24">
<div v-if="showPageList.indexOf(24) > -1">
<div class="bodystyle">
<div class="bodystyle-chapter">
@@ -42,7 +42,10 @@
</div>
</div>
</div>
- </div>
+ </div> -->
+
+
+
<div class="page-box" page="26">
<div v-if="showPageList.indexOf(26) > -1">
<div class="bodystyle">
@@ -220,6 +223,7 @@
<div class="swiper-slide">
<div class="imgBox" style="width: 100%; height: 100%">
<img src="../../image/352-1.png" />
+ <p class="img">鍥�1-8-2 浠板ご鎶娉�</p>
</div>
</div>
<div class="swiper-slide">
@@ -237,7 +241,8 @@
<div class="swiper-button-prev"></div>
</div>
</div>
- <p class="img">鍥�3-5-2 鍙嶆墜鎺ㄦ尅</p>
+
+ <p class="img">鍥�1-8-3 鎺ㄤ妇涓嬮娉�</p>
<div class="bk-xyx">
<div class="bj1-xyx publicxbc">娉ㄦ剰浜嬮」</div>
<p>1.涔掍箵鐞冪殑鎺ㄦ尅缁冧範瑕佷弗鏍兼寜鐓ф妧鏈矾绾胯繘琛屻��</p>
@@ -1030,6 +1035,7 @@
</div>
</div>
</div>
+
<div>
<el-dialog :visible.sync="dialogVisible" width="60vw" top="2vh" lock-scroll :show-close="false"
class="custom-dialog">
@@ -1267,11 +1273,11 @@
title: this.chapter002.pdfMd5[val].name,
},
};
- this.$emit("openPDFChange", obj);
+ // this.$emit("openPDFChange", obj);
- // this.dialogVisible = true;
- // this.p_md5 = this.chapter002.pdfMd5[val].md5;
- // this.pdfTitle = this.chapter002.pdfMd5[val].name;
+ this.dialogVisible = true;
+ this.p_md5 = this.chapter002.pdfMd5[val].md5;
+ this.pdfTitle = this.chapter002.pdfMd5[val].name;
}
},
async getVideo(md5, val) {
@@ -1309,69 +1315,4 @@
};
</script>
-<style lang="less">
-.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;
- }
- }
-}
-</style>
+<style lang="less"></style>
--
Gitblit v1.9.1