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/chapter005.vue | 1 src/books/sportsAndHealth/css/default.less | 92 +++++++ src/books/sportsAndHealth/view/components/chapter006.vue | 67 ----- src/books/sportsAndHealth/view/components/chapter004.vue | 30 ++ src/books/sportsAndHealth/view/components/chapter007.vue | 1 src/books/sportsAndHealth/view/components/chapter001.vue | 70 ----- src/books/sportsAndHealth/view/components/chapter002.vue | 198 --------------- src/books/sportsAndHealth/view/components/chapter003.vue | 36 +- src/components/pdfview/index.vue | 181 +++++-------- src/books/sportsAndHealth/view/components/chapter009.vue | 67 ----- src/books/sportsAndHealth/view/components/chapter008.vue | 1 src/books/sportsAndHealth/view/components/index.vue | 4 12 files changed, 214 insertions(+), 534 deletions(-) diff --git a/src/books/sportsAndHealth/css/default.less b/src/books/sportsAndHealth/css/default.less index c6c8e31..0f00ef8 100644 --- a/src/books/sportsAndHealth/css/default.less +++ b/src/books/sportsAndHealth/css/default.less @@ -227,6 +227,7 @@ video { width: 100%; + height: 150px; } video::-webkit-media-text-track-display { @@ -580,7 +581,21 @@ margin: 0; } } + .img-rights { + width: 250px; + float: right; + height: auto; + margin: auto; + margin-left: 20px; + img { + width: 100%; + } + + p { + margin: 0; + } + } .qjdrIocn { display: flex !important; justify-content: center; @@ -647,6 +662,7 @@ margin-right: 15px; padding: 0 15px; border-radius: 5px; + margin-top: 15px; span { font-size: 14px; @@ -2008,6 +2024,82 @@ .pdfModal { width: 100%; height: 90vh; + + .pdfBox-component { + width: 100%; + height: 100%; + position: relative; + + .preview { + width: 100%; + height: 100%; + + .imageBox { + height: calc(100% - 30px); + overflow-x: hidden; + overflow-y: auto; + background: #ccc; + box-sizing: border-box; + } + + .imageBox:hover { + cursor: zoom-in !important; + } + + ::v-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; + } + } + + ::v-deep .el-dialog__title, + ::v-deep .el-dialog__headerbtn .el-dialog__close { + color: #fff; + font-weight: 900; + font-size: 16px; + font-family: 'FZLTXIHJW'; + } + } + + .bottom_tool { + height: 30px; + background-color: rgba(0, 0, 0, 0.8); + display: flex; + justify-content: flex-end; + align-items: center; + + svg { + margin-right: 15px; + fill: #d1d1d1; + } + + svg:hover { + fill: #fff; + cursor: pointer; + } + } + } + + .notBox { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: calc(100% - 30px); + min-height: 300px; + } + } } @media screen and (max-width: 1024px) { diff --git a/src/books/sportsAndHealth/view/components/chapter001.vue b/src/books/sportsAndHealth/view/components/chapter001.vue index c08f721..e2c221b 100644 --- a/src/books/sportsAndHealth/view/components/chapter001.vue +++ b/src/books/sportsAndHealth/view/components/chapter001.vue @@ -6365,73 +6365,3 @@ }, } </script> -<style lang="less" scoped> -// b { -// color: #f79447; -// } - -// .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> diff --git a/src/books/sportsAndHealth/view/components/chapter002.vue b/src/books/sportsAndHealth/view/components/chapter002.vue index 00ca680..843971a 100644 --- a/src/books/sportsAndHealth/view/components/chapter002.vue +++ b/src/books/sportsAndHealth/view/components/chapter002.vue @@ -2667,133 +2667,7 @@ this.chapter002 = { ...Object.assign(this.chapter002, localData) }; } - if (!this.isSearch) { - // this.getVideo(this.chapter002.videoMd5.v1.md5, "v1"); - // this.getVideo(this.chapter002.videoMd5.v2.md5, "v2"); - // this.getVideo(this.chapter002.videoMd5.v3.md5, "v3"); - // this.getVideo(this.chapter002.videoMd5.v4.md5, "v4"); - // this.getVideo(this.chapter002.videoMd5.v5.md5, "v5"); - // this.getVideo(this.chapter002.videoMd5.v6.md5, "v6"); - // this.getVideo(this.chapter002.videoMd5.v7.md5, "v7"); - // this.getVideo(this.chapter002.videoMd5.v8.md5, "v8"); - // this.getVideo(this.chapter002.videoMd5.v9.md5, "v9"); - // this.getVideo(this.chapter002.videoMd5.v10.md5, "v10"); - // this.getVideo(this.chapter002.videoMd5.v11.md5, "v11"); - // this.getVideo(this.chapter002.videoMd5.v12.md5, "v12"); - // setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v13.md5, "v13"); - // this.getVideo(this.chapter002.videoMd5.v14.md5, "v14"); - // this.getVideo(this.chapter002.videoMd5.v15.md5, "v15"); - // this.getVideo(this.chapter002.videoMd5.v16.md5, "v16"); - // this.getVideo(this.chapter002.videoMd5.v17.md5, "v17"); - // this.getVideo(this.chapter002.videoMd5.v18.md5, "v18"); - // this.getVideo(this.chapter002.videoMd5.v19.md5, "v19"); - // this.getVideo(this.chapter002.videoMd5.v20.md5, "v20"); - // this.getVideo(this.chapter002.videoMd5.v21.md5, "v21"); - // this.getVideo(this.chapter002.videoMd5.v22.md5, "v22"); - // this.getVideo(this.chapter002.videoMd5.v23.md5, "v23"); - // this.getVideo(this.chapter002.videoMd5.v24.md5, "v24"); - // }, 1000); - - // setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v25.md5, "v25"); - // this.getVideo(this.chapter002.videoMd5.v26.md5, "v26"); - // this.getVideo(this.chapter002.videoMd5.v27.md5, "v27"); - // this.getVideo(this.chapter002.videoMd5.v28.md5, "v28"); - // this.getVideo(this.chapter002.videoMd5.v29.md5, "v29"); - // this.getVideo(this.chapter002.videoMd5.v30.md5, "v30"); - - // this.getVideo(this.chapter002.videoMd5.v31.md5, "v31"); - // this.getVideo(this.chapter002.videoMd5.v32.md5, "v32"); - // this.getVideo(this.chapter002.videoMd5.v33.md5, "v33"); - // this.getVideo(this.chapter002.videoMd5.v34.md5, "v34"); - // this.getVideo(this.chapter002.videoMd5.v35.md5, "v35"); - // this.getVideo(this.chapter002.videoMd5.v36.md5, "v36"); - // }, 3000); - - // setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v37.md5, "v37"); - // this.getVideo(this.chapter002.videoMd5.v38.md5, "v38"); - // this.getVideo(this.chapter002.videoMd5.v39.md5, "v39"); - // this.getVideo(this.chapter002.videoMd5.v40.md5, "v40"); - // this.getVideo(this.chapter002.videoMd5.v41.md5, "v41"); - // this.getVideo(this.chapter002.videoMd5.v42.md5, "v42"); - // this.getVideo(this.chapter002.videoMd5.v43.md5, "v43"); - // this.getVideo(this.chapter002.videoMd5.v44.md5, "v44"); - // this.getVideo(this.chapter002.videoMd5.v45.md5, "v45"); - // this.getVideo(this.chapter002.videoMd5.v46.md5, "v46"); - // this.getVideo(this.chapter002.videoMd5.v47.md5, "v47"); - // this.getVideo(this.chapter002.videoMd5.v48.md5, "v48"); - // }, 5000); - - setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v49.md5, "v49"); - // this.getVideo(this.chapter002.videoMd5.v50.md5, "v50"); - // this.getVideo(this.chapter002.videoMd5.v51.md5, "v51"); - // this.getVideo(this.chapter002.videoMd5.v52.md5, "v52"); - // this.getVideo(this.chapter002.videoMd5.v53.md5, "v53"); - // this.getVideo(this.chapter002.videoMd5.v54.md5, "v54"); - // this.getVideo(this.chapter002.videoMd5.v55.md5, "v55"); - // this.getVideo(this.chapter002.videoMd5.v56.md5, "v56"); - - - - // this.getVideo(this.chapter002.videoMd5.v57.md5, "v57"); - // this.getVideo(this.chapter002.videoMd5.v58.md5, "v58"); - // this.getVideo(this.chapter002.videoMd5.v59.md5, "v59"); - // this.getVideo(this.chapter002.videoMd5.v60.md5, "v60"); - // this.getVideo(this.chapter002.videoMd5.v61.md5, "v61"); - // this.getVideo(this.chapter002.videoMd5.v62.md5, "v62"); - // this.getVideo(this.chapter002.videoMd5.v63.md5, "v63"); - // this.getVideo(this.chapter002.videoMd5.v64.md5, "v64"); - }, 7000); - - setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v65.md5, "v65"); - // this.getVideo(this.chapter002.videoMd5.v66.md5, "v66"); - // this.getVideo(this.chapter002.videoMd5.v67.md5, "v67"); - // this.getVideo(this.chapter002.videoMd5.v68.md5, "v68"); - // this.getVideo(this.chapter002.videoMd5.v69.md5, "v69"); - // this.getVideo(this.chapter002.videoMd5.v70.md5, "v70"); - // this.getVideo(this.chapter002.videoMd5.v71.md5, "v71"); - // this.getVideo(this.chapter002.videoMd5.v72.md5, "v72"); - // this.getVideo(this.chapter002.videoMd5.v73.md5, "v73"); - // this.getVideo(this.chapter002.videoMd5.v74.md5, "v74"); - // this.getVideo(this.chapter002.videoMd5.v75.md5, "v75"); - // this.getVideo(this.chapter002.videoMd5.v76.md5, "v76"); - // this.getVideo(this.chapter002.videoMd5.v77.md5, "v77"); - // this.getVideo(this.chapter002.videoMd5.v78.md5, "v78"); - // this.getVideo(this.chapter002.videoMd5.v79.md5, "v79"); - // this.getVideo(this.chapter002.videoMd5.v80.md5, "v80"); - }, 9000); - - setTimeout(() => { - // this.getVideo(this.chapter002.videoMd5.v81.md5, "v81"); - // this.getVideo(this.chapter002.videoMd5.v82.md5, "v82"); - // this.getVideo(this.chapter002.videoMd5.v83.md5, "v83"); - // this.getVideo(this.chapter002.videoMd5.v84.md5, "v84"); - // this.getVideo(this.chapter002.videoMd5.v85.md5, "v85"); - // this.getVideo(this.chapter002.videoMd5.v86.md5, "v86"); - // this.getVideo(this.chapter002.videoMd5.v87.md5, "v87"); - // this.getVideo(this.chapter002.videoMd5.v88.md5, "v88"); - // this.getVideo(this.chapter002.videoMd5.v89.md5, "v89"); - // this.getVideo(this.chapter002.videoMd5.v90.md5, "v90"); - // this.getVideo(this.chapter002.videoMd5.v91.md5, "v91"); - // this.getVideo(this.chapter002.videoMd5.v92.md5, "v92"); - // this.getVideo(this.chapter002.videoMd5.v93.md5, "v93"); - // this.getVideo(this.chapter002.videoMd5.v94.md5, "v94"); - // this.getVideo(this.chapter002.videoMd5.v95.md5, "v95"); - }, 11000); - - setTimeout(() => { - - }, 13000); - - setTimeout(() => { - - }, 15000); - } }, methods: { @@ -3074,75 +2948,3 @@ }, }; </script> - -<style lang="less" scoped> -// b { -// color: #F79447; -// } - - -// .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> diff --git a/src/books/sportsAndHealth/view/components/chapter003.vue b/src/books/sportsAndHealth/view/components/chapter003.vue index 6b53d20..59f9985 100644 --- a/src/books/sportsAndHealth/view/components/chapter003.vue +++ b/src/books/sportsAndHealth/view/components/chapter003.vue @@ -5351,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" @@ -5362,6 +5365,9 @@ </span> <span @click="toUrl(2)">涔掍箵鐞冪殑甯哥敤鏈锛堜簩锛�.pdf</span> </div> + + + </div> <p> 涔掍箵鐞冭繍鍔ㄦ槸涓�椤圭敱涓ゅ悕鎴栧洓鍚嶈繍鍔ㄥ憳鍦ㄤ箳涔撶悆妗屼笂杩涜闅旂綉鏀诲畧鐨勮繍鍔紝鍦ㄤ笘鐣屼笂璁稿鍦版柟娴佽銆備箳涔撶悆杩愬姩1900骞磋捣婧愪簬鑻卞浗锛�20涓栫邯鍒濆湪娆ф床鍜屼簹娲茶摤鍕冨紑灞曡捣鏉ャ�備箳涔撶悆杩愬姩鏄撲簬寮�灞曪紝鎵撴硶澶氭牱锛岀悆璺彉鍖栦赴瀵岋紝鎶�鏈姩浣滆姹傚崗璋冦�佺伒鏁忋�佺簿纭紝瑙傝祻鎬у己銆備箳涔撶悆杩愬姩鑳芥湁鏁堝彂灞曞姏閲忋�侀�熷害銆佽�愬姏銆佺伒鏁忔�х瓑韬綋绱犺川锛屽悓鏃朵篃鑳介敾鐐煎拰鍩瑰吇鍕囨暍銆侀〗寮恒�佹満鏅恒�佹灉鏂瓑蹇冪悊鍝佽川銆備箳涔撶悆杩愬姩瀵逛粖鍚庝粠浜嬮渶涔呭潗銆佷箙绔欑殑鑱屼笟锛屽挨鍏舵槸闇�瑕佽繘琛岀簿缁嗗寲鎿嶄綔鐨勮亴涓氫汉缇よ韩浣撶姸鍐电殑鏀瑰杽鏈夌Н鏋佺殑浣滅敤銆傗�滀箳涔撶簿绁炩�濇墍钑村惈鐨勬妧鏈垱鏂板拰绮剧泭姹傜簿涔熸槸鍚屽浠簲璇ュ涔犲拰璺佃鐨勮亴涓氱簿绁炪�備箳涔撶悆杩愬姩鍦ㄥ浗鍐呭骞挎硾寮�灞曪紝涔掍箵鐞冧笘鐣屾澂銆佷笘閿﹁禌涓庡ゥ杩愪細骞剁О涓栫晫涔掍箵鐞冧笁澶ц禌浜嬨�� @@ -7523,25 +7529,18 @@ </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> + + <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> @@ -8594,4 +8593,3 @@ }, } </script> - diff --git a/src/books/sportsAndHealth/view/components/chapter004.vue b/src/books/sportsAndHealth/view/components/chapter004.vue index 628f986..9bd2f2d 100644 --- a/src/books/sportsAndHealth/view/components/chapter004.vue +++ b/src/books/sportsAndHealth/view/components/chapter004.vue @@ -444,8 +444,10 @@ </div> </div> <!-- 鏌ョ湅PDf寮规 --> + + <div class="pdf-text"> - <div class="pdf-con"> + <div class="pdf-con pdf-con-15"> <div class="pdf-view"> <span> <svg t="1717640665152" class="icon" viewBox="0 0 1024 1024" version="1.1" @@ -457,6 +459,12 @@ </span> <span @click="toUrl(4)">閫斾腑璺�--琛ュ厖瀛︾粌寤鸿.pdf</span> </div> + </div> + </div> + + + <div class="pdf-text"> + <div class="pdf-con pdf-con-15"> <div class="pdf-view"> <span> <svg t="1717640665152" class="icon" viewBox="0 0 1024 1024" version="1.1" @@ -468,6 +476,12 @@ </span> <span @click="toUrl(5)">瀛︿竴瀛︼細鍒嗛亾骞堕亾瑙勫垯.pdf</span> </div> + </div> + </div> + + + <div class="pdf-text"> + <div class="pdf-con pdf-con-15"> <div class="pdf-view"> <span> <svg t="1717640665152" class="icon" viewBox="0 0 1024 1024" version="1.1" @@ -479,6 +493,13 @@ </span> <span @click="toUrl(6)">璇曚竴璇曪細鍛煎惛鏂规硶涓庤妭濂�.pdf</span> </div> + </div> + </div> + + + + <div class="pdf-text"> + <div class="pdf-con pdf-con-15"> <div class="pdf-view"> <span> <svg t="1717640665152" class="icon" viewBox="0 0 1024 1024" version="1.1" @@ -492,6 +513,11 @@ </div> </div> </div> + + + + + </div> </div> </div> @@ -2688,8 +2714,6 @@ }; </script> <style lang="less" scoped> - - .img { font-family: "FZLTXIHJW"; text-align: center; diff --git a/src/books/sportsAndHealth/view/components/chapter005.vue b/src/books/sportsAndHealth/view/components/chapter005.vue index a3dff82..2a9bc6c 100644 --- a/src/books/sportsAndHealth/view/components/chapter005.vue +++ b/src/books/sportsAndHealth/view/components/chapter005.vue @@ -5080,4 +5080,3 @@ }, } </script> - diff --git a/src/books/sportsAndHealth/view/components/chapter006.vue b/src/books/sportsAndHealth/view/components/chapter006.vue index c3f6375..989564a 100644 --- a/src/books/sportsAndHealth/view/components/chapter006.vue +++ b/src/books/sportsAndHealth/view/components/chapter006.vue @@ -5271,70 +5271,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; -// } -// } -// } -</style> diff --git a/src/books/sportsAndHealth/view/components/chapter007.vue b/src/books/sportsAndHealth/view/components/chapter007.vue index 483aaef..ca8b391 100644 --- a/src/books/sportsAndHealth/view/components/chapter007.vue +++ b/src/books/sportsAndHealth/view/components/chapter007.vue @@ -2637,4 +2637,3 @@ }, } </script> - diff --git a/src/books/sportsAndHealth/view/components/chapter008.vue b/src/books/sportsAndHealth/view/components/chapter008.vue index 283221d..b81dd58 100644 --- a/src/books/sportsAndHealth/view/components/chapter008.vue +++ b/src/books/sportsAndHealth/view/components/chapter008.vue @@ -1928,4 +1928,3 @@ }, } </script> - diff --git a/src/books/sportsAndHealth/view/components/chapter009.vue b/src/books/sportsAndHealth/view/components/chapter009.vue index c8dc2fa..72971a8 100644 --- a/src/books/sportsAndHealth/view/components/chapter009.vue +++ b/src/books/sportsAndHealth/view/components/chapter009.vue @@ -4963,70 +4963,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; -// } -// } -// } -</style> diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue index ad7b16c..efd6c69 100644 --- a/src/books/sportsAndHealth/view/components/index.vue +++ b/src/books/sportsAndHealth/view/components/index.vue @@ -167,8 +167,8 @@ }, 500) // 娴嬭瘯椤甸潰璺宠浆 - // setTimeout(() => {/ - // this.gotoPage(4, 134) + // setTimeout(() => { + // this.gotoPage(5, 140) // setTimeout(() => { // this.renderSign("Highlight", { // id: "2ACA9359", diff --git a/src/components/pdfview/index.vue b/src/components/pdfview/index.vue index 501df42..ae6b84f 100644 --- a/src/components/pdfview/index.vue +++ b/src/components/pdfview/index.vue @@ -1,8 +1,11 @@ +<!-- @format --> + <template> - <div class="preview" v-if="this.preViewMd5"> - <div id="imageParent" class="imageBox"></div> - <div class="bottom_tool"> - <!-- <svg + <div class="pdfBox-component"> + <div class="preview" v-if="this.preViewMd5"> + <div id="imageParent" class="imageBox"></div> + <div class="bottom_tool"> + <!-- <svg t="1718330411310" @click="downloadPdf" class="icon" @@ -18,15 +21,21 @@ p-id="7122" ></path> </svg> --> + </div> </div> + + <div class="notBox" v-if="totalPage == 0 && !loading"> + <el-empty description="鏆傛棤鏁版嵁"></el-empty> + </div> + <div class="notBox" v-if="loading" v-loading="loading"></div> </div> </template> <script> -import Viewer from "viewerjs"; -import "viewerjs/dist/viewer.css"; -import { getResourcePath } from "@/assets/methods/resources"; +import Viewer from 'viewerjs' +import 'viewerjs/dist/viewer.css' +import { getResourcePath } from '@/assets/methods/resources' export default { - name: "pdf_view", + name: 'pdf_view', props: { md5: { type: String, @@ -41,160 +50,122 @@ }, data() { return { - currentPageSrc: "", + currentPageSrc: '', currentPage: 1, totalPage: 1, viewerCon: null, - preViewMd5: "", - }; + preViewMd5: '', + loading: false, + } }, watch: { isClear: { immediate: true, handler(val) { - if (val == true) this.preViewMd5 = ""; + if (val == true) this.preViewMd5 = '' }, }, md5: { immediate: true, handler(val) { if (val) { - this.preViewMd5 = val; - this.currentPage = 1; - this.currentPageSrc = ""; - this.totalPage = 1; - this.viewerCon?.destroy(); + this.preViewMd5 = val + this.currentPage = 1 + this.currentPageSrc = '' + this.totalPage = 1 + this.viewerCon?.destroy() } }, }, }, mounted() { - this.scrollBottom(); - this.clearDom(); - this.getFileInfo(); + this.scrollBottom() + this.clearDom() + this.getFileInfo() }, methods: { async downloadPdf() { - - window.open(await getResourcePath(this.preViewMd5)); - - - - - + window.open(await getResourcePath(this.preViewMd5)) }, domViewer() { - let ele = (this.container ? this.container : document).getElementById( - "imageParent" - ); + // let ele = (this.container ? this.container : document).getElementById( + // 'imageParent' + // ) + let ele = document.getElementById('imageParent') this.viewerCon = new Viewer(ele, { inline: false, container: this.container - ? this.container.querySelector("#app") - : "body", + ? this.container.querySelector('#app') + : 'body', navbar: true, // 鏄剧ず瀵艰埅鏍� toolbar: true, // 鏄剧ず宸ュ叿鏍� title: true, // 鏄剧ず鏍囬 - }); + }) }, clearDom() { - let ele = document.getElementById("imageParent"); - ele.innerHtml = ""; + let ele = document.getElementById('imageParent') + ele.innerHtml = '' }, createDom(page) { - var that = this; - let ele = document.getElementById("imageParent"); - const img = document.createElement("img"); - img.src = this.getPageImage(page); - img.alt = ""; - img.style.maxWidth = "90%"; - img.style.padding = "30px 5%"; - img.className = "imgHover"; + var that = this + let ele = document.getElementById('imageParent') + const img = document.createElement('img') + img.src = this.getPageImage(page) + img.alt = '' + img.style.maxWidth = '90%' + img.style.padding = '30px 5%' + img.className = 'imgHover' img.onclick = () => { - that.viewerCon?.destroy(); - that.domViewer(); - }; - ele.appendChild(img); + that.viewerCon?.destroy() + that.domViewer() + } + ele.appendChild(img) }, scrollBottom() { - var that = this; - var ele = document.getElementById("imageParent"); - ele.addEventListener("scroll", function () { + var that = this + var ele = document.getElementById('imageParent') + ele.addEventListener('scroll', function () { // 璁$畻婊氬姩鏉¤窛绂诲簳閮ㄧ殑浣嶇疆 - const scrollBottom = - ele.scrollHeight - ele.scrollTop - ele.clientHeight; + const scrollBottom = ele.scrollHeight - ele.scrollTop - ele.clientHeight if (scrollBottom <= 10) { - that.currentPage++; + that.currentPage++ if (that.currentPage <= that.totalPage) { - that.createDom(that.currentPage, ele); + that.createDom(that.currentPage, ele) } } - }); + }) }, getFileInfo() { // 鑾峰彇鐩綍 + this.loading = true this.MG.file .getPdfInfo({ md5: this.preViewMd5 }) .then((res) => { - this.totalPage = res.totalPages; - this.createDom(this.currentPage); + this.totalPage = res.totalPages + this.createDom(this.currentPage) + this.loading = false }) .catch((err) => { - this.totalPage = 1; - this.createDom(this.currentPage); - console.error(err); - }); + this.totalPage = 0 + this.createDom(this.currentPage) + console.error(err) + this.loading = false + }) }, getPageImage(page) { - const ctx = process.env.VUE_APP_API_URL; - console.log(this.preViewMd5); + const ctx = process.env.VUE_APP_API_URL + console.log(this.preViewMd5) return ( ctx + - "/file/GetPdfPageImage" + - "?md5=" + + '/file/GetPdfPageImage' + + '?md5=' + this.preViewMd5 + - "&index=" + + '&index=' + page + - "&dpi=200" - ); + '&dpi=200' + ) }, }, -}; -</script> -<style scoped lang="less"> -.preview { - width: 100%; - height: 100%; - - .imageBox { - height: calc(100% - 30px); - overflow-x: hidden; - overflow-y: auto; - background: #ccc; - box-sizing: border-box; - } - - .imageBox:hover { - cursor: zoom-in !important; - } - - .bottom_tool { - height: 30px; - background-color: rgba(0, 0, 0, 0.8); - display: flex; - justify-content: flex-end; - align-items: center; - - svg { - margin-right: 15px; - fill: #d1d1d1; - } - - svg:hover { - fill: #fff; - cursor: pointer; - } - } } -</style> +</script> -- Gitblit v1.9.1