From 1e5f5724f9f2c1c34efec7edb3f33bcfb98d66ba Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 23 七月 2024 14:21:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

---
 src/books/sportsAndHealth/view/components/testPp.vue |  198 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 174 insertions(+), 24 deletions(-)

diff --git a/src/books/sportsAndHealth/view/components/testPp.vue b/src/books/sportsAndHealth/view/components/testPp.vue
index 4a203fa..4c8e59f 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椤硅繍鍔ㄦ妧鑳姐�傘�婁腑绛夎亴涓氬鏍′綋鑲蹭笌鍋ュ悍璇剧▼鏍囧噯銆嬩腑鐨勮繍鍔ㄩ」鐩寘鍚悆绫昏繍鍔ㄣ�佺敯寰勭被杩愬姩銆佷綋鎿嶇被杩愬姩銆佹鏈笌姘戞棌姘戦棿浼犵粺浣撹偛绫昏繍鍔ㄣ�佹按涓婄被杩愬姩銆佸啺闆被杩愬姩銆佹柊鍏翠綋鑲茬被杩愬姩涓冨ぇ绫汇�傛瘡涓�绫昏繍鍔ㄩ兘鏈夊叾鐙壒鐨勪环鍊煎拰鍏磋叮鐐癸紝鍚屽浠彲浠ヤ粠杩欎簺绫诲瀷鐨勮繍鍔ㄤ腑鑷富閫夋嫨鑷繁鍠滅埍鐨勩�侀�傚疁鐨勮繍鍔ㄣ�傚悓瀛︿滑鍦ㄥ叿浣撻�夊鏌愪竴椤硅繍鍔ㄧ殑鏃跺�欙紝鏈�濂借兘澶熸寜鐓р�滄兂瀛︺�佽兘瀛︺�佸浼氣�濈殑鏍囧噯鏉ョ患鍚堝垽瀹氥�傗�滄兂瀛︹�濇槸鎸囧鏌愰」杩愬姩鏈夊叴瓒o紝鈥滆兘瀛︹�濇槸鎸囧叿澶囧缁冪殑鏉′欢锛屸�滃浼氣�濇槸涓�绉嶇粨鏋滆拷姹傘�傚缁冩帉鎻�1锝�2椤硅繍鍔ㄦ妧鑳斤紝杩欒兘澶熺湡姝e湴涓虹粓韬綋鑲插強鑱屼笟鍙戝睍濂犲畾鍩虹銆�
@@ -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>
@@ -1456,12 +1456,34 @@
         </div>
       </div>
     </div>
+    <div >
+      <el-dialog
+        :visible.sync="dialogVisible"
+        width="60vw"
+        top="2vh"
+        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>
   </div>
 </template>
 <script>
