From 0653ed7b36a147f3cfd6eade1b54e5604b8133f1 Mon Sep 17 00:00:00 2001 From: user1 <10901603+no-distractions1@user.noreply.gitee.com> Date: 星期四, 13 六月 2024 16:36:13 +0800 Subject: [PATCH] drama部署 --- src/books/mathBook/assets/images/0101-2.jpg | 0 src/books/lifeCare/view/components/chapter010.vue | 82 +- vue.config.js | 26 + src/books/childHealth/view/content/components/header.vue | 4 src/books/lifeCare/view/components/index.vue | 2 src/books/mathBook/view/components/index.vue | 0 src/books/mathBook/view/index.vue | 0 src/books/childHealth/view/content/index.vue | 93 ++- src/books/lifeCare/view/components/chapter001.vue | 2 src/books/mathBook/assets/images/hzjl.jpg | 0 src/books/mathBook/assets/images/0101-1.jpg | 0 src/books/sportsAndHealth/view/components/testDynaicTable.vue | 21 src/books/mathBook/assets/images/Cover.jpg | 0 src/books/mathBook/assets/images/dy1.jpg | 0 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/mathBook/assets/images/0100-3.jpg | 0 src/books/sportsAndHealth/view/components/testPp.vue | 106 +++ 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/cxgk.jpg | 0 src/books/childHealth/view/content/components/chapter007.vue | 35 - src/books/mathBook/assets/images/0100-2.jpg | 0 .env.product | 6 src/books/mathBook/assets/images/0103-1.jpg | 0 src/books/lifeCare/image/zt-pen.png | 0 src/books/lifeCare/css/default.less | 188 +++++++ src/books/mathBook/assets/images/question/0103-1-4.png | 0 src/books/mathBook/assets/images/0103-2.jpg | 0 src/books/mathBook/assets/images/0100-1.jpg | 0 src/books/mathBook/view/components/chapter001.vue | 138 +++-- src/books/mathBook/assets/images/icon/heart-check.png | 0 src/books/artAndDrama/assets/main.less | 8 src/books/mathBook/assets/images/wttc.jpg | 0 src/books/lifeCare/image/zt.-penpng.png | 0 src/books/lifeCare/image/zt.png | 0 src/components/examinations/index.vue | 2 src/books/mathBook/assets/images/question/0103-1-3.png | 0 src/books/mathBook/view/components/header.vue | 2 src/books/sportsAndHealth/css/default.less | 36 + src/books/childHealth/assets/main.less | 6 src/components/pdfview/index.vue | 220 +++++--- .env | 3 src/books/mathBook/assets/images/xxmb.jpg | 0 src/books/lifeCare/view/components/chapter012.vue | 202 ++++--- src/books/mathBook/assets/images/0102-2.jpg | 0 src/books/mathBook/assets/images/stlx.jpg | 0 package.json | 3 src/books/mathBook/assets/main.less | 14 src/books/mathBook/assets/images/0102-1.jpg | 0 src/books/lifeCare/view/components/chapter011.vue | 139 +++-- src/App.vue | 65 +- src/books/mathBook/assets/images/dy3.jpg | 0 56 files changed, 915 insertions(+), 522 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/package.json b/package.json index cbcfd0e..ba5ae63 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,8 @@ "eslint-plugin-vue": "^8.0.3", "less": "^4.2.0", "less-loader": "^12.2.0", - "vue-template-compiler": "^2.6.14" + "vue-template-compiler": "^2.6.14", + "webpack": "^5.92.0" }, "eslintConfig": { "root": true, diff --git a/src/App.vue b/src/App.vue index a5e51a6..65f4077 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,30 +9,22 @@ ></sportsAndHealth> <artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance> <artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama> - <mathBook v-if="activeBook.name == 'math'"></mathBook> + <mathBook v-if="activeBook.name == 'mathBook'"></mathBook> </div> </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 + "artAndDrama" + 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/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less index 5c6e442..862de56 100644 --- a/src/books/artAndDrama/assets/main.less +++ b/src/books/artAndDrama/assets/main.less @@ -510,6 +510,7 @@ outline: none; } } +<<<<<<< HEAD .page-footer { position: relative; display: flex; @@ -592,12 +593,17 @@ } /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */ @media (max-width: 430px) { +======= +} + /* 濯掍綋鏌ヨ鍋氬熀纭�鍝嶅簲寮忓竷灞� */ + @media (max-width: 430px) { +>>>>>>> ba76798a669c6d859d0f8b9a913e7637d3e8d7e2 .ans-drama { .page-box { min-height: 750px; } .pg-mh { - min-height: 815px; + min-height: 815px !important; } } } 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/chapter007.vue b/src/books/childHealth/view/content/components/chapter007.vue index 7d692ca..f60d4ec 100644 --- a/src/books/childHealth/view/content/components/chapter007.vue +++ b/src/books/childHealth/view/content/components/chapter007.vue @@ -385,41 +385,6 @@ </p> <p class="block">甯歌浜庤儍鑲犻亾鐤剧梾銆�</p> <p class="block">2.澶т究鎬х姸寮傚父</p> - <p class="block">锛�2锛夌淮鐢熺礌A鎴栫淮鐢熺礌D涓瘨锛屼篃浼氬紩璧峰帉椋熴��</p> - <p class="block">锛�3锛夐暱鏈熸憚椋熸棤鐩愰ギ椋燂紝涔熷彲浣块娆蹭綆涓嬨��</p> - <p class="block">2.椋熸浜㈣繘</p> - <p class="block"> - 锛�1锛夊辜鍎胯嫢鍚冨緱澶氥�佸枬寰楀銆佸翱寰楀锛屽簲妫�鏌ユ槸鍚︽偅鏈夌敳鐘惰吅鍔熻兘浜㈣繘鎴栫硸灏跨梾銆� - </p> - <p class="block">锛�2锛夊績鐞嗗紓甯镐篃鍙椽椋熴��</p> - <p class="block">锛�3锛夊鏃忛仐浼犳�ц偉鑳栨偅鍎夸篃鏈夎椽椋熶範鎯��</p> - <p class="block">3.寮傚棞鐧�</p> - <p class="block"> - 寮傚棞鐧栨槸鎸囧辜鍎垮椋熺墿浠ュ鐨勯潪椋熺墿鐗╁搧琛ㄧ幇鍑轰笉鍙嚜鍒剁殑椋熸锛屽鍠滈娉ュ湡銆佺叅鏍搞�佺焊寮犮�佸鐨瓑銆傚父瑙佷簬浣撳唴閿屻�侀搧涓ラ噸缂轰箯鐨勫辜鍎匡紝鍦ㄤ腑鍥藉崡鏂逛篃鍙浜庨挬铏梾銆� - </p> - <p class="block"><b>涓夈�佺潯鐪犲紓甯�</b></p> - <p class="block"> - 姝e父骞煎効涓婂簥鍚庡彲寰堝揩鍏ョ潯锛岀潯鐪犲钩绋炽�佹棤榧惧0锛屽彲鏈夊井姹椼�� - </p> - <p class="block">鐫$湢寮傚父涓昏鍖呮嫭浠ヤ笅3绉嶃��</p> - <p class="block">1.鍏ョ潯鍥伴毦</p> - <p class="block">锛�1锛夎繘鍏ユ柊鐨勭幆澧冿紝涓嶈兘閫傚簲銆�</p> - <p class="block">锛�2锛夌簿绁炵揣寮犮�佸帇鍔涜繃澶с��</p> - <p class="block">锛�3锛夌柧鐥呯柤鐥涙墍鑷达紝濡傚墽鐑堢墮鐤煎彲鑷村叆鐫″洶闅俱��</p> - <p class="block">2.鐫$湢涓嶅畨</p> - <p class="block">锛�1锛変綕鍋荤梾绛夋墍鑷淬��</p> - <p class="block">锛�2锛変綋鍐呮湁铔茶櫕娲诲姩銆�</p> - <p class="block">锛�3锛夊績鐞嗗洜绱犮��</p> - <p class="block">3.鍡滅潯</p> - <p class="block">甯歌浜庤剳鑶滅値銆佽剳鐐庣瓑鐤剧梾鐨勬棭鏈熻〃鐜般��</p> - <p class="block"><b>鍥涖�佸ぇ渚垮紓甯�</b></p> - <p class="block">鍖呮嫭澶т究娆℃暟寮傚父鍜屽ぇ渚挎�х姸寮傚父銆�</p> - <p class="block">1.澶т究娆℃暟寮傚父</p> - <p class="block"> - 鎺掍究娆℃暟杈冨钩鏃舵湁鏄庢樉鍑忓皯鎴栧澶氾紝鎺掍究鏃舵湁涓嶈垝鏈嶆劅銆� - </p> - <p class="block">甯歌浜庤儍鑲犻亾鐤剧梾銆�</p> - <p class="block">2.澶т究鎬х姸寮傚父</p> <p class="block"> 锛�1锛夎渚匡細绮究甯﹁锛岃壊椴滅孩銆佹殫绾㈡垨鍛堟煆娌圭姸锛岄噺澶氬皯涓嶇瓑锛屽彲娣锋湁鑴撴恫銆侀粡娑诧紝缁熺О渚胯鎴栬渚裤�� </p> 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 1b0f7fa..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,8 +166,8 @@ this.container ? this.container : document ).querySelector(".page-main"); scrollBox.scrollTop = (scrollBox.scrollTop / oldVal) * newVal; - }, - }, + } + } }, mounted() { // 榛樿鍔犺浇绔犺妭 @@ -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..c98b62e 100644 --- a/src/books/lifeCare/css/default.less +++ b/src/books/lifeCare/css/default.less @@ -256,6 +256,34 @@ .chapter { font-family: "瀹嬩綋"; + + .rightPng{ + float: left; + } + + .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; @@ -299,6 +327,10 @@ margin: 0 20px; } + .ztStr { + margin: 0 50px; + } + .title { display: flex; justify-content: flex-start; @@ -319,13 +351,51 @@ } } - .zt1-content { - background-color: #f7b80a; + + .zt01-con { + background-color: #fbb45e; } - .zt1-header-bj { - border-left-color: #a5c24f; - border-bottom-color: #a5c24f; + .zt02-con { + background-color: #b786bb; + } + + .zt03-con { + background-color: #a5c24f; + } + + .zt04-con { + background-color: #b786bb; + } + + .zt05-con { + background-color: #b786bb; + } + + + .zt01-bj { + border-left: 2px solid #a5c24f; + border-bottom: 2px solid #a5c24f; + } + + .zt02-bj { + border-left: 2px solid #6eb1e1; + border-bottom: 2px solid #6eb1e1; + } + + .zt03-bj { + border-left: 2px solid #a97b50; + border-bottom: 2px solid #a97b50; + } + + .zt04-bj { + border-left: 2px solid #6eb1e1; + border-bottom: 2px solid #6eb1e1; + } + + .zt05-bj { + border-left: 2px solid #6eb1e1; + border-bottom: 2px solid #6eb1e1; } @media (max-width: 756px) { @@ -343,6 +413,7 @@ } } + // 濂囨暟 .pageHeader-second { width: 100%; display: flex; @@ -360,12 +431,32 @@ font-size: 20px; position: absolute; right: 36px; - top: 80px; + top: 85px; .second-left { width: 23px; height: 100%; background-color: #f49a4c; + } + + .zt02-left { + width: 20px; + background-color: #b786bb; + } + + .zt03-left { + width: 20px; + background-color: #a5c24f; + } + + .zt04-left { + width: 20px; + background-color: #b786bb; + } + + .zt05-left { + width: 20px; + background-color: #b786bb; } .second-right { @@ -382,9 +473,37 @@ top: -20px; } + .zt-pen { + height: 40px; + position: absolute; + left: -50px; + top: -10px; + } + .pageStr { margin-right: 10px; } + + .zt01-Str { + color: #a5c24f; + } + + .zt02-Str { + color: #6eb1e1; + } + + .zt03-Str { + color: #a97b50; + } + + .zt04-Str { + color: #6eb1e1; + } + + .zt05-Str { + color: #6eb1e1; + } + .pageNum { display: block; @@ -395,13 +514,36 @@ color: #fff; } - .zt1-pageNum { + .zt01-pageNum { + padding: 0 35px 0 20px; + text-align: left; background-color: #a5c24f; } - .zt1-pageStr { - color: #a5c24f; + .zt02-pageNum { + padding: 0 35px 0 20px; + text-align: left; + background-color: #6eb1e1; } + + .zt03-pageNum { + padding: 0 35px 0 20px; + text-align: left; + background-color: #a97b50; + } + + .zt04-pageNum { + padding: 0 35px 0 20px; + text-align: left; + background-color: #6eb1e1; + } + + .zt05-pageNum { + padding: 0 35px 0 20px; + text-align: left; + background-color: #6eb1e1; + } + } } @@ -429,8 +571,34 @@ margin-top: 105px; } - .zt1-boderLine { + .zt01-bdline { background-color: #a5c24f; + width: 88%; + margin-right: 20px; + } + + .zt02-bdline { + background-color: #6eb1e1; + width: 88%; + margin-right: 20px; + } + + .zt03-bdline { + background-color: #a97b50; + width: 88%; + margin-right: 20px; + } + + .zt04-bdline { + background-color: #6eb1e1; + width: 88%; + margin-right: 20px; + } + + .zt05-bdline { + background-color: #6eb1e1; + width: 88%; + margin-right: 20px; } } } diff --git a/src/books/lifeCare/image/zt-pen.png b/src/books/lifeCare/image/zt-pen.png index 78c7ac4..3cc911a 100644 --- a/src/books/lifeCare/image/zt-pen.png +++ b/src/books/lifeCare/image/zt-pen.png Binary files differ diff --git a/src/books/lifeCare/image/zt.-penpng.png b/src/books/lifeCare/image/zt.-penpng.png new file mode 100644 index 0000000..3cc911a --- /dev/null +++ b/src/books/lifeCare/image/zt.-penpng.png Binary files differ diff --git a/src/books/lifeCare/image/zt.png b/src/books/lifeCare/image/zt.png index b3135c0..4404293 100644 --- a/src/books/lifeCare/image/zt.png +++ b/src/books/lifeCare/image/zt.png Binary files differ 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/lifeCare/view/components/chapter010.vue b/src/books/lifeCare/view/components/chapter010.vue index e64ef08..2daa2a5 100644 --- a/src/books/lifeCare/view/components/chapter010.vue +++ b/src/books/lifeCare/view/components/chapter010.vue @@ -81,12 +81,12 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-2</div> + <div class="header-bj zt01-bj"></div> + <div class="content zt01-con"> + <div class="pageStr ztStr">2-2</div> <div class="title"> - <!-- <img class="ztImg" src="../../image/zt.png" alt="" /> --> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> + <!-- <img src="../../image/zt.png" alt="" /> --> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -212,12 +212,12 @@ <div class="second-con"> <div class="second-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> - <span class="pageNum">2-3</span> + <img class="zt-pen" src="../../image/zt-pen.png" alt="" /> + <span class="pageStr zt01-Str">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> + <span class="pageNum zt01-pageNum">2-3</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt01-bdline"></div> </div> </div> <div class="bodystyle"> @@ -325,11 +325,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-4</div> + <div class="header-bj zt01-bj"></div> + <div class="content zt01-con"> + <div class="pageStr ztStr">2-4</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -372,12 +372,12 @@ <div class="second-con"> <div class="second-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> - <span class="pageNum">2-5</span> + <img class="zt-pen" src="../../image/zt-pen.png" alt="" /> + <span class="pageStr zt01-Str">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> + <span class="pageNum zt01-pageNum">2-5</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt01-bdline"></div> </div> </div> <div class="bodystyle"> @@ -420,11 +420,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-6</div> + <div class="header-bj zt01-bj"></div> + <div class="content zt01-con"> + <div class="pageStr ztStr">2-6</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -451,12 +451,12 @@ <div class="second-con"> <div class="second-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> - <span class="pageNum">2-7</span> + <img class="zt-pen" src="../../image/zt-pen.png" alt="" /> + <span class="pageStr zt01-Str">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> + <span class="pageNum zt01-pageNum">2-7</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt01-bdline"></div> </div> </div> @@ -508,11 +508,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-8</div> + <div class="header-bj zt01-bj"></div> + <div class="content zt01-con"> + <div class="pageStr ztStr">2-8</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -554,12 +554,12 @@ <div class="second-con"> <div class="second-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> - <span class="pageNum">2-9</span> + <img class="zt-pen" src="../../image/zt-pen.png" alt="" /> + <span class="pageStr zt01-Str">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> + <span class="pageNum zt01-pageNum">2-9</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt01-bdline"></div> </div> </div> <div class="bodystyle"> @@ -581,11 +581,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-10</div> + <div class="header-bj zt01-bj"></div> + <div class="content zt01-con"> + <div class="pageStr ztStr">2-10</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -608,12 +608,12 @@ <div class="second-con"> <div class="second-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> - <span class="pageNum">2-11</span> + <img class="zt-pen" src="../../image/zt-pen.png" alt="" /> + <span class="pageStr zt01-Str">涓撻涓�路鍒濊瘑濠村辜鍎跨敓娲讳繚鑲�</span> + <span class="pageNum zt01-pageNum">2-11</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt01-bdline"></div> </div> </div> <div class="bodystyle"> diff --git a/src/books/lifeCare/view/components/chapter011.vue b/src/books/lifeCare/view/components/chapter011.vue index 5b13411..0f876ae 100644 --- a/src/books/lifeCare/view/components/chapter011.vue +++ b/src/books/lifeCare/view/components/chapter011.vue @@ -3,7 +3,9 @@ <div class="page-box" page="163"> <div v-if="showPageList.indexOf(163) > -1"> <div class="bodystyle topImg"> - <h2 id="b010"><img class="img-0" alt="" src="../../image/zt2.jpg" /></h2> + <h2 id="b010"> + <img class="img-0" alt="" src="../../image/zt2.jpg" /> + </h2> <div class="bk"> <div class="bj1"> <p class="left"> @@ -36,7 +38,8 @@ 鑳藉畨鎶氭潵鍥┐骞煎効鐨勪笉鑹儏缁�� </p> <p class="block"> - <img class="inline" alt="" src="../../image/0001-5.jpg" /> 浼氭櫒闂存鏌ャ�� + <img class="inline" alt="" src="../../image/0001-5.jpg" /> + 浼氭櫒闂存鏌ャ�� </p> <p class="block"> <img class="inline" alt="" src="../../image/0001-5.jpg" /> @@ -68,20 +71,22 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt02-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> - <span class="pageNum">2-13</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt02-Str">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> + <span class="pageNum zt02-pageNum">2-13</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt02-bdline"></div> </div> </div> <div class="bodystyle"> <h3 id="c038"> - <span class="bk1-h3"><span class="bj2-h3">涓�</span>銆�銆�鏉ュ洯淇濊偛鐨勪繚鏁欎环鍊笺��</span> + <span class="bk1-h3" + ><span class="bj2-h3">涓�</span>銆�銆�鏉ュ洯淇濊偛鐨勪繚鏁欎环鍊笺��</span + > </h3> <p> 鎵樿偛鏈烘瀯淇濊偛鏄┐骞煎効鐓ф姢鏈嶅姟鐨勯噸瑕佺粍鎴愰儴鍒嗭紝鏄敓鍛藉叏鍛ㄦ湡鏈嶅姟绠$悊鐨勯噸瑕佸唴瀹广�傛墭鑲叉満鏋勫簲鍒涜閫傚疁鐨勭幆澧冿紝鍚堢悊瀹夋帓涓�鏃ョ敓娲诲拰娲诲姩锛屾彁渚涚敓娲荤収鏂欍�佸畨鍏ㄧ湅鎶ゃ�佸钩琛¤喅椋熷拰鏃╂湡瀛︿範鏈轰細锛屼粠鑰屼績杩涘┐骞煎効韬綋鍜屽績鐞嗙殑鍏ㄩ潰鍙戝睍銆� @@ -90,7 +95,9 @@ 鏉ュ洯鐜妭鏄┐骞煎効鍦ㄦ墭鑲叉満鏋勪竴鏃ョ敓娲讳繚鑲蹭腑鐨勭涓�涓幆鑺傘�傚畨鍏ㄣ�佸崼鐢熴�佹俯棣ㄣ�佽垝閫傜殑鐜瀵瑰┐骞煎効鏉ヨ鏄竴澶╂剦蹇敓娲荤殑鍩虹銆備繚鏁欎汉鍛樹笂宀楀墠鐨勪釜浜哄噯澶囥�佸鍐呭鐜鐨勬竻娲佹暣鐞嗐�佽鏂借澶囩殑妫�鏌ャ�佺敓娲荤墿鍝佺殑鍑嗗銆佹暀鐜╁叿鐨勬彁渚涘強鎽嗘斁绛夛紝閮芥槸鏉ュ洯鐜妭鐨勯噸瑕佺粍鎴愰儴鍒嗐�傛潵鍥幆鑺傝繕鏄缓绔嬪笀鐢熸劅鎯呫�佸煿鍏诲┐骞煎効鐨勪範鎯�佹彁楂樺┐骞煎効鐨勭患鍚堢敓娲昏兘鍔涖�佸紑灞曚釜鎬у寲鏁欒偛鐨勯噸瑕佸鏈恒�備繚鏁欎汉鍛樻姄浣忔潵鍥椂鏈轰笌瀹堕暱浜ゆ祦锛岃兘寤虹珛璧疯壇濂界殑瀹跺洯娌熼�氬钩鍙帮紝瀹炵幇瀹跺洯鍏辫偛銆傜敱姝ゅ彲瑙侊紝鏉ュ洯鐜妭娑夊強寰堝宸ヤ綔鍐呭锛岃暣鍚簡寰堝鐨勪繚鏁欎环鍊硷紝鍦ㄥ┐骞煎効鐨勪竴鏃ョ敓娲讳腑璧峰埌鍏抽敭浣滅敤锛屾槸涓嶅彲蹇借鐨勩�� </p> <h3 id="c039"> - <span class="bk1-h3"><span class="bj2-h3">浜�</span>銆�銆�濠村辜鍎挎潵鍥墠鐨勫噯澶囧伐浣溿��</span> + <span class="bk1-h3" + ><span class="bj2-h3">浜�</span>銆�銆�濠村辜鍎挎潵鍥墠鐨勫噯澶囧伐浣溿��</span + > </h3> <h4 class="h4-zt" id="d103">锛堜竴锛変繚鏁欎汉鍛樹笂宀楀墠鐨勪釜浜哄噯澶囧伐浣�</h4> <p>鈶犳彁鍓�10鍒嗛挓鍒拌揪宸ヤ綔宀椾綅锛屾洿鎹㈣垝閫備笖渚夸簬杩愬姩鐨勫伐浣滄湇銆�</p> @@ -120,11 +127,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-14</div> + <div class="header-bj zt02-bj"></div> + <div class="content zt02-con"> + <div class="pageStr ztStr">2-14</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -174,14 +181,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt02-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> - <span class="pageNum">2-15</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt02-Str">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> + <span class="pageNum zt02-pageNum">2-15</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt02-bdline"></div> </div> </div> @@ -191,19 +198,28 @@ 涓庣彮缁勭殑淇濇暀浜哄憳绠�鍗曟矡閫氬綋澶╃殑宸ヤ綔鍐呭锛屼繚璇佸┐骞煎効涓�鏃ョ敓娲绘湁搴忚繘琛屻�� </p> <h3 id="c040"> - <span class="bk1-h3"><span class="bj2-h3">涓�</span>銆�銆�鏉ュ洯娲诲姩瀛樺湪鐨勫畨鍏ㄩ殣鎮c��</span> + <span class="bk1-h3" + ><span class="bj2-h3">涓�</span>銆�銆�鏉ュ洯娲诲姩瀛樺湪鐨勫畨鍏ㄩ殣鎮c��</span + > </h3> <p> 鈶犲叆鍥椂锛屼綆榫勫┐骞煎効鐨勫闀跨粡甯告湁寰堝鐞愪簨瑕佸憡鐭ヤ笌浜ゆ帴锛屾墭鑲叉満鏋勭殑淇濇暀浜哄憳蹇欎簬鎺ュ緟锛屽鏄撶枏蹇藉緲寰婂湪闂ㄥ彛鐨勫┐骞煎効锛屽鑷村┐骞煎効鑷绂诲紑锛屾槗鍙戠敓鎰忓鎴栬蛋澶便�� </p> <p>鈶℃潵鍥椿鍔ㄥ尯鍩熷畨鎺掍笉褰擄紝绌洪棿甯冨眬鎷ユ尋锛屽鏄撻�犳垚濠村辜鍎跨鎾炴垨璺屽�掋��</p> - <p>鈶㈠湪鏉ュ洯娲诲姩涓紝涓哄┐骞煎効鎶曟斁鐨勭帺鍏疯繃灏戯紝瀹规槗寮曡捣濠村辜鍎跨殑浜夋姠鐭涚浘銆�</p> - <p>鈶e┐骞煎効鍏ュ洯娲楁墜銆佸鍘曞悗锛屽湴闈㈢殑姘存笉鏈強鏃舵竻鐞嗭紝瀹规槗鑷翠娇婊戝�掑彈浼ゃ��</p> + <p> + 鈶㈠湪鏉ュ洯娲诲姩涓紝涓哄┐骞煎効鎶曟斁鐨勭帺鍏疯繃灏戯紝瀹规槗寮曡捣濠村辜鍎跨殑浜夋姠鐭涚浘銆� + </p> + <p> + 鈶e┐骞煎効鍏ュ洯娲楁墜銆佸鍘曞悗锛屽湴闈㈢殑姘存笉鏈強鏃舵竻鐞嗭紝瀹规槗鑷翠娇婊戝�掑彈浼ゃ�� + </p> <p> 鈶や繚鏁欎汉鍛樼殑绠$悊涓嶅埌浣嶏紝娌℃湁鍏虫敞鍒拌翰鍦ㄨ钀介噷鐨勫┐骞煎効锛屽綋鎰忓鍙戠敓鏃讹紝涓嶈兘鍙婃椂閲囧彇鏈夋晥鎺柦銆� </p> <h3 id="c041"> - <span class="bk1-h3"><span class="bj2-h3">鍥�</span>銆�銆�闃茶寖鏉ュ洯娲诲姩涓殑瀹夊叏闂銆�</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍥�</span + >銆�銆�闃茶寖鏉ュ洯娲诲姩涓殑瀹夊叏闂銆�</span + > </h3> <p> 鍦ㄥ┐骞煎効鏉ュ洯鍓嶆椂锛屾垜浠鐜鍜岀墿鍝佽繘琛屼簡瀹夊叏妫�鏌ワ紝浠ユ帓闄ら殣鎮c�傚湪濠村辜鍎挎潵鍥椂锛屽張瑕佹敞鎰忓摢浜涘畨鍏ㄩ棶棰橈紵閬囧埌闂璇ュ浣曡В鍐冲憿锛� @@ -228,11 +244,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-16</div> + <div class="header-bj zt02-bj"></div> + <div class="content zt02-con"> + <div class="pageStr ztStr">2-16</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -245,7 +261,9 @@ 鏉ュ洯娲诲姩缁撴潫鍚庯紝淇濇暀浜哄憳瑕佽鐪熸竻鐐瑰┐骞煎効鐨勪汉鏁帮紝瀵逛簬鏈埌鍥殑濠村辜鍎匡紝瑕佸強鏃惰仈绯诲闀夸簡瑙e師鍥狅紝骞跺仛濂藉嚭鍕よ褰曘�� </p> <h3 id="c042"> - <span class="bk1-h3"><span class="bj2-h3">浜�</span>銆�銆�鏉ュ洯鎺ュ緟鐨勫唴瀹广��</span> + <span class="bk1-h3" + ><span class="bj2-h3">浜�</span>銆�銆�鏉ュ洯鎺ュ緟鐨勫唴瀹广��</span + > </h3> <p>鈶犺惀閫犳俯棣ㄣ�佽垝閫傘�佽交鏉剧殑鐜锛岃繋鎺ュ┐骞煎効鐨勫埌鏉ャ��</p> <p>鈶$儹鎯呮帴寰呮瘡涓�浣嶅闀垮拰姣忎竴鍚嶅┐骞煎効锛屽濠村辜鍎夸翰鍒囬棶濂姐��</p> @@ -256,7 +274,10 @@ <p>鈶ゅ紩瀵煎┐骞煎効涓庡悓浼撮棶濂斤紝涓庡闀胯鍐嶈銆�</p> <p>鈶ュ紩瀵煎┐骞煎効鎰夊揩鍦板姞鍏ョ彮绾ф椿鍔ㄣ��</p> <h3 id="c043"> - <span class="bk1-h3"><span class="bj2-h3">鍏�</span>銆�銆�瀹夋姎鏉ュ洯濠村辜鍎跨殑涓嶈壇鎯呯华銆�</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍏�</span + >銆�銆�瀹夋姎鏉ュ洯濠村辜鍎跨殑涓嶈壇鎯呯华銆�</span + > </h3> <p> 鍒氬叆鍥殑濠村辜鍎挎櫘閬嶄細鍑虹幇鍝椆鍜屼笉鎰垮叆鍥殑鎯呭喌锛岃〃鐜板涓轰翰瀛愬垎绂荤劍铏戙�傚┐骞煎効鍦ㄥ亣鏈熺粨鏉熷悗鎴栬�呯梾鎰堝悗杩斿洯锛屼篃瀹规槗浜х敓涓嶈壇鎯呯华銆傚┐骞煎効瀵圭啛鎮夌殑鐜鍜屾湞澶曠浉澶勭殑浜蹭汉鏈夊緢寮虹殑渚濊禆鎬э紝涓�鏃﹁繘鍏ュ洯鎵�灏辨剰鍛崇潃瑕佷笌鏈�浜茬殑鐖舵瘝銆佹渶鐖辩殑瀹朵汉銆佹渶鐔熸倝鐨勭幆澧冩湁鐭殏鐨勫垎绂伙紝缁忓彈鎯呮劅渚濇亱鐨勮�冮獙锛岃繖浼氬鑷存儏缁劍铏戝拰鎯呯华鐖嗗彂銆傚洜姝わ紝瀹夋姎濠村辜鍎跨殑鎯呯华鏄潵鍥椿鍔ㄤ腑闈炲父閲嶈鐨勪竴椤瑰伐浣滐紝鍙互閲囧彇浠ヤ笅鎺柦缂撹В鍏ュ洯鐨勭劍铏戞儏缁�� @@ -285,14 +306,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt02-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> - <span class="pageNum">2-17</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt02-Str">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> + <span class="pageNum zt02-pageNum">2-17</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt02-bdline"></div> </div> </div> @@ -301,7 +322,10 @@ 瀹濆疂涔熸湁渚濇亱鎯呮劅锛屼細鎷呭績鍜屼笉鑸嶏紝鐢氳嚦涓庡┐骞煎効涓�璧锋祦娉紝鍙嶈�屽鏄撳皢鑷繁鐨勬儏缁紶閫掔粰濠村辜鍎匡紝杩欏濠村辜鍎块�傚簲鎵樿偛鏈烘瀯鐨勭敓娲绘槸闈炲父涓嶅埄鐨勩�備繚鏁欎汉鍛樺簲寮曞瀹堕暱灏嗗┐骞煎効閫佸埌鎵樿偛鏈烘瀯鍚庡井绗戠潃涓庡疂瀹濋亾鍒紝涓嶅疁鍋滅暀杩囦箙銆� </p> <h3 id="c044"> - <span class="bk1-h3"><span class="bj2-h3">涓�</span>銆�銆�鏈夋晥寮�灞曟潵鍥帴寰呭伐浣滅殑鏂规硶銆�</span> + <span class="bk1-h3" + ><span class="bj2-h3">涓�</span + >銆�銆�鏈夋晥寮�灞曟潵鍥帴寰呭伐浣滅殑鏂规硶銆�</span + > </h3> <h4 class="h4-zt" id="d113">锛堜竴锛夊缓绔嬭壇濂界殑甯堝辜鍏崇郴</h4> <p> @@ -312,13 +336,17 @@ 鏉ュ洯鏃讹紝淇濇暀浜哄憳鍙互涓庡闀胯繘琛岀畝鐭�佹湁鏁堢殑浜ゆ祦锛屼簡瑙e┐骞煎効鍦ㄥ鐨勬儏鍐碉紝浜嗚В濠村辜鍎跨殑鍋ュ悍鎯呭喌锛屼互渚夸簬鏇村ソ鍦板紑灞曞┐骞煎効涓�鏃ョ敓娲荤殑鐓ф枡銆傚悓鏃讹紝淇濇暀浜哄憳搴旀湁閽堝鎬у湴鍥炲簲锛屽睍鐜板嚭姝g‘鐨勬暀鑲茬悊蹇靛拰涓撲笟鎬э紝璁╁闀垮鍔犲淇濇暀浜哄憳鐨勪俊浠绘劅锛屾媺杩戝鍥儏鎰熻窛绂伙紝澧炲己瀹跺洯琛旀帴鐨勬湁鏁堟�э紝浠ヨ揪鍒板鍥叡鑲茬殑鏈�浣虫晥鏋溿�� </p> <h3 id="c045"> - <span class="bk1-h3"><span class="bj2-h3">鍏�</span>銆�銆�鏅ㄩ棿妫�鏌ョ殑蹇呰鎬с��</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍏�</span>銆�銆�鏅ㄩ棿妫�鏌ョ殑蹇呰鎬с��</span + > </h3> <p> 濠村辜鍎胯嚜韬厤鐤郴缁熷彂鑲叉湭瀹屽杽锛屽鍚勭鐤剧梾鐨勬姷鎶楀姏杈冨樊銆傚叆鍥墠锛屽師鏈崟涓�銆佸皝闂殑瀹跺涵鍏昏偛妯″紡浣垮緱濠村辜鍎夸笌澶栫晫鎺ヨЕ灏戯紝鍙楃粏鑿屻�佺梾姣掍镜鍏ョ殑姒傜巼浣庛�傝�岃繘鍏ユ墭鑲叉満鏋勫悗锛屽┐骞煎効鐩稿鑱氶泦锛屽鏈変竴涓┐骞煎効鎮g梾锛屽氨寰堝鏄撻�犳垚鐤剧梾浼犳挱锛岀壒鍒槸浼犳煋鐥呯殑鍙戠敓鍜屾墿鏁c�傚洜姝わ紝鍙婃椂鍙戠幇鍜岄殧绂伙紝鍋氬埌鏃╁彂鐜般�佹棭鎶ュ憡銆佹棭闅旂銆佹棭娌荤枟锛岃兘纭繚姣忎釜骞煎効鐨勫仴搴枫�傝鐪熸墽琛屾櫒闂存鏌ュ埗搴︼紝鏄闃插┐骞煎効鐤剧梾鐨勪竴涓噸瑕佹帾鏂斤紝鏄繚璇佸┐骞煎効瀹夊叏鍏ュ洯鐨勯噸瑕侀�斿緞锛屾槸鎵樿偛鏈烘瀯鏃ュ父宸ヤ綔鐨勯噸瑕佸唴瀹广�� </p> <h3 id="c046"> - <span class="bk1-h3"><span class="bj2-h3">涔�</span>銆�銆�寮�灞曟櫒闂存鏌ャ��</span> + <span class="bk1-h3" + ><span class="bj2-h3">涔�</span>銆�銆�寮�灞曟櫒闂存鏌ャ��</span + > </h3> <h4 class="h4-zt" id="d115">锛堜竴锛夋櫒闂存鏌ョ敤鍝佺殑鍑嗗</h4> <p>淇濇暀浜哄憳搴斿噯澶囨秷姣掕繃鐨勪綋娓╄锛堟垨浣撴俯娴嬮噺浠櫒锛夊拰鍘嬭垖鏉匡紝瑁呮湁鐢�</p> @@ -330,11 +358,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-18</div> + <div class="header-bj zt02-bj"></div> + <div class="content zt02-con"> + <div class="pageStr ztStr">2-18</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img class="ztImg" src="../../image/zt.png" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -377,20 +405,22 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt02-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> - <span class="pageNum">2-19</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt02-Str">涓撻浜屄锋潵鍥椿鍔ㄦ姢鐓�</span> + <span class="pageNum zt02-pageNum">2-19</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt02-bdline"></div> </div> </div> <div class="bodystyle"> <h3 id="c047"> - <span class="bk1-h3"><span class="bj2-h3">鍗�</span>銆�銆�鎺ュ緟甯﹁嵂鐨勫┐骞煎効銆�</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍗�</span>銆�銆�鎺ュ緟甯﹁嵂鐨勫┐骞煎効銆�</span + > </h3> <p> 杩涘叆鎵樿偛鏈烘瀯鐨勫┐骞煎効缁忓父浼氬洜涓鸿嚜韬姷鎶楀姏宸�佺幆澧冩敼鍙樸�佸鑺傚彉鍖栥�佹儏缁奖鍝嶇瓑鍥犵礌鍑虹幇鐥呯棁锛屽闀块�氬父浼氬強鏃跺甫濠村辜鍎垮幓鍖婚櫌灏辫瘖銆傚湪鎺掗櫎浼犳煋鐥呯柧鐥呭拰鍣ㄨ川鎬х柧鐥呭悗锛屼繚鏁欎汉鍛樿繕鏄細榧撳姳瀹堕暱鍧氭寔閫佸┐骞煎効鍏ュ洯銆傚洜涓洪暱鏃堕棿鍦ㄥ浼戝吇浼氫娇杈冨皬骞撮緞鐨勫┐骞煎効浜х敓涓嶆効鎰忎笂鎵樿偛鏈烘瀯鐨勬儏缁紝閫犳垚閫傚簲鏈熷欢闀匡紝涓嶅埄浜庡┐骞煎効鐨勫仴搴锋垚闀裤�� @@ -404,15 +434,22 @@ <p> 鏀剁撼绠$悊濠村辜鍎胯嵂鐗╂椂锛屽繀椤绘牴鎹�滃杺鑽鎵樺強鏈嶈嵂璁板綍琛ㄢ�濅笂鐨勫唴瀹硅繘琛屾牳瀵癸紝骞跺湪鑽墿鏍囩涓婃爣娉ㄧ敤鑽┐骞煎効鐨勫鍚嶃�傜粰鑽椂瑕佷粩缁嗘牳瀵癸紝纭繚濠村辜鍎跨敤鑽殑鍑嗙‘鎬у拰瀹夊叏鎬с�� </p> - <p><br/></p> + <p><br /></p> <div class="bk-tx border-xxfs"> - <div class="bj3"><span class="cirlce"></span><span>瀛︿範鍙嶆��</span></div> - <textarea v-model="chapter011.textAreaItem.text39" style="border: 0" placeholder="璇疯緭鍏ュ唴瀹�" rows="8" - class="textareaInput" @blur="onBlurChange('text39')"></textarea> + <div class="bj3"> + <span class="cirlce"></span><span>瀛︿範鍙嶆��</span> + </div> + <textarea + v-model="chapter011.textAreaItem.text39" + style="border: 0" + placeholder="璇疯緭鍏ュ唴瀹�" + rows="8" + class="textareaInput" + @blur="onBlurChange('text39')" + ></textarea> </div> </div> </div> - </div> </div> </template> diff --git a/src/books/lifeCare/view/components/chapter012.vue b/src/books/lifeCare/view/components/chapter012.vue index 1e0f1d9..c18f5ae 100644 --- a/src/books/lifeCare/view/components/chapter012.vue +++ b/src/books/lifeCare/view/components/chapter012.vue @@ -3,7 +3,9 @@ <div class="page-box" page="171"> <div v-if="showPageList.indexOf(171) > -1"> <div class="bodystyle topImg"> - <h2 id="b011"><img class="img-0" alt="" src="../../image/zt3.jpg" /></h2> + <h2 id="b011"> + <img class="img-0" alt="" src="../../image/zt3.jpg" /> + </h2> <div class="bk"> <div class="bj1"> <p class="left"> @@ -58,20 +60,22 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-21</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-21</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> <div class="bodystyle"> <h3 id="c048"> - <span class="bk1-h3"><span class="bj2-h3">涓�</span>銆�銆�娲楁墜鐨勯噸瑕佹�с��</span> + <span class="bk1-h3" + ><span class="bj2-h3">涓�</span>銆�銆�娲楁墜鐨勯噸瑕佹�с��</span + > </h3> <div class="bk-ztgs"> <p class="bj1-ztgs">鈯欍��鍏充簬娲楁墜鐨勬晠浜嬨��鈯�</p> @@ -89,12 +93,16 @@ <p> 濠村辜鍎跨殑鍏嶇柅绯荤粺涓嶆垚鐔熴�佷笉瀹屽杽锛屽鏄撳彈鍒板悇绉嶄笉鑹洜绱犵殑褰卞搷锛屾垚涓鸿鎰熸煋鐨勯珮鍗变汉缇ゃ�傛礂鎵嬫槸棰勯槻鐤剧梾鏈�绠�渚挎湁鏁堢殑鎺柦涔嬩竴銆傚┐骞煎効鍦ㄧ敓娲讳腑锛屾墜涓嶆柇鎺ヨЕ鍒拌鐥呮瘨銆佺粏鑿屾薄鏌撶殑鐗╁搧锛屽鏋滀笉鑳藉強鏃舵纭礂鎵嬶紝鎵嬩笂鐨勭梾鍘熶綋鍙兘閫氳繃鎵嬪拰鍙c�佺溂銆侀蓟鐨勯粡鑶滄帴瑙﹁繘鍏ヤ汉浣撱�傛礂鎵嬪彲浠ョ畝鍗曟湁鏁堝湴鍒囨柇杩欎竴閫斿緞锛岄檷浣庢劅鏌撻闄┿�� </p> - <h4 class="h4-zt" id="d119">锛堜簩锛変繚鏁欎汉鍛樻礂鎵嬪彲浠ユ湁鏁堝噺灏戜氦鍙夋劅鏌�</h4> + <h4 class="h4-zt" id="d119"> + 锛堜簩锛変繚鏁欎汉鍛樻礂鎵嬪彲浠ユ湁鏁堝噺灏戜氦鍙夋劅鏌� + </h4> <p> 淇濇暀浜哄憳闇�瑕侀绻佹帴瑙﹀┐骞煎効锛屽鏋滆嚜韬笉娉ㄦ剰鎵嬬殑鍗敓锛屽氨浼氬皢鎵嬩笂鎼哄甫鐨勭梾鑿屼紶鎾粰濠村辜鍎匡紝閫犳垚浜ゅ弶鎰熸煋銆� </p> <h3 id="c049"> - <span class="bk1-h3"><span class="bj2-h3">浜�</span>銆�銆�娲楁墜鐨勬椂鏈恒��</span> + <span class="bk1-h3" + ><span class="bj2-h3">浜�</span>銆�銆�娲楁墜鐨勬椂鏈恒��</span + > </h3> <p> 濠村辜鍎垮湪濡傚帟鍚庛�佸悆涓滆タ鍓嶃�佹帴瑙﹀疇鐗╁悗銆佸鍑哄綊鏉ュ悗锛堝幓鎴峰娲诲姩鎴栧鍑烘父鐜╁洖鏉ワ級銆佸挸鍡藉悗銆佹墦鍠峰殢鍚庛�佹摝榧绘稌鍚庛�佹帴瑙﹁剰涓滆タ鍚庨兘闇�瑕佹礂鎵嬨�� @@ -110,11 +118,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-22</div> + <div class="header-bj zt03-bj"></div> + <div class="content zt03-con"> + <div class="pageStr ztStr">2-22</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img src="../../image/zt.png" class="ztImg" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -122,7 +130,9 @@ </div> <div class="bodystyle"> <h3 id="c050"> - <span class="bk1-h3"><span class="bj2-h3">涓�</span>銆�銆�缁勭粐鍜屾寚瀵煎┐骞煎効娲楁墜銆�</span> + <span class="bk1-h3" + ><span class="bj2-h3">涓�</span>銆�銆�缁勭粐鍜屾寚瀵煎┐骞煎効娲楁墜銆�</span + > </h3> <p><br /></p> <div class="bk-zt1"> @@ -222,20 +232,23 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-23</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-23</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> <div class="bodystyle"> <h3 id="c051"> - <span class="bk1-h3"><span class="bj2-h3">鍥�</span>銆�銆�鏍规嵁濠村辜鍎跨溂鐫涖�佽�虫湹銆侀蓟鑵斻�佸彛鑵斿拰鐨偆鐨勭壒鐐瑰疄鏂芥竻娲併��</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍥�</span + >銆�銆�鏍规嵁濠村辜鍎跨溂鐫涖�佽�虫湹銆侀蓟鑵斻�佸彛鑵斿拰鐨偆鐨勭壒鐐瑰疄鏂芥竻娲併��</span + > </h3> <h4 class="h4-zt" id="d123">锛堜竴锛夊┐骞煎効鐪肩潧鐨勭壒鐐瑰強娓呮磥瑕佺偣</h4> <p>鐪肩潧鐨勭粨鏋勫鍥�2-3-2鎵�绀恒��</p> @@ -274,11 +287,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-24</div> + <div class="header-bj zt03-bj"></div> + <div class="content zt03-con"> + <div class="pageStr ztStr">2-24</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img src="../../image/zt.png" class="ztImg" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -321,14 +334,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-25</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-25</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> @@ -341,7 +354,9 @@ <p class="img">鍥�2-3-4銆�榧昏厰鐨勭粨鏋�</p> <h5 class="h5-zt" id="e107">1.濠村辜鍎块蓟鑵旂殑鐗圭偣</h5> <p>锛�1锛夊鏄撴劅鏌�</p> - <p>濠村辜鍎块蓟鑵斿唴榛忚啘鏌旇蒋锛岄蓟姣涜緝灏戯紝瀵圭┖姘旂殑杩囨护浣滅敤杈冨急锛屽鏄撴劅鏌撱��</p> + <p> + 濠村辜鍎块蓟鑵斿唴榛忚啘鏌旇蒋锛岄蓟姣涜緝灏戯紝瀵圭┖姘旂殑杩囨护浣滅敤杈冨急锛屽鏄撴劅鏌撱�� + </p> <p>锛�2锛夊鏄撳牭濉�</p> <p> 濠村辜鍎块蓟鑵旇緝鐙獎锛岃绠′赴瀵岋紝閬囧埌杞诲井鐨勫埡婵�灏变細鍏呰姘磋偪锛屽紩鍙戦蓟榛忚啘鑲胯儉锛屽垎娉岀墿澧炲锛岄�犳垚榧昏厰鍫靛銆� @@ -373,11 +388,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-26</div> + <div class="header-bj zt03-bj"></div> + <div class="content zt03-con"> + <div class="pageStr ztStr">2-26</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img src="../../image/zt.png" class="ztImg" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -409,7 +424,9 @@ </p> <h5 class="h5-zt" id="e110">2.褰卞搷濠村辜鍎垮彛鑵斿仴搴风殑鍥犵礌</h5> <p>濠村辜鍎垮彛鑵斿仴搴峰彈鍒板緢澶氬洜绱犵殑褰卞搷锛岃琛�2-3-2銆�</p> - <p class="img">琛�2-3-2銆�褰卞搷濠村辜鍎垮彛鑵斿仴搴风殑鍥犵礌鍙婄淮鎶ゅ彛鑵斿仴搴风殑鍋氭硶</p> + <p class="img"> + 琛�2-3-2銆�褰卞搷濠村辜鍎垮彛鑵斿仴搴风殑鍥犵礌鍙婄淮鎶ゅ彛鑵斿仴搴风殑鍋氭硶 + </p> <p class="center openImgBox"> <img class="img-a" alt="" src="../../image/0189-3.jpg" /> </p> @@ -422,14 +439,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-27</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-27</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> @@ -472,11 +489,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-28</div> + <div class="header-bj zt03-bj"></div> + <div class="content zt03-con"> + <div class="pageStr ztStr">2-28</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img src="../../image/zt.png" class="ztImg" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -507,7 +524,9 @@ 淇濊偛鍛橀渶瑕佹瘡澶╃敤娓呮按甯姪濠村辜鍎挎礂鑴搞�佹墜銆佽�崇瓑鐨偆瑁搁湶鐨勯儴鍒嗭紝鍕や负鍏舵礂婢°�佹礂澶达紝鍕ゅ壀鎸囩敳锛屼繚鎸佺毊鑲ゆ竻娲併�傝嫢濠村辜鍎跨殑鐨剛鑵哄垎娉岀墿杩囧锛屽湪澶寸毊涓婂舰鎴愪竴灞傞粍瑜愯壊鐨勭梻鐨紝鍙皢妞嶇墿娌瑰姞鐑紝鏅惧噳涔嬪悗鐢ㄦ潵闂疯蒋鐥傜毊锛岀劧鍚庡啀娓呮礂銆傚湪鐩ユ礂杩囩▼涓渶瑕佹敞鎰忎繚娓╋紝姝g‘閫夌敤濠村辜鍎挎礂鎶ょ敤鍝侊紝蹇呴』涓哄┐骞煎効閫夌敤涓撶敤鎶よ偆鍝侊紝鍒囦笉鍙敤鎴愪汉鐨勬竻娲佺敤鍝併�佹姢鑲ゅ搧鍙婃湁鍒烘縺鎬х殑鍖栧鍝併�傚湪鐨偆涓婃秱鎷嵂鐗╀篃瑕佹敞鎰忚嵂鐗╃殑娴撳害鍜屽墏閲忥紝涓嶅彲杩囬噺銆� </p> <h3 id="c052"> - <span class="bk1-h3"><span class="bj2-h3">浜�</span>銆�銆�涓嶅悓鎬у埆鐨勫┐骞煎効鐨勬竻娲併��</span> + <span class="bk1-h3" + ><span class="bj2-h3">浜�</span>銆�銆�涓嶅悓鎬у埆鐨勫┐骞煎効鐨勬竻娲併��</span + > </h3> <h4 class="h4-zt" id="d128">锛堜竴锛夊コ绔�</h4> <p> @@ -522,14 +541,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-29</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-29</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> <div class="bodystyle"> @@ -544,7 +563,10 @@ 鐢风鏈�闅炬竻鐞嗙殑鏄敓娈栧櫒瀹樸�傚垰鍑虹敓鐨勭敺绔ョ殑鍖呯毊杩樼揣闄勫湪榫熷ご涓婏紝鍙渶瑕佹妸闇插湪澶栭潰鐨勯儴鍒嗚交杞绘礂骞插噣鍗冲彲銆傚ぇ閮ㄥ垎鐨勭敺绔ュ湪2宀佷箣鍓嶏紝鍖呯毊鍜岄緹澶翠笉浼氬畬鍏ㄥ垎寮�锛岃繖鏃剁壒鍦扮炕寮�鍖呯毊娓呮礂锛屽鏋滄垚浜哄姩浣滃お澶ф垨瀛╁瓙涔卞姩閮藉鏄撳紕浼ょ敺绔ャ�傚緟鐢风闀垮ぇ涓�浜涳紝鍖呯毊涓庨緹澶村畬鍏ㄥ垎寮�涔嬪悗锛屽啀鍗忓姪鐢风缈诲紑鍖呯毊娓呮礂锛屾竻娲楁椂锛屽姩浣滀竴瀹氳杞绘煍锛屽湪鐨辫ざ澶勫鑺变簺鏃堕棿銆傜敺绔ユ病鏈夋墍璋撯�滀粠鍓嶅線鍚庘�濈殑娓呮礂鍘熷垯锛屼絾搴斿ソ濂芥竻娲楃毊鑲ょ毐瑜跺銆傚钩鏃跺鍘曞悗鐢ㄥ┐骞煎効涓撶敤婀跨焊宸炬摝骞插噣锛屾礂婢$殑鏃跺�欏彲浠ョ敤骞插噣鐨勭罕甯冩摝鎷ぇ鑵挎牴閮ㄣ�佸闃撮儴鐨勭毊鑲ょ毐瑜跺锛屽浜庣敺绔ョ殑鐫句父瑕佽交鏌斻�佷粩缁嗭紝鍖呮嫭闃磋寧涓嬫柟銆佺澗涓镐笌鐨偆璐村悎涔嬪閮借娓呮礂骞插噣銆� </p> <h3 id="c053"> - <span class="bk1-h3"><span class="bj2-h3">鍏�</span>銆�銆�浣垮┐骞煎効鍏绘垚鑹ソ鐨勭洢娲椾範鎯��</span> + <span class="bk1-h3" + ><span class="bj2-h3">鍏�</span + >銆�銆�浣垮┐骞煎効鍏绘垚鑹ソ鐨勭洢娲椾範鎯��</span + > </h3> <p> 鑹ソ鐨勭洢娲椾範鎯湁鍒╀簬濠村辜鍎胯韩蹇冨仴搴风殑鍙戝睍鍜岃涓轰範鎯殑鍩瑰吇銆備繚鑲插憳搴斿涓嶅悓骞撮緞鐨勫┐骞煎効杩涜鐩ユ礂璁粌鍜屾寚瀵硷紝浠ヤ究濠村辜鍎跨啛缁冩帉鎻$洢娲楁妧鑳斤紝褰㈡垚鑷鐩ユ礂鐨勪範鎯�� @@ -561,11 +583,11 @@ <!-- 鍋舵暟椤� --> <div class="header"> <div class="pageHeader-first"> - <div class="header-bj"></div> - <div class="content"> - <div class="pageStr">2-30</div> + <div class="header-bj zt03-bj"></div> + <div class="content zt03-con"> + <div class="pageStr ztStr">2-30</div> <div class="title"> - <img src="../../image/chapter.png" alt="" /> + <img src="../../image/zt.png" class="ztImg" alt="" /> <span class="cahpter">濠村辜鍎跨敓娲荤収鎶ぢ烽槄璇绘墜鍐�</span> </div> </div> @@ -573,26 +595,30 @@ </div> <div class="bodystyle"> - <p class="center openImgBox"> - <img class="img-b" alt="" src="../../image/0193-1.jpg" /> - </p> - <p class="img">鍥�2-3-7銆�鎵樿偛鍥殑鐩ユ礂鐜</p> - <h4 class="h4-zt" id="d131">锛堜簩锛夐紦鍔卞辜鍎跨粌涔犵洢娲�</h4> - <p> - 淇濊偛鍛樹笉瑕佸洜涓烘媴蹇冨辜鍎胯嚜宸辨礂涓嶅共鍑�鑰屽寘鍔炰唬鏇匡紝搴旀斁鎵嬭骞煎効缁冧範鐩ユ礂銆傞拡瀵�13锝�24涓湀榫勭殑骞煎効锛屽簲鍗忓姪鍜屽紩瀵煎辜鍎胯嚜宸辨礂鎵嬨�佸埛鐗欙紱閽堝25锝�36鏈堥緞鐨勫辜鍎匡紝搴斿紩瀵煎辜鍎块鍚庢急鍙o紝姝g‘鍒风墮锛屼娇鐢ㄨ偉鐨傛垨娲楁墜娑叉纭礂鎵嬶紝璁よ瘑鑷繁鐨勬瘺宸惧苟鎿︽墜銆� - </p> - <h4 class="h4-zt" id="d132">锛堜笁锛夊彂鎸ョず鑼冪殑绉瀬浣滅敤</h4> - <p> - 鎴愪汉鏄┐骞煎効妯′豢鐨勯噸瑕佸璞★紝淇濊偛鍛樼殑鏃ュ父琛屼负闅忔椂閮戒細瀵瑰┐骞煎効鐨勫彂灞曚骇鐢熸綔绉婚粯鍖栫殑褰卞搷銆備繚鑲插憳瑕佸杽浜庢姄浣忎竴鍒囨満浼氫负濠村辜鍎垮仛濂借涓虹ず鑼冿紝鐢ㄨ嚜宸辫壇濂界殑鐩ユ礂涔犳儻鍘诲奖鍝嶄粬浠�傚悓浼存槸濠村辜鍎胯鎽╁涔犵殑姒滄牱銆備繚鑲插憳鍙互鍦ㄥ┐骞煎効涓爲绔嬭壇濂界殑鍏稿瀷锛岃濠村辜鍎跨浉浜掍氦娴併�佽鎽╁拰瀛︿範銆� - </p> - <h4 class="h4-zt" id="d133">锛堝洓锛夋牴鎹勾榫勭壒鐐瑰洜鏉愭柦鏁�</h4> - <p> - 涓嶅悓骞撮緞濠村辜鍎跨殑鐩ユ礂鏁欒偛鐨勬寚瀵煎唴瀹瑰拰鏂规硶搴斿悇鏈変笉鍚屻�傚1宀佷互鍐呯殑濠村効锛屼繚鑲插憳浠ュ叏绋嬪府鍔╀负涓伙紱1锝�2宀佺殑骞煎効锛屼繚鑲插憳鍙互鍦ㄩ儴鍒嗙畝鍗曠殑鐜妭鏀炬墜璁╁辜鍎跨嫭绔嬪畬鎴愶紝闅句互瀹屾垚鐨勭幆鑺傜敱淇濊偛鍛樺府鍔╁畬鎴愶紱2锝�3宀佺殑骞煎効锛屼繚鑲插憳鍦ㄦ瘡鏃ョ殑鐩ユ礂鐜妭鎸囧骞煎効缁冧範锛屽浼氬ぇ澶氭暟鐩ユ礂鍐呭鐨勬搷浣溿�傚洜涓哄┐骞煎効鍚勬柟闈㈢殑鑳藉姏杈冧綆锛屼繚鑲插憳蹇呴』瀵瑰┐骞煎効杩涜鍙嶅鐨勩�佹寔涔嬩互鎭掔殑鎸囧鍜岃缁冿紝鎵嶅彲鑳藉彇寰楄緝濂界殑鏁堟灉銆� - </p> - <h4 class="h4-zt" id="d134">锛堜簲锛夊紑灞曢�傚綋鐨勮涓哄己鍖�</h4> - <p> - 浠讳綍涓�椤圭洢娲楁椿鍔ㄩ兘鍖呮嫭璁稿姝ラ锛屽彧鏈夊弽澶嶇粌涔狅紝濠村辜鍎挎墠浼氱啛缁冩帉鎻★紝骞跺舰鎴愪範鎯�傞拡瀵逛竴浜涘┐骞煎効鍦ㄧ洢娲楁椂琛ㄧ幇鍑虹殑绉嶇涓嶈壇琛屼负涔犳儻锛屽簲閫夋嫨姝g‘鐨勮涓轰綔涓虹洰鏍囦笉鏂己鍖栥�備緥濡傦紝瀵逛簬鐩ユ礂鏃剁埍瀣夐椆鐨勫┐骞煎効锛岃姹傚湪瑙勫畾鐨勬椂闂村唴瀹屾垚锛涘浜庢帹鎸ゃ�佹湁鏀诲嚮琛屼负鐨勫┐骞煎効锛屼笉蹇樻彁閱掑叾閬靛畧鐩ユ礂瑕佹眰锛涘綋濠村辜鍎跨己涔忔帶鍒惰兘鍔涙椂锛屼繚鑲插憳瑕佹湁鎰忚瘑鍦板埄鐢ㄨ瑷�銆佽〃鎯呫�佸姩浣滅瓑缁欎簣鏆楃ず锛屽強鏃舵彁閱掞紝濡傛彁閱掑┐骞煎効闅忔墜鍏崇揣姘撮緳澶达紝璁╁┐骞煎効浠庡皬鍏绘垚鑺傜害鐢ㄦ按鐨勫ソ涔犳儻銆� - </p> + <div class="rightPng"> + <p class="center openImgBox"> + <img class="img-b" alt="" src="../../image/0193-1.jpg" /> + </p> + <p class="img">鍥�2-3-7銆�鎵樿偛鍥殑鐩ユ礂鐜</p> + </div> + <div> + <h4 class="h4-zt" id="d131">锛堜簩锛夐紦鍔卞辜鍎跨粌涔犵洢娲�</h4> + <p> + 淇濊偛鍛樹笉瑕佸洜涓烘媴蹇冨辜鍎胯嚜宸辨礂涓嶅共鍑�鑰屽寘鍔炰唬鏇匡紝搴旀斁鎵嬭骞煎効缁冧範鐩ユ礂銆傞拡瀵�13锝�24涓湀榫勭殑骞煎効锛屽簲鍗忓姪鍜屽紩瀵煎辜鍎胯嚜宸辨礂鎵嬨�佸埛鐗欙紱閽堝25锝�36鏈堥緞鐨勫辜鍎匡紝搴斿紩瀵煎辜鍎块鍚庢急鍙o紝姝g‘鍒风墮锛屼娇鐢ㄨ偉鐨傛垨娲楁墜娑叉纭礂鎵嬶紝璁よ瘑鑷繁鐨勬瘺宸惧苟鎿︽墜銆� + </p> + <h4 class="h4-zt" id="d132">锛堜笁锛夊彂鎸ョず鑼冪殑绉瀬浣滅敤</h4> + <p> + 鎴愪汉鏄┐骞煎効妯′豢鐨勯噸瑕佸璞★紝淇濊偛鍛樼殑鏃ュ父琛屼负闅忔椂閮戒細瀵瑰┐骞煎効鐨勫彂灞曚骇鐢熸綔绉婚粯鍖栫殑褰卞搷銆備繚鑲插憳瑕佸杽浜庢姄浣忎竴鍒囨満浼氫负濠村辜鍎垮仛濂借涓虹ず鑼冿紝鐢ㄨ嚜宸辫壇濂界殑鐩ユ礂涔犳儻鍘诲奖鍝嶄粬浠�傚悓浼存槸濠村辜鍎胯鎽╁涔犵殑姒滄牱銆備繚鑲插憳鍙互鍦ㄥ┐骞煎効涓爲绔嬭壇濂界殑鍏稿瀷锛岃濠村辜鍎跨浉浜掍氦娴併�佽鎽╁拰瀛︿範銆� + </p> + <h4 class="h4-zt" id="d133">锛堝洓锛夋牴鎹勾榫勭壒鐐瑰洜鏉愭柦鏁�</h4> + <p> + 涓嶅悓骞撮緞濠村辜鍎跨殑鐩ユ礂鏁欒偛鐨勬寚瀵煎唴瀹瑰拰鏂规硶搴斿悇鏈変笉鍚屻�傚1宀佷互鍐呯殑濠村効锛屼繚鑲插憳浠ュ叏绋嬪府鍔╀负涓伙紱1锝�2宀佺殑骞煎効锛屼繚鑲插憳鍙互鍦ㄩ儴鍒嗙畝鍗曠殑鐜妭鏀炬墜璁╁辜鍎跨嫭绔嬪畬鎴愶紝闅句互瀹屾垚鐨勭幆鑺傜敱淇濊偛鍛樺府鍔╁畬鎴愶紱2锝�3宀佺殑骞煎効锛屼繚鑲插憳鍦ㄦ瘡鏃ョ殑鐩ユ礂鐜妭鎸囧骞煎効缁冧範锛屽浼氬ぇ澶氭暟鐩ユ礂鍐呭鐨勬搷浣溿�傚洜涓哄┐骞煎効鍚勬柟闈㈢殑鑳藉姏杈冧綆锛屼繚鑲插憳蹇呴』瀵瑰┐骞煎効杩涜鍙嶅鐨勩�佹寔涔嬩互鎭掔殑鎸囧鍜岃缁冿紝鎵嶅彲鑳藉彇寰楄緝濂界殑鏁堟灉銆� + </p> + <h4 class="h4-zt" id="d134">锛堜簲锛夊紑灞曢�傚綋鐨勮涓哄己鍖�</h4> + <p> + 浠讳綍涓�椤圭洢娲楁椿鍔ㄩ兘鍖呮嫭璁稿姝ラ锛屽彧鏈夊弽澶嶇粌涔狅紝濠村辜鍎挎墠浼氱啛缁冩帉鎻★紝骞跺舰鎴愪範鎯�傞拡瀵逛竴浜涘┐骞煎効鍦ㄧ洢娲楁椂琛ㄧ幇鍑虹殑绉嶇涓嶈壇琛屼负涔犳儻锛屽簲閫夋嫨姝g‘鐨勮涓轰綔涓虹洰鏍囦笉鏂己鍖栥�備緥濡傦紝瀵逛簬鐩ユ礂鏃剁埍瀣夐椆鐨勫┐骞煎効锛岃姹傚湪瑙勫畾鐨勬椂闂村唴瀹屾垚锛涘浜庢帹鎸ゃ�佹湁鏀诲嚮琛屼负鐨勫┐骞煎効锛屼笉蹇樻彁閱掑叾閬靛畧鐩ユ礂瑕佹眰锛涘綋濠村辜鍎跨己涔忔帶鍒惰兘鍔涙椂锛屼繚鑲插憳瑕佹湁鎰忚瘑鍦板埄鐢ㄨ瑷�銆佽〃鎯呫�佸姩浣滅瓑缁欎簣鏆楃ず锛屽強鏃舵彁閱掞紝濡傛彁閱掑┐骞煎効闅忔墜鍏崇揣姘撮緳澶达紝璁╁┐骞煎効浠庡皬鍏绘垚鑺傜害鐢ㄦ按鐨勫ソ涔犳儻銆� + </p> + </div> </div> </div> </div> @@ -602,14 +628,14 @@ <div class="header"> <div class="pageHeader-second"> <div class="second-con"> - <div class="second-left"></div> + <div class="second-left zt03-left"></div> <div class="second-right"> - <img src="../../image/pageImg.png" alt="" /> - <span class="pageStr">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> - <span class="pageNum">2-31</span> + <img src="../../image/zt-pen.png" class="zt-pen" alt="" /> + <span class="pageStr zt03-Str">涓撻涓壜风洢娲楁椿鍔ㄧ収鎶�</span> + <span class="pageNum zt03-pageNum">2-31</span> </div> </div> - <div class="borderLine"></div> + <div class="borderLine zt03-bdline"></div> </div> </div> @@ -621,11 +647,19 @@ <p> 鑹ソ鐨勭洢娲椾範鎯槸浜轰笉鍙己灏戠殑绱犺川涔嬩竴锛屽浜庡瀛愪粖鍚庣殑鍋ュ悍鍙戝睍涔熷叿鏈夌浉褰撻噸瑕佺殑浣滅敤銆傛垜浠簲浠庡皬涓哄瀛愭挱涓嬭壇濂戒範鎯殑绉嶅瓙锛屽洜涓烘湁鑹ソ鐩ユ礂涔犳儻鐨勫瀛愬皢缁堣韩鍙楃泭銆� </p> - <p><br/></p> + <p><br /></p> <div class="bk-tx border-xxfs"> - <div class="bj3"><span class="cirlce"></span><span>瀛︿範鍙嶆��</span></div> - <textarea v-model="chapter012.textAreaItem.text39" style="border: 0" placeholder="璇疯緭鍏ュ唴瀹�" rows="8" - class="textareaInput" @blur="onBlurChange('text39')"></textarea> + <div class="bj3"> + <span class="cirlce"></span><span>瀛︿範鍙嶆��</span> + </div> + <textarea + v-model="chapter012.textAreaItem.text39" + style="border: 0" + placeholder="璇疯緭鍏ュ唴瀹�" + rows="8" + class="textareaInput" + @blur="onBlurChange('text39')" + ></textarea> </div> </div> </div> diff --git a/src/books/lifeCare/view/components/index.vue b/src/books/lifeCare/view/components/index.vue index 2e60d55..b766ff6 100644 --- a/src/books/lifeCare/view/components/index.vue +++ b/src/books/lifeCare/view/components/index.vue @@ -191,7 +191,7 @@ }, mounted() { // 榛樿鍔犺浇绔犺妭 - this.showCatalogList = [1]; + this.showCatalogList = [14]; // 婊氬姩鐩戝惉鑺傛祦 this.throttledScrollHandler = _.throttle( this.scrollFun, 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 98% rename from src/books/math/assets/main.less rename to src/books/mathBook/assets/main.less index a735352..52000e9 100644 --- a/src/books/math/assets/main.less +++ b/src/books/mathBook/assets/main.less @@ -661,7 +661,7 @@ } .video-border { border: 1px solid #15c0f2; - border-radius: 30px; + border-radius: 20px; } .fm-st { font-family: "STKaiti"; @@ -740,8 +740,8 @@ } .collect-btn { cursor: pointer; - width: 20px; - height: 20px; + width: 16px; + height: 16px; margin-left: 10px; } // 鏄剧ず绛旀鎸夐挳 @@ -750,10 +750,10 @@ cursor: pointer; text-indent: 0; display: inline-block; - border:1px solid #8281ED; + border:1px solid #00a1e9; height: 22px; - padding: 5px; - background-color:#8281ED ; + padding: 2px; + background-color:#00a1e9 ; border-radius: 5px; svg { fill: #fff; @@ -761,7 +761,7 @@ &:hover { background-color: #fff; svg { - fill:#8281ED ; + fill:#00a1e9 ; } } } diff --git a/src/books/math/view/components/chapter001.vue b/src/books/mathBook/view/components/chapter001.vue similarity index 96% rename from src/books/math/view/components/chapter001.vue rename to src/books/mathBook/view/components/chapter001.vue index 94fe450..c887734 100644 --- a/src/books/math/view/components/chapter001.vue +++ b/src/books/mathBook/view/components/chapter001.vue @@ -90,15 +90,7 @@ <p class="center openImgBox"> <img class="img-c" alt="" src="../../assets/images/0100-3.jpg" /> </p> - <p class="img fl al-cn ju-cn"> - <span>鍥�3-14 </span - ><img - :src="chapterData.isCollectImg ? collectCheck : collectImg" - alt="" - class="collect-btn" - @click="handleCollect('img')" - /> - </p> + <p class="img">鍥�3-14</p> <p> 瑙傚療鍥�3-14锛�1锛� 鍙戠幇锛屽嚱鏁�<i>f</i>锛�<i>x</i>锛�=|<i>x</i>|鐨勫畾涔夊煙鏄紙-鈭烇紝+鈭烇級锛屽嚱鏁板浘鍍忓叧浜�<i>y</i>杞村绉�.浠庤〃3-11涓繕鍙戠幇锛屽綋鑷彉閲忓彇涓�瀵圭浉鍙嶆暟鏃讹紝瀵瑰簲鐨勫嚱鏁板�肩浉绛夛紝濡�<i>f</i>锛�-1锛�=<i>f</i>锛�1锛�=1锛�<i>f</i>锛�-2锛�=<i>f</i>锛�2锛�=2锛�<i>f</i>锛�-3锛�=<i>f</i>锛�3锛�=3锛屸�﹀疄闄呬笂锛屽浠绘剰<i>x</i>鈭堬紙-鈭烇紝+鈭烇級锛岄兘鏈�<i>f</i>锛�-<i>x</i>锛�=|-<i>x</i>|=|<i>x</i>|=<i>f</i>锛�<i>x</i>锛夛紝鍗�<i>f</i>锛�-<i>x</i>锛�=<i>f</i>锛�<i>x</i>锛�. @@ -146,7 +138,17 @@ style="width: 40%" /> </p> - <p class="img">鍥�3-15</p> + <p class="img fl fl-cn ju-cn"> + <span>鍥�3-15</span> + <el-tooltip class="item" effect="dark" :content="chapterData.isCollectImg ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img + :src="chapterData.isCollectImg ? collectCheck : collectImg" + alt="" + class="collect-btn" + @click="handleCollect('img')" + /> + </el-tooltip> + </p> <video :src="videoPath" webkit-playsinline="true" @@ -159,14 +161,16 @@ controlslist="nodownload" class="video-border w100" ></video> - <p class="img fl al-cn ju-cn"> + <p class="img fl fl-cn ju-cn"> <span>瑙嗛锛氬垽鏁板嚱鏁板鍋舵�х殑鏂规硶鍜屾楠� </span> - <img + <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="chapterData.isCollectVideo ? collectCheck : collectImg" alt="" class="collect-btn" @click="handleCollect('video')" /> + </el-tooltip> </p> <p> <span class="zt-ls"><b>渚�1</b></span @@ -282,8 +286,8 @@ > <svg xmlns="http://www.w3.org/2000/svg" - width="20.501" - height="20.501" + width="18.501" + height="18.501" viewBox="0 0 20.501 20.501" > <path @@ -296,8 +300,8 @@ <span class="btn-box" @click="openThinkingDialog"> <svg xmlns="http://www.w3.org/2000/svg" - width="20.545" - height="22.112" + width="18.545" + height="20.112" viewBox="0 0 20.545 22.112" > <path @@ -307,38 +311,11 @@ /> </svg> </span> - <span class="btn-box" @click="openMathDiaolog"> - <svg - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="18.323" - height="18.939" - viewBox="0 0 18.323 15.939" - > - <g transform="translate(-398 -946)"> - <path - class="a" - d="M11.985,1.241a.894.894,0,0,1-.242.623.79.79,0,0,1-.6.263.644.644,0,0,1-.547-.229,3.034,3.034,0,0,1-.339-.741A.935.935,0,0,0,10.1.846a.4.4,0,0,0-.291-.1.36.36,0,0,0-.333.18,1.836,1.836,0,0,0-.2.478L8.251,4.753H9.7l-.27.79H8.043l-1.51,4.849a27.9,27.9,0,0,1-1.06,2.93,5.5,5.5,0,0,1-1.316,1.857,3.11,3.11,0,0,1-2.189.755,2.258,2.258,0,0,1-1.455-.409A1.192,1.192,0,0,1,0,14.618a.97.97,0,0,1,.27-.693.894.894,0,0,1,.693-.291.741.741,0,0,1,.693.27,1.815,1.815,0,0,1,.2.693c0,.381.2.575.492.575a.817.817,0,0,0,.693-.478,6.983,6.983,0,0,0,.568-1.469L6,5.543H4.5l.236-.776h1.5l.159-.54a14.548,14.548,0,0,1,.693-2.016A4.544,4.544,0,0,1,8.313.694,2.91,2.91,0,0,1,10.281,0a2.425,2.425,0,0,1,.8.145,1.5,1.5,0,0,1,.693.429.963.963,0,0,1,.236.693Z" - transform="translate(398 948)" - /> - <path - class="b" - d="M18.323,5.668a3.505,3.505,0,0,1-.152,1.046H17.36a3.969,3.969,0,0,0,.166-1.06.5.5,0,0,0-.062-.236.27.27,0,0,0-.249-.132.346.346,0,0,0-.229.076c-.069.055-.222.208-.471.471L14.936,7.489a22.329,22.329,0,0,0-1.552,1.621l-1.815,1.974a2.168,2.168,0,0,1-1.385.859c-.492,0-.741-.333-.741-.991a3.575,3.575,0,0,1,.3-1.385h.914a4.766,4.766,0,0,0-.263,1.1c0,.18.048.263.159.263s.242-.111.464-.333l2.147-2.286c-.006-.033,1.525-1.611,1.524-1.6l1.3-1.385a2.078,2.078,0,0,1,1.385-.8.755.755,0,0,1,.776.388,1.9,1.9,0,0,1,.173.776Z" - transform="translate(398 948)" - /> - <path - class="a" - d="M14.936,7.489l.693,2.251a5.154,5.154,0,0,0,.236.61c.083.159.18.242.3.242a.82.82,0,0,0,.533-.457,4.849,4.849,0,0,0,.339-.817H17.8a4.849,4.849,0,0,1-.693,1.51,2.813,2.813,0,0,1-.873.852,1.766,1.766,0,0,1-.88.27,1.178,1.178,0,0,1-1.018-.464,4.357,4.357,0,0,1-.623-1.309l-.326-1.067a6.4,6.4,0,0,0-.222-.8L12.747,7c-.083-.27-.152-.478-.2-.6a1.136,1.136,0,0,0-.194-.312.4.4,0,0,0-.284-.118c-.326,0-.6.423-.817,1.261h-.769a6.671,6.671,0,0,1,.6-1.5,3.034,3.034,0,0,1,.81-.873,1.663,1.663,0,0,1,.942-.312,1.344,1.344,0,0,1,1.067.471,3.692,3.692,0,0,1,.644,1.268l.139.436C14.672,6.7,14.936,7.489,14.936,7.489Z" - transform="translate(398 948)" - /> - </g> - </svg> - </span> <span class="btn-box" @click="stepDialog = true"> <svg xmlns="http://www.w3.org/2000/svg" - width="19.28" - height="20.563" + width="17.28" + height="19.563" viewBox="0 0 19.28 20.563" > <g transform="translate(-109.056 -82.941)"> @@ -360,6 +337,33 @@ </g> </svg> </span> + <span class="btn-box" @click="openMathDiaolog"> + <svg + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="17.323" + height="17.939" + viewBox="0 0 18.323 15.939" + > + <g transform="translate(-398 -946)"> + <path + class="a" + d="M11.985,1.241a.894.894,0,0,1-.242.623.79.79,0,0,1-.6.263.644.644,0,0,1-.547-.229,3.034,3.034,0,0,1-.339-.741A.935.935,0,0,0,10.1.846a.4.4,0,0,0-.291-.1.36.36,0,0,0-.333.18,1.836,1.836,0,0,0-.2.478L8.251,4.753H9.7l-.27.79H8.043l-1.51,4.849a27.9,27.9,0,0,1-1.06,2.93,5.5,5.5,0,0,1-1.316,1.857,3.11,3.11,0,0,1-2.189.755,2.258,2.258,0,0,1-1.455-.409A1.192,1.192,0,0,1,0,14.618a.97.97,0,0,1,.27-.693.894.894,0,0,1,.693-.291.741.741,0,0,1,.693.27,1.815,1.815,0,0,1,.2.693c0,.381.2.575.492.575a.817.817,0,0,0,.693-.478,6.983,6.983,0,0,0,.568-1.469L6,5.543H4.5l.236-.776h1.5l.159-.54a14.548,14.548,0,0,1,.693-2.016A4.544,4.544,0,0,1,8.313.694,2.91,2.91,0,0,1,10.281,0a2.425,2.425,0,0,1,.8.145,1.5,1.5,0,0,1,.693.429.963.963,0,0,1,.236.693Z" + transform="translate(398 948)" + /> + <path + class="b" + d="M18.323,5.668a3.505,3.505,0,0,1-.152,1.046H17.36a3.969,3.969,0,0,0,.166-1.06.5.5,0,0,0-.062-.236.27.27,0,0,0-.249-.132.346.346,0,0,0-.229.076c-.069.055-.222.208-.471.471L14.936,7.489a22.329,22.329,0,0,0-1.552,1.621l-1.815,1.974a2.168,2.168,0,0,1-1.385.859c-.492,0-.741-.333-.741-.991a3.575,3.575,0,0,1,.3-1.385h.914a4.766,4.766,0,0,0-.263,1.1c0,.18.048.263.159.263s.242-.111.464-.333l2.147-2.286c-.006-.033,1.525-1.611,1.524-1.6l1.3-1.385a2.078,2.078,0,0,1,1.385-.8.755.755,0,0,1,.776.388,1.9,1.9,0,0,1,.173.776Z" + transform="translate(398 948)" + /> + <path + class="a" + d="M14.936,7.489l.693,2.251a5.154,5.154,0,0,0,.236.61c.083.159.18.242.3.242a.82.82,0,0,0,.533-.457,4.849,4.849,0,0,0,.339-.817H17.8a4.849,4.849,0,0,1-.693,1.51,2.813,2.813,0,0,1-.873.852,1.766,1.766,0,0,1-.88.27,1.178,1.178,0,0,1-1.018-.464,4.357,4.357,0,0,1-.623-1.309l-.326-1.067a6.4,6.4,0,0,0-.222-.8L12.747,7c-.083-.27-.152-.478-.2-.6a1.136,1.136,0,0,0-.194-.312.4.4,0,0,0-.284-.118c-.326,0-.6.423-.817,1.261h-.769a6.671,6.671,0,0,1,.6-1.5,3.034,3.034,0,0,1,.81-.873,1.663,1.663,0,0,1,.942-.312,1.344,1.344,0,0,1,1.067.471,3.692,3.692,0,0,1,.644,1.268l.139.436C14.672,6.7,14.936,7.489,14.936,7.489Z" + transform="translate(398 948)" + /> + </g> + </svg> + </span> </li> <li class="fl fl-cn"> <p>锛�2锛� <i>f</i>锛�<i>x</i>锛�=<i>x</i><sup>2</sup>+<i>x</i>锛�</p> @@ -367,10 +371,10 @@ class="btn-box" @click="isShowExampleFour = !isShowExampleFour" > - <svg + <svg xmlns="http://www.w3.org/2000/svg" - width="20.501" - height="20.501" + width="18.501" + height="18.501" viewBox="0 0 20.501 20.501" > <path @@ -384,8 +388,8 @@ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - width="18.323" - height="18.939" + width="17.323" + height="17.939" viewBox="0 0 18.323 15.939" > <g transform="translate(-398 -946)"> @@ -414,10 +418,10 @@ class="btn-box" @click="isShowExampleFive = !isShowExampleFive" > - <svg + <svg xmlns="http://www.w3.org/2000/svg" - width="20.501" - height="20.501" + width="18.501" + height="18.501" viewBox="0 0 20.501 20.501" > <path @@ -431,8 +435,8 @@ <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - width="18.323" - height="18.939" + width="17.323" + height="17.939" viewBox="0 0 18.323 15.939" > <g transform="translate(-398 -946)"> @@ -750,20 +754,26 @@ if (oldAnswer) { oldAnswer = JSON.parse(oldAnswer); console.log("鏃ф暟鎹�", oldAnswer); - if(oldAnswer[9]) { + if (oldAnswer[9]) { for (let index = 0; index < res.data.data.length; index++) { const item = res.data.data[index]; - if(item.infoList.length) { - for (let cindex = 0; cindex < item.infoList.length; cindex++) { - const citem = item.infoList[cindex]; - const question = oldAnswer[9].find(ditem => ditem.id == citem.id) - if(question) { - citem.userAnswer = question.userAnswer + if (item.infoList.length) { + for ( + let cindex = 0; + cindex < item.infoList.length; + cindex++ + ) { + const citem = item.infoList[cindex]; + const question = oldAnswer[9].find( + (ditem) => ditem.id == citem.id + ); + if (question) { + citem.userAnswer = question.userAnswer; + } } } - } } - } + } } this.questionData = res.data.data; }); 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 妯″潡浜岋紙涓�锛夊崟椤规妧鏈缁� 姝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 +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/examinations/index.vue b/src/components/examinations/index.vue index 23b1a5f..5efb3b0 100644 --- a/src/components/examinations/index.vue +++ b/src/components/examinations/index.vue @@ -68,7 +68,7 @@ v-for="(itemText, indexText) in value.stem" :key="indexText" > - <span v-if="typeof itemText == 'string'">{{ itemText }}</span> + <span v-if="typeof itemText == 'string'" v-html="itemText" ></span> <!-- --> <el-input v-else 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