From ad59ed0f4fa6a728d8b258ea200f76a15f8ea935 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 13 六月 2024 15:53:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/mathBook/assets/images/0101-2.jpg | 0
.env.product | 6
vue.config.js | 26 ++
src/books/mathBook/assets/images/0103-1.jpg | 0
src/books/childHealth/view/content/components/header.vue | 4
src/books/lifeCare/css/default.less | 23 ++
src/books/mathBook/assets/images/question/0103-1-4.png | 0
src/books/mathBook/assets/images/0103-2.jpg | 0
src/books/mathBook/view/components/index.vue | 0
src/books/mathBook/view/index.vue | 0
src/books/childHealth/view/content/index.vue | 95 ++++---
src/books/lifeCare/view/components/chapter001.vue | 2
src/books/mathBook/assets/images/0100-1.jpg | 0
src/books/mathBook/assets/images/hzjl.jpg | 0
src/books/mathBook/view/components/chapter001.vue | 0
src/books/mathBook/assets/images/icon/heart-check.png | 0
src/books/mathBook/assets/images/0101-1.jpg | 0
src/books/mathBook/assets/images/wttc.jpg | 0
src/books/sportsAndHealth/view/components/testDynaicTable.vue | 21 -
src/books/mathBook/assets/images/question/0103-1-3.png | 0
src/books/mathBook/assets/images/Cover.jpg | 0
src/books/mathBook/assets/images/dy1.jpg | 0
src/books/mathBook/view/components/header.vue | 2
src/books/sportsAndHealth/css/default.less | 36 +++
src/books/mathBook/assets/images/tjfx.jpg | 0
src/books/mathBook/assets/images/tbts.jpg | 0
src/books/mathBook/assets/images/icon/heart.png | 0
src/books/childHealth/assets/main.less | 6
src/components/pdfview/index.vue | 220 ++++++++++++-------
.env | 3
src/books/mathBook/assets/images/0100-3.jpg | 0
src/books/mathBook/assets/images/xxmb.jpg | 0
src/books/sportsAndHealth/view/components/testPp.vue | 106 ++++++++-
src/books/mathBook/assets/images/0102-2.jpg | 0
src/books/mathBook/assets/images/question/0103-1-2.png | 0
src/books/sportsAndHealth/view/components/index.vue | 34 +-
src/books/mathBook/assets/images/Covers.png | 0
src/books/mathBook/assets/images/question/0103-1-1.png | 0
src/books/mathBook/assets/images/stlx.jpg | 0
src/books/mathBook/assets/images/cxgk.jpg | 0
src/books/mathBook/assets/main.less | 0
src/books/mathBook/assets/images/0102-1.jpg | 0
src/App.vue | 63 ++---
src/books/mathBook/assets/images/0100-2.jpg | 0
src/books/mathBook/assets/images/dy3.jpg | 0
45 files changed, 421 insertions(+), 226 deletions(-)
diff --git a/.env b/.env
index ba16ee5..c748e1e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
VUE_APP_ENV = 'dev'
VUE_APP_API_URL = "https://jsek.bnuic.com"
-PUBLIC_PATH = '/books/book'
\ No newline at end of file
+VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
+VUE_APP_PUBLIC_PATH = '/books/book'
\ No newline at end of file
diff --git a/.env.product b/.env.product
index 4df5688..eb40f51 100644
--- a/.env.product
+++ b/.env.product
@@ -1,4 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
-PUBLIC_PATH = 'http://182.92.203.7:3007/books/book'
-# PUBLIC_PATH = 'https://jsek.bnuic.com/books/book'
\ No newline at end of file
+VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/childHealth'
+VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
+VUE_APP_BOOK_ID = 'childHealth'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index d09f127..65f4077 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,25 +14,17 @@
</template>
<script>
-import childHealth from "./books/childHealth/view/index.vue";
-import lifeCare from "./books/lifeCare/view/index.vue";
-import embedded from "./books/embedded/view/index.vue";
-import english from "./books/English/view/index.vue";
-import sportsAndHealth from "./books/sportsAndHealth/view/index";
-import artAndDance from './books/artAndDance/view/index.vue'
-import mathBook from './books/math/view/index.vue'
-import artAndDrama from './books/artAndDrama/view/index.vue'
export default {
name: "App",
components: {
- childHealth,
- lifeCare,
- embedded,
- english,
- sportsAndHealth,
- artAndDance,
- mathBook,
- artAndDrama
+ childHealth: () => import("./books/childHealth/view/index.vue"),
+ lifeCare: () => import("./books/lifeCare/view/index.vue"),
+ embedded: () => import("./books/embedded/view/index.vue"),
+ english: () => import("./books/english/view/index.vue"),
+ sportsAndHealth: () => import("./books/sportsAndHealth/view/index.vue"),
+ artAndDance: () => import("./books/artAndDance/view/index.vue"),
+ mathBook: () => import("./books/mathBook/view/index.vue"),
+ artAndDrama: () => import("./books/artAndDrama/view/index.vue")
},
data() {
return {
@@ -43,20 +35,11 @@
if (this.setGlobalState) {
this.setGlobalState({
initTestBook: async (bookId, tryPageCount) => {
- // this.activeBook = await this.config.getBookConfig(this.config.resourceCtx + bookId);
- if (
- // "http://182.92.203.7:3007/books/resource/"
- // "https://jsek.bnuic.com/books/resource/"
- this.config.resourceCtx ==
- "http://182.92.203.7:3007/books/resource/"
- ) {
- this.config.resourceCtx = this.config.resourceCtx + bookId;
- }
+ this.activeBook = await this.config.getBookConfig(
+ process.env.VUE_APP_RESOURCE_CTX + process.env.VUE_APP_BOOK_ID
+ );
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
- this.activeBook = await this.config.getBookConfig(
- this.config.resourceCtx
- );
if (tryPageCount) {
this.activeBook.tryPageCount = tryPageCount;
}
@@ -70,16 +53,19 @@
}
});
} else {
+ // childHealth
+ // lifeCare
+ // sportsAndHealth
+ // embedded
+ // english
+ // artAndDance
+ // artAndDrama
+ // mathBook
this.activeBook = await this.config.getBookConfig(
- // childHealth
- // lifeCare
- // sportsAndHealth
- // embedded
- // english
- // artAndDance
- // artAndDrama
- // math
- this.config.resourceCtx + "mathBook"
+ process.env.VUE_APP_RESOURCE_CTX +
+ (process.env.VUE_APP_ENV == "product"
+ ? process.env.VUE_APP_BOOK_ID
+ : "childHealth")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
@@ -181,8 +167,7 @@
margin: auto;
}
-
-.openImgBox img{
+.openImgBox img {
cursor: zoom-in;
}
</style>
diff --git a/src/books/childHealth/assets/main.less b/src/books/childHealth/assets/main.less
index 3c5978a..ca1fb4d 100644
--- a/src/books/childHealth/assets/main.less
+++ b/src/books/childHealth/assets/main.less
@@ -454,7 +454,7 @@
}
.page-box {
box-sizing: border-box;
- min-height: 1150px ;
+ min-height: 1150px;
margin-bottom: 20px;
box-shadow: 0 3px 6px 1px #00000029;
background-color: #fff;
@@ -658,6 +658,10 @@
.video-box {
max-width: 260px;
}
+
+ .page-box{
+ min-height: 500px;
+ }
}
}
@media (min-width: 660px) {
diff --git a/src/books/childHealth/view/content/components/header.vue b/src/books/childHealth/view/content/components/header.vue
index 6697a35..2f07ec9 100644
--- a/src/books/childHealth/view/content/components/header.vue
+++ b/src/books/childHealth/view/content/components/header.vue
@@ -1,12 +1,12 @@
<template>
<div class="chapter" num="1">
<!-- 灏侀潰 -->
- <div class="page-box cover mt-20" page="1" style="min-height:auto">
+ <div class="page-box cover mt-20" page="1">
<div v-if="showPageList.indexOf(1) > -1">
<img src="../../../assets/images/Covers.jpg" alt="" />
</div>
</div>
- <div class="page-box cover" page="2" style="min-height:auto">
+ <div class="page-box cover" page="2">
<div v-if="showPageList.indexOf(2) > -1">
<img src="../../../assets/images/Cover.jpg" alt="" />
</div>
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index b2392ea..843a3da 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -8,7 +8,7 @@
:style="{
fontSize: fontSize ? fontSize + 'px' : '16px',
transform: `scale(${pageZoom ? pageZoom : 1})`,
- transformOrigin: 'center top',
+ transformOrigin: 'center top'
}"
>
<pageHeader
@@ -122,7 +122,7 @@
loadPageList: [],
questionDataMap: {},
renderSignMap: {},
- highlightData: null,
+ highlightData: null
};
},
computed: {
@@ -131,7 +131,7 @@
},
pageZoom() {
return this.$store.state.qiankun.scale / 100;
- },
+ }
},
watch: {
showCatalogList: {
@@ -142,7 +142,7 @@
) {
// 璋冪敤鐖跺眰鏂规硶
this.$store.state.qiankun.catalogChange({
- showCatalogList: newVal,
+ showCatalogList: newVal
});
}
// 鍚姩椤电爜瑙傚療
@@ -150,7 +150,7 @@
this.initObservation();
this.initThemeColor();
}, 500);
- },
+ }
},
loadPageList: {
handler(newVal, oldVal) {
@@ -158,7 +158,7 @@
this.initSwiper();
this.initViewer();
}, 200);
- },
+ }
},
pageZoom: {
handler(newVal, oldVal) {
@@ -166,12 +166,12 @@
this.container ? this.container : document
).querySelector(".page-main");
scrollBox.scrollTop = (scrollBox.scrollTop / oldVal) * newVal;
- },
- },
+ }
+ }
},
mounted() {
// 榛樿鍔犺浇绔犺妭
- this.showCatalogList = [8];
+ this.showCatalogList = [1];
// 婊氬姩鐩戝惉鑺傛祦
this.throttledScrollHandler = _.throttle(
this.scrollFun,
@@ -202,7 +202,7 @@
// 璺宠浆妫�绱㈢粨鏋滀綅缃�
jumpSearchItem: (data) => {
this.searchItemLocation(data);
- },
+ }
});
}
@@ -211,13 +211,13 @@
this.observer = new IntersectionObserver(this.pageChangeCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0.5, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0.5 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
this.loadPageObserver = new IntersectionObserver(this.loadPageCallback, {
root: null, // 鎸囧畾鏍瑰厓绱狅紝杩欓噷璁句负 null锛岃〃绀洪�夊彇鏁翠釜瑙嗙獥浣滀负鏍瑰厓绱犮��
rootMargin: "0px", // 鎸囧畾鏍瑰厓绱犵殑杈圭晫锛岃繖閲岃涓� "0px"锛岃〃绀烘牴鍏冪礌鐨勮竟鐣屽拰瑙嗙獥鐨勮竟鐣岄噸鍚�
- threshold: 0, // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
+ threshold: 0 // 鎸囧畾浜ゅ弶姣斾緥锛岃繖閲岃涓� 0.5锛岃〃绀哄綋鐩爣鍏冪礌涓�鍗婃垨鏇村鏄剧ず鍦ㄨ绐椾腑鏃惰Е鍙戝洖璋冨嚱鏁般��
});
// 鍚姩椤电爜瑙傚療
@@ -228,7 +228,7 @@
// 娴嬭瘯椤甸潰璺宠浆
// setTimeout(() => {
- // this.gotoPage(1, 10);
+ // this.gotoPage(1,10);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -256,7 +256,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- // }, 5000);
+ // }, 500);
},
methods: {
// setZoom1() {
@@ -328,7 +328,7 @@
this.showCatalogList = [
this.catalogLength - 2,
this.catalogLength - 1,
- this.catalogLength,
+ this.catalogLength
];
} else {
this.showCatalogList = [catalog - 1, catalog, catalog + 1];
@@ -378,7 +378,10 @@
this.container ? this.container : document
).querySelector(`[page="${data.page}"]`);
// 鍒涘缓 createTreeWalker 杩唬鍣紝鐢ㄤ簬閬嶅巻鏂囨湰鑺傜偣锛屼繚瀛樺埌涓�涓暟缁�
- const treeWalker = document.createTreeWalker(pageDom, NodeFilter.SHOW_TEXT);
+ const treeWalker = document.createTreeWalker(
+ pageDom,
+ NodeFilter.SHOW_TEXT
+ );
const allTextNodes = [];
let currentNode = treeWalker.nextNode();
while (currentNode) {
@@ -584,7 +587,7 @@
this.$store.state.qiankun.pageChange({
page: page,
catalog: catalog,
- text,
+ text
});
// const sections = Array.from(document.querySelectorAll(".section"));
//sections锛氳幏鍙栨墍鏈夊叿鏈� .section 绫诲悕鐨勫厓绱狅紝骞惰浆鎹负鏁扮粍銆�
@@ -610,19 +613,19 @@
if (testData && testData[catalog]) {
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
- this.questionDataMap[page] = await getQuestionList(
- page,
- testData[catalog][page],
- this.config.activeBook
- );
+ this.questionDataMap[page] = await getQuestionList(
+ page,
+ testData[catalog][page],
+ this.config.activeBook
+ );
} else {
const obj = {};
for (let key in testData[catalog][page]) {
- obj[key] = await getQuestionList(
- [],
- testData[catalog][page][key],
- this.config.activeBook
- );
+ obj[key] = await getQuestionList(
+ [],
+ testData[catalog][page][key],
+ this.config.activeBook
+ );
}
this.questionDataMap[page] = obj;
}
@@ -642,7 +645,10 @@
// 楂樹寒琛�
setTimeout(() => {
// 鑾峰彇椤甸潰鎵�鏈塼ext鑺傜偣
- const pageTextList = document.createTreeWalker(target, NodeFilter.SHOW_TEXT);
+ const pageTextList = document.createTreeWalker(
+ target,
+ NodeFilter.SHOW_TEXT
+ );
// 鍖归厤鍏抽敭瀛�
const allPageTextNodes = [];
let currentNode = pageTextList.nextNode();
@@ -686,7 +692,7 @@
autoplay: {
//鑷姩寮�濮�
delay: 3000, //鏃堕棿闂撮殧
- disableOnInteraction: false, //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
+ disableOnInteraction: false //*鎵嬪姩鎿嶄綔杞挱鍥惧悗涓嶄細鏆傚仠*
},
paginationClickable: true,
slidesPerView: 1, // 涓�缁勪笁涓�
@@ -698,11 +704,11 @@
),
prevEl: (this.container ? this.container : document).querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
- observeParents: true,
+ observeParents: true
// // 濡傛灉闇�瑕佸垎椤靛櫒
// pagination: {
// el: (this.container ? this.container : document).querySelector(
@@ -730,7 +736,7 @@
),
prevEl: (this.container ? this.container : document).querySelector(
".swiper-button-prev"
- ),
+ )
},
// 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔�
observer: true,
@@ -749,8 +755,8 @@
var paginationInfoEl = dom.querySelector(".pageBox");
if (paginationInfoEl)
paginationInfoEl.textContent = currentPage + "/" + totalPages;
- },
- },
+ }
+ }
});
}
},
@@ -766,7 +772,7 @@
: "body",
navbar: true, // 鏄剧ず瀵艰埅鏍�
toolbar: true, // 鏄剧ず宸ュ叿鏍�
- title: true, // 鏄剧ず鏍囬
+ title: true // 鏄剧ず鏍囬
});
}
},
@@ -789,7 +795,7 @@
chapterTen,
chapterEleven,
chapterTwelve,
- chapterThirteen,
+ chapterThirteen
};
// 閬嶅巻鎵�鏈夌珷鑺傛枃浠�
for (const key in pageData) {
@@ -802,7 +808,7 @@
showPageList: [],
questionData: {},
isSearch: true
- },
+ }
});
pageExample.$mount(
(this.container ? this.container : document).querySelector(
@@ -834,7 +840,7 @@
showPageList: [pageNum],
questionData: {},
isSearch: true
- },
+ }
});
pageExample.$mount(
(this.container ? this.container : document).querySelector(
@@ -847,7 +853,10 @@
.querySelector(`[page="${pageNum}"]`);
if (thisPageDom) {
// 鑾峰彇椤甸潰鎵�鏈塼ext鑺傜偣
- const pageTextList = document.createTreeWalker(thisPageDom, NodeFilter.SHOW_TEXT);
+ const pageTextList = document.createTreeWalker(
+ thisPageDom,
+ NodeFilter.SHOW_TEXT
+ );
// 鍖归厤鍏抽敭瀛�
const allPageTextNodes = [];
let currentNode = pageTextList.nextNode();
@@ -864,7 +873,7 @@
page: pageNum,
catalog: catalogIndex,
txt: textDom.textContent,
- txtIndex: txtIndex,
+ txtIndex: txtIndex
});
}
}
@@ -887,7 +896,7 @@
this.highlightData = data;
// 璺宠浆
this.gotoPage(data.catalog, data.page, () => {});
- },
+ }
},
components: {
pageHeader,
@@ -903,8 +912,8 @@
chapterTen,
chapterEleven,
chapterTwelve,
- chapterThirteen,
- },
+ chapterThirteen
+ }
};
</script>
diff --git a/src/books/lifeCare/css/default.less b/src/books/lifeCare/css/default.less
index a88af5e..0e59f3f 100644
--- a/src/books/lifeCare/css/default.less
+++ b/src/books/lifeCare/css/default.less
@@ -256,6 +256,29 @@
.chapter {
font-family: "瀹嬩綋";
+ .bk1-h3 {
+ border: 2px solid #a5c24f;
+ color: #a5c24f;
+ font-weight: normal;
+ height: 35px;
+ border-top-right-radius: 25px;
+ border-bottom-right-radius: 25px;
+ display: inline-flex;
+ justify-content: space-between;
+ align-items: center;
+
+ span {
+ color: #fff;
+ display: inline-block;
+ width: 50px;
+ height: 100%;
+ line-height: 35px;
+ text-align: center;
+ box-sizing: border-box;
+ background-color: #a5c24f;
+ }
+ }
+
.topImg {
padding-top: 0 !important;
margin-bottom: 2em;
diff --git a/src/books/lifeCare/view/components/chapter001.vue b/src/books/lifeCare/view/components/chapter001.vue
index 22db22e..818d404 100644
--- a/src/books/lifeCare/view/components/chapter001.vue
+++ b/src/books/lifeCare/view/components/chapter001.vue
@@ -1386,7 +1386,7 @@
</div>
<div class="bodystyle">
<p>璧拌鐨勬墭鑲插洯涓�鏃ョ敓娲讳繚鑲茶姹傚強鍏蜂綋鍐呭瑙佽〃1-1-3銆�</p>
- <p class="img">琛�1-1-3銆�______鎵樿偛鍥竴鏃ョ敓娲讳繚鑲茶姹傚強鍏蜂綋鍐呭</p>
+ <p class="img">琛�1-1-3<input type="text" maxlength="6" v-model="chapter001.text113Item" class="tk-line"/>鎵樿偛鍥竴鏃ョ敓娲讳繚鑲茶姹傚強鍏蜂綋鍐呭</p>
<div style="margin-bottom: 40px">
<table class="table112 table113">
<thead>
diff --git a/src/books/math/assets/images/0100-1.jpg b/src/books/mathBook/assets/images/0100-1.jpg
similarity index 100%
rename from src/books/math/assets/images/0100-1.jpg
rename to src/books/mathBook/assets/images/0100-1.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0100-2.jpg b/src/books/mathBook/assets/images/0100-2.jpg
similarity index 100%
rename from src/books/math/assets/images/0100-2.jpg
rename to src/books/mathBook/assets/images/0100-2.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0100-3.jpg b/src/books/mathBook/assets/images/0100-3.jpg
similarity index 100%
rename from src/books/math/assets/images/0100-3.jpg
rename to src/books/mathBook/assets/images/0100-3.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0101-1.jpg b/src/books/mathBook/assets/images/0101-1.jpg
similarity index 100%
rename from src/books/math/assets/images/0101-1.jpg
rename to src/books/mathBook/assets/images/0101-1.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0101-2.jpg b/src/books/mathBook/assets/images/0101-2.jpg
similarity index 100%
rename from src/books/math/assets/images/0101-2.jpg
rename to src/books/mathBook/assets/images/0101-2.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0102-1.jpg b/src/books/mathBook/assets/images/0102-1.jpg
similarity index 100%
rename from src/books/math/assets/images/0102-1.jpg
rename to src/books/mathBook/assets/images/0102-1.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0102-2.jpg b/src/books/mathBook/assets/images/0102-2.jpg
similarity index 100%
rename from src/books/math/assets/images/0102-2.jpg
rename to src/books/mathBook/assets/images/0102-2.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0103-1.jpg b/src/books/mathBook/assets/images/0103-1.jpg
similarity index 100%
rename from src/books/math/assets/images/0103-1.jpg
rename to src/books/mathBook/assets/images/0103-1.jpg
Binary files differ
diff --git a/src/books/math/assets/images/0103-2.jpg b/src/books/mathBook/assets/images/0103-2.jpg
similarity index 100%
rename from src/books/math/assets/images/0103-2.jpg
rename to src/books/mathBook/assets/images/0103-2.jpg
Binary files differ
diff --git a/src/books/math/assets/images/Cover.jpg b/src/books/mathBook/assets/images/Cover.jpg
similarity index 100%
rename from src/books/math/assets/images/Cover.jpg
rename to src/books/mathBook/assets/images/Cover.jpg
Binary files differ
diff --git a/src/books/math/assets/images/Covers.png b/src/books/mathBook/assets/images/Covers.png
similarity index 100%
rename from src/books/math/assets/images/Covers.png
rename to src/books/mathBook/assets/images/Covers.png
Binary files differ
diff --git a/src/books/math/assets/images/cxgk.jpg b/src/books/mathBook/assets/images/cxgk.jpg
similarity index 100%
rename from src/books/math/assets/images/cxgk.jpg
rename to src/books/mathBook/assets/images/cxgk.jpg
Binary files differ
diff --git a/src/books/math/assets/images/dy1.jpg b/src/books/mathBook/assets/images/dy1.jpg
similarity index 100%
rename from src/books/math/assets/images/dy1.jpg
rename to src/books/mathBook/assets/images/dy1.jpg
Binary files differ
diff --git a/src/books/math/assets/images/dy3.jpg b/src/books/mathBook/assets/images/dy3.jpg
similarity index 100%
rename from src/books/math/assets/images/dy3.jpg
rename to src/books/mathBook/assets/images/dy3.jpg
Binary files differ
diff --git a/src/books/math/assets/images/hzjl.jpg b/src/books/mathBook/assets/images/hzjl.jpg
similarity index 100%
rename from src/books/math/assets/images/hzjl.jpg
rename to src/books/mathBook/assets/images/hzjl.jpg
Binary files differ
diff --git a/src/books/math/assets/images/icon/heart-check.png b/src/books/mathBook/assets/images/icon/heart-check.png
similarity index 100%
rename from src/books/math/assets/images/icon/heart-check.png
rename to src/books/mathBook/assets/images/icon/heart-check.png
Binary files differ
diff --git a/src/books/math/assets/images/icon/heart.png b/src/books/mathBook/assets/images/icon/heart.png
similarity index 100%
rename from src/books/math/assets/images/icon/heart.png
rename to src/books/mathBook/assets/images/icon/heart.png
Binary files differ
diff --git a/src/books/math/assets/images/question/0103-1-1.png b/src/books/mathBook/assets/images/question/0103-1-1.png
similarity index 100%
rename from src/books/math/assets/images/question/0103-1-1.png
rename to src/books/mathBook/assets/images/question/0103-1-1.png
Binary files differ
diff --git a/src/books/math/assets/images/question/0103-1-2.png b/src/books/mathBook/assets/images/question/0103-1-2.png
similarity index 100%
rename from src/books/math/assets/images/question/0103-1-2.png
rename to src/books/mathBook/assets/images/question/0103-1-2.png
Binary files differ
diff --git a/src/books/math/assets/images/question/0103-1-3.png b/src/books/mathBook/assets/images/question/0103-1-3.png
similarity index 100%
rename from src/books/math/assets/images/question/0103-1-3.png
rename to src/books/mathBook/assets/images/question/0103-1-3.png
Binary files differ
diff --git a/src/books/math/assets/images/question/0103-1-4.png b/src/books/mathBook/assets/images/question/0103-1-4.png
similarity index 100%
rename from src/books/math/assets/images/question/0103-1-4.png
rename to src/books/mathBook/assets/images/question/0103-1-4.png
Binary files differ
diff --git a/src/books/math/assets/images/stlx.jpg b/src/books/mathBook/assets/images/stlx.jpg
similarity index 100%
rename from src/books/math/assets/images/stlx.jpg
rename to src/books/mathBook/assets/images/stlx.jpg
Binary files differ
diff --git a/src/books/math/assets/images/tbts.jpg b/src/books/mathBook/assets/images/tbts.jpg
similarity index 100%
rename from src/books/math/assets/images/tbts.jpg
rename to src/books/mathBook/assets/images/tbts.jpg
Binary files differ
diff --git a/src/books/math/assets/images/tjfx.jpg b/src/books/mathBook/assets/images/tjfx.jpg
similarity index 100%
rename from src/books/math/assets/images/tjfx.jpg
rename to src/books/mathBook/assets/images/tjfx.jpg
Binary files differ
diff --git a/src/books/math/assets/images/wttc.jpg b/src/books/mathBook/assets/images/wttc.jpg
similarity index 100%
rename from src/books/math/assets/images/wttc.jpg
rename to src/books/mathBook/assets/images/wttc.jpg
Binary files differ
diff --git a/src/books/math/assets/images/xxmb.jpg b/src/books/mathBook/assets/images/xxmb.jpg
similarity index 100%
rename from src/books/math/assets/images/xxmb.jpg
rename to src/books/mathBook/assets/images/xxmb.jpg
Binary files differ
diff --git a/src/books/math/assets/main.less b/src/books/mathBook/assets/main.less
similarity index 100%
rename from src/books/math/assets/main.less
rename to src/books/mathBook/assets/main.less
diff --git a/src/books/math/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue
similarity index 100%
rename from src/books/math/view/components/chapter001.vue
rename to src/books/mathBook/view/components/chapter001.vue
diff --git a/src/books/math/view/components/header.vue b/src/books/mathBook/view/components/header.vue
similarity index 99%
rename from src/books/math/view/components/header.vue
rename to src/books/mathBook/view/components/header.vue
index ef77509..91d39fb 100644
--- a/src/books/math/view/components/header.vue
+++ b/src/books/mathBook/view/components/header.vue
@@ -81,7 +81,7 @@
props: {
showPageList: {
type: Array,
- default: [],
+ // default: [],
},
data() {
return {};
diff --git a/src/books/math/view/components/index.vue b/src/books/mathBook/view/components/index.vue
similarity index 100%
rename from src/books/math/view/components/index.vue
rename to src/books/mathBook/view/components/index.vue
diff --git a/src/books/math/view/index.vue b/src/books/mathBook/view/index.vue
similarity index 100%
rename from src/books/math/view/index.vue
rename to src/books/mathBook/view/index.vue
diff --git a/src/books/sportsAndHealth/css/default.less b/src/books/sportsAndHealth/css/default.less
index 94cd6a1..5e889a2 100644
--- a/src/books/sportsAndHealth/css/default.less
+++ b/src/books/sportsAndHealth/css/default.less
@@ -18,7 +18,6 @@
font-size: 18px;
.chapter {
-
textarea {
width: 100%;
font-family: 'FZLTXIHJW';
@@ -1732,7 +1731,42 @@
}
}
+.pdfModal {
+ width: 100%;
+ height: 90vh;
+}
+@media screen and (max-width:800px) {
+ .pdfModal {
+ width: 100%;
+ height: 60vh;
+ }
+
+ .custom-dialog {
+ .el-dialog {
+ width: 90vw !important;
+ }
+ }
+}
+
+
+.custom-dialog {
+ .el-dialog__body {
+ padding: 0;
+ }
+
+ .el-dialog__header {
+ background-color: rgba(0, 0, 0, 0.8);
+
+ .el-dialog__title,
+ .el-dialog__headerbtn .el-dialog__close {
+ color: #fff;
+ font-weight: 900;
+ font-size: 16px;
+ font-family: 'FZLTXIHJW';
+ }
+ }
+}
.tablePublic input[type="checkbox"]:checked+.checkmark {
background: #000 !important;
diff --git a/src/books/sportsAndHealth/view/components/index.vue b/src/books/sportsAndHealth/view/components/index.vue
index 8b6a584..2348ec2 100644
--- a/src/books/sportsAndHealth/view/components/index.vue
+++ b/src/books/sportsAndHealth/view/components/index.vue
@@ -264,11 +264,8 @@
},
methods: {
changeDomViewer() {
- setTimeout(() => {
- this.initViewer();
- }, 500);
+ this.initViewer();
},
-
// 婊氬姩鐩戝惉
scrollFun(event) {
// 鍒ゆ柇鍚戜笂婊氬姩杩樻槸鍚戜笅婊氬姩
@@ -605,19 +602,19 @@
if (testData && testData[catalog]) {
if (testData[catalog][page]) {
if (Array.isArray(testData[catalog][page])) {
- this.questionDataMap[page] = await getQuestionList(
- page,
- testData[catalog][page],
- this.config.activeBook
- );
+ this.questionDataMap[page] = await getQuestionList(
+ page,
+ testData[catalog][page],
+ this.config.activeBook
+ );
} else {
const obj = {};
for (let key in testData[catalog][page]) {
- obj[key] = await getQuestionList(
- [],
- testData[catalog][page][key],
- this.config.activeBook
- );
+ obj[key] = await getQuestionList(
+ [],
+ testData[catalog][page][key],
+ this.config.activeBook
+ );
}
this.questionDataMap[page] = obj;
}
@@ -638,7 +635,10 @@
// 楂樹寒琛�
setTimeout(() => {
// 鑾峰彇椤甸潰鎵�鏈塼ext鑺傜偣
- const pageTextList = document.createTreeWalker(target, NodeFilter.SHOW_TEXT);
+ const pageTextList = document.createTreeWalker(
+ target,
+ NodeFilter.SHOW_TEXT
+ );
// 鍖归厤鍏抽敭瀛�
const allPageTextNodes = [];
let currentNode = pageTextList.nextNode();
@@ -814,7 +814,7 @@
propsData: {
showPageList: [],
questionData: {},
- isSearch: true
+ isSearch: true,
},
});
pageExample.$mount(
@@ -846,7 +846,7 @@
propsData: {
showPageList: [pageNum],
questionData: {},
- isSearch: true
+ isSearch: true,
},
});
pageExample.$mount(
diff --git a/src/books/sportsAndHealth/view/components/testDynaicTable.vue b/src/books/sportsAndHealth/view/components/testDynaicTable.vue
index e9a1656..ec82452 100644
--- a/src/books/sportsAndHealth/view/components/testDynaicTable.vue
+++ b/src/books/sportsAndHealth/view/components/testDynaicTable.vue
@@ -114,22 +114,11 @@
</div>
</div>
</div>
- <!-- <div class="page-box" page="226">
- <div v-if="showPageList.indexOf(226)>-1">
- <div class="bodystyle">
- <pdfView :md5="md5"></pdfView>
- </div>
- </div>
- </div> -->
</div>
</template>
<script>
-// import pdfView from '@/components/pdfview'
export default {
name: "testD",
- // components:{
- // pdfView
- // },
props: {
showPageList: {
type: Array,
@@ -138,10 +127,12 @@
type: Object,
},
},
- data(){
+ methods: {},
+ data() {
return {
- md5:'54741d14a21eb47b2ed06a2231271cd5'
- }
- }
+ md5: "54741d14a21eb47b2ed06a2231271cd5",
+ dialogVisible: true,
+ };
+ },
};
</script>
diff --git a/src/books/sportsAndHealth/view/components/testPp.vue b/src/books/sportsAndHealth/view/components/testPp.vue
index 4a203fa..334f9ad 100644
--- a/src/books/sportsAndHealth/view/components/testPp.vue
+++ b/src/books/sportsAndHealth/view/components/testPp.vue
@@ -1456,12 +1456,31 @@
</div>
</div>
</div>
+ <div>
+ <el-dialog
+ size="small"
+ :title="pdfTitle"
+ :visible.sync="dialogVisible"
+ width="60vw"
+ :before-close="handleClose"
+ append-to-body
+ class="custom-dialog"
+ >
+ <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 +1495,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: "515f3dd2554dbdea779c59800a8da6b2",
+ name: "4 妯″潡涓�锛堜簩锛夊熀鏈垬鏈缁� 鎺ュ钩鍑荤悆鎶㈡敾",
+ },
+ 5: {
+ md5: "b32afdfb8555ad8db1aa1fd95750369f",
+ name: "5 妯″潡涓�锛堜笁锛夌粍鍚堟妧鑳界粌涔� 鎺ㄦ尅+渚ц韩鏀�",
+ },
+ 6: {
+ md5: "57481cd4e7e7ce535eb6585d375e317e",
+ name: "6 妯″潡浜岋紙涓�锛夊崟椤规妧鏈缁� 姝ｆ墜蹇甫",
+ },
+ 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 +1684,14 @@
}
},
methods: {
- async toUrl(val) {
+ handleClose(done) {
+ done();
+ },
+ toUrl(val) {
if (val) {
- window.open(await getResourcePath(this.chapter002.pdfMd5[val]));
+ this.dialogVisible = true;
+ this.p_md5 = this.chapter002.pdfMd5[val].md5;
+ this.pdfTitle = this.chapter002.pdfMd5[val].name;
}
},
async getVideo(md5, val) {
diff --git a/src/components/pdfview/index.vue b/src/components/pdfview/index.vue
index fa18ac8..4e64d88 100644
--- a/src/components/pdfview/index.vue
+++ b/src/components/pdfview/index.vue
@@ -1,16 +1,31 @@
<template>
- <div class="imgbox">
- <img
- ref="image"
- :onLoad="initFun"
- :onDragStart="dragStart"
- :onWheel="handleScroll"
- :src="currentPageSrc"
- alt=""
- />
+ <div class="preview" v-if="this.preViewMd5">
+ <div id="imageParent" class="imageBox"></div>
+ <div class="bottom_tool">
+ <svg
+ @click="downloadPdf"
+ t="1718251204993"
+ class="icon"
+ viewBox="0 0 1024 1024"
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ p-id="4418"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="25"
+ height="25"
+ >
+ <path
+ d="M557 564.974l153.188-181.04c16.054-18.972 44.448-21.34 63.42-5.286 18.972 16.054 21.338 44.448 5.284 63.42L550.56 711.92a44.982 44.982 0 0 1-8.95 10.254 44.872 44.872 0 0 1-15.082 8.432A44.944 44.944 0 0 1 512 733c-16.264 0-30.512-8.628-38.42-21.556L245.65 442.068c-16.052-18.972-13.686-47.366 5.286-63.42 18.972-16.052 47.366-13.686 63.42 5.286l152.646 180.4V157c0-24.852 20.148-45 45-45s45 20.148 45 45v407.974zM823 630c0-24.852 20.148-45 45-45s45 20.148 45 45v238c0 24.87-20.176 45.026-45.046 45l-710-0.726c-24.834-0.026-44.954-20.166-44.954-45V630c0-24.852 20.148-45 45-45s45 20.148 45 45v192.32l620 0.634V630z"
+ p-id="4419"
+ ></path>
+ </svg>
+ </div>
</div>
</template>
<script>
+import Viewer from "viewerjs";
+import "viewerjs/dist/viewer.css";
+import { getResourcePath } from "@/assets/methods/resources";
export default {
name: "pdf_view",
props: {
@@ -20,126 +35,163 @@
title: {
type: String,
},
+ isClear: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
currentPageSrc: "",
- fileLoading: false,
- visible: true,
- close: null,
currentPage: 1,
totalPage: 1,
- rcViewerOptions: {
- // inline: true
- },
- zoom: 1,
- catalogVisible: false,
- tocData: [],
- generateList: [],
- expandedKeys: [],
- searchValue: "",
- autoExpandParent: true,
- drawerSize: "default",
+ viewerCon: null,
+ preViewMd5: "",
};
},
watch: {
+ isClear: {
+ immediate: true,
+ handler(val) {
+ if (val == true) this.preViewMd5 = "";
+ },
+ },
md5: {
- handler(newVal, oldVal) {
- if (newVal) {
- this.getFileInfo();
+ immediate: true,
+ handler(val) {
+ if (val) {
+ this.preViewMd5 = val;
+ this.currentPage = 1;
+ this.currentPageSrc = "";
+ this.totalPage = 1;
+ this.viewerCon?.destroy();
}
},
},
},
- created() {
+ mounted() {
+ this.scrollBottom();
+ this.clearDom();
this.getFileInfo();
},
methods: {
- initFun() {
- // 鍒濆鍖栨嫋鎷�
- let image = this.refs.image;
- let imageBox = this.refs.imageBox;
- let initLeft = imageBox.offsetWidth / 2 - image.offsetWidth / 2;
- image.style.left = initLeft + "px";
- image.style.top = 0 + "px";
- let canMove = false;
- let offsetX, offsetY, oldLeft, oldTop;
- image.onmousedown = function (e) {
- canMove = true;
- offsetX = e.x;
- offsetY = e.y;
- oldLeft = parseFloat(image.style.left.split("px")[0]);
- oldTop = parseFloat(image.style.top.split("px")[0]);
- };
- imageBox.onmousemove = function (e) {
- if (canMove == true) {
- let left = e.clientX - offsetX;
- let top = e.clientY - offsetY;
- image.style.left = oldLeft + left + "px";
- image.style.top = oldTop + top + "px";
- }
- };
- image.onmouseup = function () {
- canMove = false;
- };
- this.fileLoading = false;
+ async downloadPdf() {
+ window.open(await getResourcePath(this.preViewMd5));
},
- dragStart(e) {
- if (e && e.preventDefault) {
- e.preventDefault();
- } else {
- window.event.returnValue = false;
- }
+ domViewer() {
+ let ele = (this.container ? this.container : document).getElementById(
+ "imageParent"
+ );
+ this.viewerCon = new Viewer(ele, {
+ inline: false,
+ container: this.container
+ ? this.container.querySelector("#app")
+ : "body",
+ navbar: true, // 鏄剧ず瀵艰埅鏍�
+ toolbar: true, // 鏄剧ず宸ュ叿鏍�
+ title: true, // 鏄剧ず鏍囬
+ });
},
- handleScroll(e) {
- if (e.nativeEvent.deltaY <= 0) {
- if (this.zoom < 3) {
- let newZoom = this.zoom + 0.1;
- this.zoom = newZoom;
- this.refs.image.style.height = newZoom * 100 + "%";
+ clearDom() {
+ let ele = (this.container ? this.container : document).getElementById(
+ "imageParent"
+ );
+ ele.innerHtml = "";
+ },
+ createDom(page) {
+ var that = this;
+ let ele = (this.container ? this.container : 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);
+ },
+ scrollBottom() {
+ var that = this;
+ var ele = (this.container ? this.container : document).getElementById(
+ "imageParent"
+ );
+ ele.addEventListener("scroll", function () {
+ // 璁＄畻婊氬姩鏉¤窛绂诲簳閮ㄧ殑浣嶇疆
+ const scrollBottom =
+ ele.scrollHeight - ele.scrollTop - ele.clientHeight;
+ if (scrollBottom <= 10) {
+ that.currentPage++;
+ if (that.currentPage <= that.totalPage) {
+ that.createDom(that.currentPage, ele);
+ }
}
- } else {
- if (this.zoom > 0.5) {
- let newZoom = this.zoom - 0.1;
- this.zoom = newZoom;
- this.refs.image.style.height = newZoom * 100 + "%";
- }
- }
+ });
},
getFileInfo() {
// 鑾峰彇鐩綍
this.MG.file
- .getPdfInfo({ md5: this.md5 })
+ .getPdfInfo({ md5: this.preViewMd5 })
.then((res) => {
this.totalPage = res.totalPages;
- this.getPageImage(this.currentPage);
+ this.createDom(this.currentPage);
})
.catch((err) => {
+ this.totalPage = 1;
+ this.createDom(this.currentPage);
console.error(err);
});
},
getPageImage(page) {
const ctx = process.env.VUE_APP_API_URL;
- this.fileLoading = true;
- this.currentPageSrc =
+ return (
ctx +
"/file/GetPdfPageImage" +
"?md5=" +
- this.md5 +
+ this.preViewMd5 +
"&index=" +
page +
- "&dpi=150";
+ "&dpi=200"
+ );
},
},
};
</script>
<style scoped lang="less">
-.imgbox {
+.preview {
width: 100%;
height: 100%;
- background-color: aquamarine;
- img {
- width: 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: 10px;
+ fill: #999;
+ }
+ svg:hover {
+ fill: #fff;
+ cursor: pointer;
+ }
}
}
</style>
diff --git a/vue.config.js b/vue.config.js
index b375ec8..8269352 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,9 @@
const { defineConfig } = require("@vue/cli-service");
+const webpack = require("webpack");
+// 鑾峰彇鎵�鏈変功绫嶅垪琛�
+const bookList = process.env.VUE_APP_BOOK_LIST ? process.env.VUE_APP_BOOK_LIST.split("/") : [];
module.exports = defineConfig({
- publicPath: process.env.PUBLIC_PATH,
+ publicPath: process.env.VUE_APP_PUBLIC_PATH,
transpileDependencies: true,
lintOnSave: false,
// devServer: {
@@ -19,7 +22,26 @@
library: `app-content`,
libraryTarget: "umd",
chunkLoadingGlobal: `webpackJsonp_app-content`
- }
+ },
+ plugins: [
+ new webpack.IgnorePlugin({
+ checkResource(resource) {
+ if (process.env.VUE_APP_ENV == "product") {
+ // 缂栬瘧鍜屾墦鍖呰繃婊�
+ for (let i = 0; i < bookList.length; i++) {
+ const bookName = bookList[i];
+ if (bookName != process.env.VUE_APP_BOOK_ID) {
+ // 杩囨护涓嶉渶瑕佺殑妯″潡
+ if (resource.indexOf(bookName) > -1) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+ })
+ ]
},
chainWebpack: (config) => {
config.module
--
Gitblit v1.9.1