+import preView from "@/components/pdfview";
 import { getResourcePath } from "@/assets/methods/resources";
 export default {
   name: "testPp",
+  components: {
+    preView,
+  },
   props: {
     showPageList: {
       type: Array,
@@ -1476,27 +1498,75 @@
   },
   data() {
     return {
+      pdfTitle: "",
+      p_md5: "",
+      dialogVisible: false,
       isShowXyx02: false,
       pingpang: require("../../image/pdf.png"),
       chapter002: {
         isShowXyx01: true,
         textBybItem1: "",
         pdfMd5: {
-          1: "54741d14a21eb47b2ed06a2231271cd5",
-          2: "1b7ecc924bfab900ec10f0ed4bb2466b",
-          3: "f1597b91fb3110eb6fd59c84f5ddbfd1",
-          4: "515f3dd2554dbdea779c59800a8da6b2",
-          5: "b32afdfb8555ad8db1aa1fd95750369f",
-          6: "57481cd4e7e7ce535eb6585d375e317e",
-          7: "878a8bbb91f093107cae210ade9a387e",
-          8: "e242f94d2bdc54de7b5340d452256515",
-          9: "1ce6dc7953b1783de746e0de672ffbe4",
-          10: "030b943ad33a4c0f31524f0f1ec9c14f",
-          11: "2a458d11dc021318e2d3aa4f92cf3e36",
-          12: "81957321d71fd270f67fe74f7ef2b9e8",
-          13: "5f675eff789c96ce8a6cf80679c8a992",
-          14: "02236dec8a8e87176b1df2435b82fb87",
-          15: "fa38047ab9eed59f3296940778cc6cfd",
+          1: {
+            md5: "54741d14a21eb47b2ed06a2231271cd5",
+            name: "1 涔掍箵鐞冪殑甯哥敤鏈锛堜竴锛�",
+          },
+          2: {
+            md5: "1b7ecc924bfab900ec10f0ed4bb2466b",
+            name: "2 涔掍箵鐞冪殑甯哥敤鏈锛堜簩锛�",
+          },
+          3: {
+            md5: "f1597b91fb3110eb6fd59c84f5ddbfd1",
+            name: "3 妯″潡涓�锛堜竴锛夊崟椤规妧鏈缁� 骞冲嚮鍙戠悆",
+          },
+          4: {
+            md5: "515f3dd2554dbdea779c59800a8da6b3",
+            name: "4 妯″潡涓�锛堜簩锛夊熀鏈垬鏈缁� 鎺ュ钩鍑荤悆鎶㈡敾",
+          },
+          5: {
+            md5: "b32afdfb8555ad8db1aa1fd95750369f",
+            name: "5 妯″潡涓�锛堜笁锛夌粍鍚堟妧鑳界粌涔� 鎺ㄦ尅+渚ц韩鏀�",
+          },
+          6: {
+            md5: "57481cd4e7e7ce535eb6585d375e317e",
+            name: "6 妯″潡浜岋紙涓�锛夊崟椤规妧鏈缁� 姝f墜蹇甫",
+          },
+          7: {
+            md5: "878a8bbb91f093107cae210ade9a387e",
+            name: "7 妯″潡浜岋紙涓�锛夊崟椤规妧鏈缁� 杞笌涓嶈浆鐞冨彂鐞�",
+          },
+          8: {
+            md5: "e242f94d2bdc54de7b5340d452256515",
+            name: "8 妯″潡浜岋紙浜岋級鍩烘湰鎴樻湳瀛︾粌 鍙戣浆涓庝笉杞悆鎶㈡敾",
+          },
+          9: {
+            md5: "1ce6dc7953b1783de746e0de672ffbe4",
+            name: "9 妯″潡浜岋紙涓夛級缁勫悎鎶�鑳界粌涔� 宸︽帹+鍙虫敾",
+          },
+          10: {
+            md5: "030b943ad33a4c0f31524f0f1ec9c14f",
+            name: "10 妯″潡涓夛紙涓�锛夊崟椤规妧鏈缁� 寮у湀鐞�",
+          },
+          11: {
+            md5: "2a458d11dc021318e2d3aa4f92cf3e36",
+            name: "11 妯″潡涓夛紙涓�锛夊崟椤规妧鏈缁� 蹇悡",
+          },
+          12: {
+            md5: "81957321d71fd270f67fe74f7ef2b9e8",
+            name: "12 妯″潡涓夛紙涓�锛夊崟椤规妧鏈缁� 鍙嶆墜蹇嫧",
+          },
+          13: {
+            md5: "5f675eff789c96ce8a6cf80679c8a992",
+            name: "13 妯″潡涓夛紙浜岋級鍩烘湰鎴樻湳瀛︾粌 鎼撴敾鎴樻湳",
+          },
+          14: {
+            md5: "02236dec8a8e87176b1df2435b82fb87",
+            name: "14 妯″潡涓夛紙涓夛級缁勫悎鎶�鑳界粌涔� 鎺ㄦ尅+渚ц韩鏀�",
+          },
+          15: {
+            md5: "fa38047ab9eed59f3296940778cc6cfd",
+            name: "15 鎷撳睍璧勬枡锛氫箳涔撶悆瑁佸垽娉�",
+          },
         },
         videoMd5: {
           v1: { md5: "bfbb956d884e0a11ba6368846176657d", name: "1鏍稿績鎶�鏈�" },
@@ -1617,9 +1687,23 @@
     }
   },
   methods: {
-    async toUrl(val) {
+    closeDialog() {
+      this.dialogVisible = false;
+    },
+    toUrl(val) {
       if (val) {
-        window.open(await getResourcePath(this.chapter002.pdfMd5[val]));
+        const obj = {
+          type: "pdf",
+          data: {
+            md5: this.chapter002.pdfMd5[val].md5,
+            title: this.chapter002.pdfMd5[val].name,
+          },
+        };
+        this.$emit("openPDFChange", obj);
+
+        // this.dialogVisible = true;
+        // this.p_md5 = this.chapter002.pdfMd5[val].md5;
+        // this.pdfTitle = this.chapter002.pdfMd5[val].name;
       }
     },
     async getVideo(md5, val) {
@@ -1654,3 +1738,69 @@
   },
 };
 </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>

--
Gitblit v1.9.1