From c3a97e9da90ab1a34f766acd35944d295cc5a6bf Mon Sep 17 00:00:00 2001 From: unknown <qq1940665526@163.com> Date: 星期三, 05 六月 2024 13:41:00 +0800 Subject: [PATCH] 优化 --- src/books/childHealth/view/content/components/chapter003.vue | 9 src/books/English/view/components/chapter001.vue | 13 src/books/childHealth/view/content/components/chapter008.vue | 26 src/books/childHealth/view/content/components/header.vue | 2 src/books/sportsAndHealth/image/354-2.png | 0 src/books/childHealth/view/content/components/chapter002.vue | 8 src/books/childHealth/view/content/index.vue | 12 src/books/childHealth/view/content/components/chapter010.vue | 26 src/books/childHealth/view/content/components/chapter009.vue | 26 src/books/sportsAndHealth/image/355-3.png | 0 src/books/sportsAndHealth/image/354-1.png | 0 src/books/childHealth/view/content/components/chapter005.vue | 4 src/books/sportsAndHealth/view/testPp.vue | 119 ++++++ src/books/English/view/components/index.vue | 86 ++- src/books/childHealth/view/content/components/chapter001.vue | 394 +++++++++++++-------- src/books/sportsAndHealth/image/354-4.png | 0 src/books/sportsAndHealth/css/default.less | 4 src/books/sportsAndHealth/image/355-1.png | 0 src/books/childHealth/view/content/components/chapter0004.vue | 265 ++++++++----- src/books/childHealth/view/content/components/chapter006.vue | 26 src/books/sportsAndHealth/image/355-2.png | 0 src/books/sportsAndHealth/image/354-3.png | 0 src/books/childHealth/view/content/components/chapter007.vue | 8 src/books/sportsAndHealth/view/chapter005.html | 6 src/components/matching/matching.vue | 12 src/components/miniAudio/index.vue | 24 + 26 files changed, 721 insertions(+), 349 deletions(-) diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue index 11382cc..d7b3a6e 100644 --- a/src/books/English/view/components/chapter001.vue +++ b/src/books/English/view/components/chapter001.vue @@ -505,7 +505,7 @@ <div class="bodystyle"> <h3 id="c002" class="fl al-cn"> <span class="bjh3">Listening</span> - <audio :src="resource.listenOne" controls></audio> + <audio :src="resource.listenOne" controls class="audio"></audio> </h3> <p> <b @@ -526,7 +526,7 @@ </div> <h3 id="c003" class="fl al-cn"> <span class="bjh3">Reading</span> - <audio :src="resource.readingOne" controls></audio> + <audio :src="resource.readingOne" controls class="audio"></audio> </h3> <p> 1.How was Chinese culture introduced to the world in ancient @@ -735,6 +735,7 @@ :src="resource.readingTwo" controls style="margin-left: 10px" + class="audio" ></audio> <p>wonderland /藞w蕦nd蓹l忙nd/ <i>n.</i> 鏈夎澶氬濡欎簨鐗╃殑鍦版柟</p> <div class="bkbj"> @@ -2800,5 +2801,11 @@ select { height: 24px; } - +.mini-audio { + width: 200px; + height: 200px; + position: fixed; + right:0; + background-color: red; +} </style> diff --git a/src/books/English/view/components/index.vue b/src/books/English/view/components/index.vue index a8700d0..3af9f8a 100644 --- a/src/books/English/view/components/index.vue +++ b/src/books/English/view/components/index.vue @@ -18,12 +18,14 @@ :showPageList="loadPageList" ></chapterOne> </div> + <miniAudio :path="audioPath"></miniAudio> </div> </template> <script> import pageHeader from "./header.vue"; import chapterOne from "./chapter001.vue"; +import miniAudio from "@/components/miniAudio/index.vue"; import NoteIcon from "@/assets/images/biji.png"; import _ from "lodash"; import Swiper from "swiper/bundle"; @@ -31,6 +33,7 @@ import Viewer from "viewerjs"; import "viewerjs/dist/viewer.css"; export default { + name: "page-main", data() { return { catalogLength: 2, // 鎬荤珷鑺傛暟 @@ -44,6 +47,7 @@ loadPageList: [], questionData: {}, renderSignMap: {}, + audioPath:'' }; }, computed: { @@ -78,6 +82,7 @@ setTimeout(() => { this.initSwiper(); this.initViewer(); + this.getAduio(); }, 200); }, }, @@ -565,40 +570,40 @@ for (let i = 0; i < pptDoms.length; i++) { const dom = pptDoms[i]; new Swiper(dom, { - loop: false, // 鏃犵紳 - autoplay: false, - paginationClickable: true, - slidesPerView: 1, // 涓�缁勪笁涓� - spaceBetween: 30, // 闂撮殧 - // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳 - navigation: { - nextEl: (this.container ? this.container : document).querySelector( - ".swiper-button-next" - ), - prevEl: (this.container ? this.container : document).querySelector( - ".swiper-button-prev" - ), - }, - // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔� - observer: true, - observeParents: true, - on: { - init:(value) => { - let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級 - let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁� - var paginationInfoEl = dom.querySelector('.pageBox'); - if(paginationInfoEl) - paginationInfoEl.textContent = currentPage + '/' + totalPages; + loop: false, // 鏃犵紳 + autoplay: false, + paginationClickable: true, + slidesPerView: 1, // 涓�缁勪笁涓� + spaceBetween: 30, // 闂撮殧 + // 濡傛灉闇�瑕佸墠杩涘悗閫�鎸夐挳 + navigation: { + nextEl: (this.container ? this.container : document).querySelector( + ".swiper-button-next" + ), + prevEl: (this.container ? this.container : document).querySelector( + ".swiper-button-prev" + ), }, - slideChange:(value) => { - let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級 - let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁� - var paginationInfoEl = dom.querySelector('.pageBox'); - if(paginationInfoEl) - paginationInfoEl.textContent = currentPage + '/' + totalPages; + // 绐楀彛鍙樺寲,閲嶆柊init,閽堝F11鍏ㄥ睆鍜屾斁澶х缉灏�,蹇呴』鍔� + observer: true, + observeParents: true, + on: { + init: (value) => { + let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級 + let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁� + var paginationInfoEl = dom.querySelector(".pageBox"); + if (paginationInfoEl) + paginationInfoEl.textContent = currentPage + "/" + totalPages; + }, + slideChange: (value) => { + let currentPage = value.activeIndex + 1; // 鑾峰彇褰撳墠椤碉紙浠�1寮�濮嬭鏁帮級 + let totalPages = value.slides.length; // 鑾峰彇鎬婚〉鏁� + var paginationInfoEl = dom.querySelector(".pageBox"); + if (paginationInfoEl) + paginationInfoEl.textContent = currentPage + "/" + totalPages; + }, }, - }, - }); + }); } }, initViewer() { @@ -622,7 +627,7 @@ console.log("鐢熷兓瀛�", event, word); if (this.$store.state.qiankun && this.$store.state.qiankun.chooseWords) { this.$store.state.qiankun.chooseWords({ - type:"word", + type: "word", word, x: event.pageX, y: event.pageY, @@ -630,10 +635,25 @@ } // chooseWords }, + // 鑾峰彇auido瀹炰緥 + getAduio() { + let allVideo = ( + this.container ? this.container : document + ).querySelectorAll(".audio"); + allVideo = Array.from(allVideo) + if (allVideo.length) { + const playAudio = allVideo.reverse().find((item) => item.paused == false); + if (playAudio) { + console.log("绗釜闊抽鍦ㄦ挱鏀�", playAudio.src); + this.audioPath = playAudio.src + } + } + }, }, components: { pageHeader, chapterOne, + miniAudio, }, }; </script> diff --git a/src/books/childHealth/view/content/components/chapter0004.vue b/src/books/childHealth/view/content/components/chapter0004.vue index 845ed3d..c98fed1 100644 --- a/src/books/childHealth/view/content/components/chapter0004.vue +++ b/src/books/childHealth/view/content/components/chapter0004.vue @@ -46,7 +46,11 @@ 涓撻瀵煎 </h6> <p class="blockh6 m0-t0 openImgBox"> - <img src="../../../assets/images/chapterFour/0094-1.jpg" alt="" class="w100 mt-20"> + <img + src="../../../assets/images/chapterFour/0094-1.jpg" + alt="" + class="w100 mt-20" + /> </p> </div> </div> @@ -71,15 +75,28 @@ 涓撻鍥涘涔犱富棰樹簩 瀛﹀墠鍎跨鍗敓涓庝繚鍋ヨ嚜涓诲涔犱换鍔″崟 瀛︿範鎸囧崡</span > <span class="t0 svg-btn" @click="changeResources('learnTableOne')"> - <svg xmlns="http://www.w3.org/2000/svg" width="16" height="17" viewBox="0 0 19.28 20.563"> + <svg + xmlns="http://www.w3.org/2000/svg" + width="16" + height="17" + viewBox="0 0 19.28 20.563" + > <g transform="translate(-109.056 -82.941)"> - <path class="a" + <path + class="a" d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z" - transform="translate(-3316.14 15289.201)" /> - <path class="a" + transform="translate(-3316.14 15289.201)" + /> + <path + class="a" d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z" - transform="translate(-196.896 -148.921)" /> - <path class="a" d="M763.392,793.79l3.262-3.262h-3.262Z" transform="translate(-638.661 -690.634)" /> + transform="translate(-196.896 -148.921)" + /> + <path + class="a" + d="M763.392,793.79l3.262-3.262h-3.262Z" + transform="translate(-638.661 -690.634)" + /> </g> </svg> </span> @@ -317,9 +334,7 @@ <div class="page-box" page="91"> <div v-if="showPageList.indexOf(91) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">83</span> </div> <div class="padding-96"> @@ -372,7 +387,7 @@ 浣撻噸娴嬮噺搴斿湪鏃╂櫒銆佺┖鑵广�佷究鍚庤繘琛屻�傚効绔ュ彲瑁镐綋鎴栫┛鑳屽績銆佺煭瑁わ紝涔熷彲鍦ㄦ祴鍚庢墸闄よ。鏈嶈川閲忋�� </p> --> <p>锛�2锛夎韩楂橈紙闀匡級</p> - + <p> 韬珮锛堥暱锛夋槸浜轰綋绔欑珛鏃堕椤跺埌鑴氳窡锛堜笌鍦伴潰鐩稿強澶勶級鐨勫瀭鐩撮珮搴︺��3宀佷互涓嬪効绔ョ珛浣嶆祴閲忎笉鍑嗙‘锛屽簲閲囩敤浠板崸浣嶆祴閲忥紝鏁呰韩楂樺張绉拌韩闀匡紱3宀佷互鍚庡彲绔嬩綅娴嬮噺锛岀О韬珮銆傜珛浣嶄笌浠板崸浣嶆祴閲忓�肩浉宸�1锝�2鍘樼背銆� </p> @@ -409,7 +424,7 @@ <p> 3宀佷互涓婂効绔ョ敤韬珮璁℃祴閲忚韩楂樸�傚湪浣跨敤韬珮璁℃祴閲忔椂锛屽彈娴嬪効绔ヨ劚鍘婚瀷甯斤紝鍙栫珛姝eЭ鍔跨珯鍦ㄨ韩楂樿鐨勫簳鏉夸笂锛屽ご閮ㄤ繚鎸佹鐩达紝涓ょ溂骞宠鍓嶆柟锛岃兏閮ㄧ◢鎸鸿捣锛屼袱鑷傝嚜鐒朵笅鍨傦紝鎵嬫寚骞舵嫝锛岃剼璺熼潬鎷紝瓒冲皷鍒嗗紑锛岃冻璺熴�佽噣閮ㄣ�佷袱鑲╄儧闂翠笁鐐瑰悓鏃堕潬鍦ㄨ韩楂樿鐨勫瀭鐩寸珛鏌变笂锛岀劧鍚庢祴閲忋�傛祴閲忚�呭皢婊戜晶鏉胯交杞荤Щ鍔紝鐩磋嚦鎺ヨЕ鍙楁祴鍎跨澶撮《锛岃绔嬫煴涓婃暟瀛楋紝璇樊涓嶅緱瓒呰繃0.1鍘樼背銆� </p> - + <div class="fl fl-around"> <div class="left" style="width: 38%"> <p> @@ -439,11 +454,11 @@ </p> </div> </div> - </div> + </div> </div> <!-- 84 --> <div class="page-box" page="92"> - <div v-if="showPageList.indexOf(92) > -1"> + <div v-if="showPageList.indexOf(92) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -508,15 +523,13 @@ 鐢熼暱鍙戣偛鐨勪富瑕佸舰鎬佹寚鏍囪繕鍖呮嫭浠h〃钀ュ吇鐘跺喌鐨勮噦鍥淬�佽吂鍥村拰鍚勯儴浣嶇毊瑜跺帤搴︾瓑銆� </p> </div> - </div> + </div> </div> <!-- 85 --> <div class="page-box" page="93"> - <div v-if="showPageList.indexOf(93) > -1"> + <div v-if="showPageList.indexOf(93) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">85</span> </div> <div class="padding-96"> @@ -574,11 +587,11 @@ 灏挎恫涓�鑸�х姸妫�鏌ュ寘鎷翱娑茬殑姘斿懗銆佸翱閲忋�侀鑹层�侀�忔槑搴︾瓑銆傚翱娑叉湁鑵愯嚟鍛筹紝鍙浜庢硨灏跨郴缁熷寲鑴撹弻鎰熸煋锛涘翱閲忓噺灏戯紝鍙浜庢�ユ�ц偩灏忕悆鑲剧値銆侀珮鐑�佸憰鍚愬拰鑵规郴锛涘翱娑查鑹� </p> </div> - </div> + </div> </div> <!-- 86 --> <div class="page-box" page="94"> - <div v-if="showPageList.indexOf(94) > -1"> + <div v-if="showPageList.indexOf(94) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -620,15 +633,13 @@ 鐞嗘兂鏍囧噯鎵�閫夋牱鏈槸鐢熸椿鍦ㄦ渶閫傚疁鐜涓殑鍎跨锛屽杺鍏诲拰鑶抽瀹夋帓鍚堢悊锛岃惀鍏讳緵缁欏厖瓒筹紝鏈夎壇濂界殑鐢熸椿灞呬綇鐜锛屽彲浠ュ緱鍒拌壇濂界殑鍖荤枟淇濆仴鏈嶅姟銆傚湪杩欎竴鐜涓敓娲荤殑鍎跨锛屽叾鐢熼暱娼滃姏寰楀埌杈冨ソ鐨勫彂鎸ワ紝鐢熼暱鍙戣偛鐘跺喌杈冧负鐞嗘兂銆傚洜鑰岀悊鎯虫爣鍑嗛珮浜庣幇鐘舵爣鍑嗭紝楂樹簬涓�鑸効绔ョ殑鍙戣偛姘村钩銆傜洰鍓嶅浗闄呬笂甯哥敤鐨勭編鍥藉浗瀹跺仴搴风粺璁′腑蹇冨埗瀹氱殑鍥介檯鏍囧噯鎴栫О涓栫晫鍗敓缁勭粐锛圵HO锛夋爣鍑嗗嵆涓虹悊鎯虫爣鍑嗐�� </p> </div> - </div> + </div> </div> <!-- 87 --> <div class="page-box" page="95"> - <div v-if="showPageList.indexOf(95) > -1"> + <div v-if="showPageList.indexOf(95) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">87</span> </div> <div class="padding-96"> @@ -668,11 +679,11 @@ 绛夌骇璇勪环娉曞父鐢ㄧ殑鎸囨爣鏄韩楂樺拰浣撻噸銆備釜浣撳効绔ョ殑韬珮銆佷綋閲嶆暟鍊煎湪鏍囧噯鍧囧�悸�2涓爣鍑嗗樊鑼冨洿鍐咃紝鍧囪瑙嗕负姝e父锛屽ぇ绾�95%鐨勫効绔ュ睘浜庤鑼冨洿銆傚湪鏍囧噯鍧囧�悸�2涓爣鍑嗗樊浠ュ </p> </div> - </div> + </div> </div> <!-- 88 --> <div class="page-box" page="96"> - <div v-if="showPageList.indexOf(96) > -1"> + <div v-if="showPageList.indexOf(96) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -713,15 +724,13 @@ 鍙戣偛骞撮緞鍙堢О涓虹敓鐗╁勾榫勬垨鐢熺悊骞撮緞銆傚彈閬椾紶鍜岀幆澧冪殑褰卞搷锛屽効绔ョ殑鐢熼暱鍙戣偛瀛樺湪涓� </p> </div> - </div> + </div> </div> <!-- 89 --> <div class="page-box" page="97"> - <div v-if="showPageList.indexOf(97) > -1"> + <div v-if="showPageList.indexOf(97) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">89</span> </div> <div class="padding-96"> @@ -773,11 +782,11 @@ </div> </div> </div> - </div> + </div> </div> <!-- 90 --> <div class="page-box" page="98"> - <div v-if="showPageList.indexOf(98) > -1"> + <div v-if="showPageList.indexOf(98) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -816,19 +825,19 @@ <p>鈶犲ご閮ㄣ�傚ご棰呭ぇ灏忋�佸墠鍥熷ぇ灏忓強闂悎鎯呭喌锛屾湁鏃犳柟棰呭強棰呴杞寲銆�</p> <p>鈶$溂銆傜溂鐫戝舰鐘躲�佸珐鑶滈鑹层�佽鍔涖�佺溂璺濈瓑鏄惁姝e父銆�</p> <p>鈶㈣�炽�傛湁鏃犲鑰崇暩褰紝鑰抽亾缁撴瀯銆佸惉鍔涚瓑鏄惁姝e父銆�</p> - <p>鈶e彛鑵斻�傚彛鑵旈鑹插拰褰㈢姸銆佸彛鑵旈粡鑶溿�佺墮榻挎暟鐩槸鍚︽甯革紝鏄惁鏈夐緥榻跨瓑銆�</p> + <p> + 鈶e彛鑵斻�傚彛鑵旈鑹插拰褰㈢姸銆佸彛鑵旈粡鑶溿�佺墮榻挎暟鐩槸鍚︽甯革紝鏄惁鏈夐緥榻跨瓑銆� + </p> <p>鈶よ兏閮ㄣ�傝兏寤撴湁鏃犵暩褰紝鍚瘖鏈夋棤蹇冭剰鏉傞煶鍙婅偤鍐呭暟闊炽��</p> <p>鈶ヨ吂閮ㄣ�傝吂閮ㄦ湁鏃犲紓甯稿寘鍧椼�佽倽鑴炬湁鏃犲紓甯歌偪澶с��</p> </div> - </div> + </div> </div> <!-- 91 --> <div class="page-box" page="99"> - <div v-if="showPageList.indexOf(99) > -1"> + <div v-if="showPageList.indexOf(99) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">91</span> </div> <div class="padding-96"> @@ -849,7 +858,12 @@ </h6> <p class="blockh6-c"> <span class="img center dl-bl w100">涓撻鍥� 瀛︿範涓婚涓�</span> - <examinations v-if="questionData && questionData[99]" :cardList="questionData[99]" :chapter="4" :page="91" /> + <examinations + v-if="questionData && questionData[99]" + :cardList="questionData[99]" + :chapter="4" + :page="91" + /> </p> <h2 class="module_block" id="b017"> <div class="custom1">瀛︿範涓婚浜�</div> @@ -861,15 +875,28 @@ >涓撻鍥涘涔犱富棰樹簩 瀛﹀墠鍎跨蹇冪悊鍋ュ悍鐨勮瘎浠疯嚜涓诲涔犱换鍔″崟</span > <span class="t0 svg-btn" @click="changeResources('learnTableTwo')"> - <svg xmlns="http://www.w3.org/2000/svg" width="16" height="17" viewBox="0 0 19.28 20.563"> + <svg + xmlns="http://www.w3.org/2000/svg" + width="16" + height="17" + viewBox="0 0 19.28 20.563" + > <g transform="translate(-109.056 -82.941)"> - <path class="a" + <path + class="a" d="M3439.656-15185.7h-12.643a1.815,1.815,0,0,1-1.816-1.81v-16.944a1.83,1.83,0,0,1,1.816-1.809h15.674a1.8,1.8,0,0,1,1.79,1.809v13.93h-4.217a.6.6,0,0,0-.6.6v4.217h0Zm-9.819-2.764a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm0-2a.5.5,0,0,0-.5.5.5.5,0,0,0,.5.5h4a.5.5,0,0,0,.5-.5.5.5,0,0,0-.5-.5Zm1.393-8.525a2.416,2.416,0,0,0-2.416,2.411,2.421,2.421,0,0,0,2.416,2.42h.111a1.8,1.8,0,0,0,1.1,1.1,1.809,1.809,0,0,0,.6.107,1.808,1.808,0,0,0,1.7-1.206h4.072l-.172.172a.635.635,0,0,0-.179.454.569.569,0,0,0,.179.4.637.637,0,0,0,.435.176.6.6,0,0,0,.424-.176l1.2-1.214a.618.618,0,0,0,0-.858l-1.2-1.187a.619.619,0,0,0-.431-.176.6.6,0,0,0-.427.176.615.615,0,0,0,0,.854l.172.176h-4.072a1.8,1.8,0,0,0-1.1-1.1,1.755,1.755,0,0,0-.6-.1,1.808,1.808,0,0,0-1.7,1.206h-.111a.554.554,0,0,1-.145-.016,1.2,1.2,0,0,1-.84-.4,1.217,1.217,0,0,1-.3-.878,1.2,1.2,0,0,1,1.206-1.137.407.407,0,0,1,.069,0h3.729a1.807,1.807,0,0,0,1.118,1.114,1.816,1.816,0,0,0,.576.091,1.789,1.789,0,0,0,1.7-1.205h.309a2.415,2.415,0,0,0,1.679-.775,2.407,2.407,0,0,0,.637-1.729,2.411,2.411,0,0,0-2.419-2.324h-6.213a1.821,1.821,0,0,0-1.107-1.1,1.8,1.8,0,0,0-.6-.1,1.814,1.814,0,0,0-1.706,1.2,1.8,1.8,0,0,0,.077,1.389,1.787,1.787,0,0,0,1.026.92,1.841,1.841,0,0,0,.6.1,1.807,1.807,0,0,0,1.706-1.2h6.266a1.179,1.179,0,0,1,.836.4,1.22,1.22,0,0,1,.305.874,1.213,1.213,0,0,1-1.214,1.146h-.172a1.8,1.8,0,0,0-1.118-1.118,1.711,1.711,0,0,0-.576-.1,1.8,1.8,0,0,0-1.706,1.214Z" - transform="translate(-3316.14 15289.201)" /> - <path class="a" + transform="translate(-3316.14 15289.201)" + /> + <path + class="a" d="M316.806,239.727a.6.6,0,1,0,.6-.6A.6.6,0,0,0,316.806,239.727Zm-5.421-4.207a.6.6,0,1,0,.6.6A.587.587,0,0,0,311.385,235.52Zm2.4,8.438a.607.607,0,1,0-.6-.613A.621.621,0,0,0,313.789,243.958Z" - transform="translate(-196.896 -148.921)" /> - <path class="a" d="M763.392,793.79l3.262-3.262h-3.262Z" transform="translate(-638.661 -690.634)" /> + transform="translate(-196.896 -148.921)" + /> + <path + class="a" + d="M763.392,793.79l3.262-3.262h-3.262Z" + transform="translate(-638.661 -690.634)" + /> </g> </svg> </span> @@ -1001,7 +1028,9 @@ </tr> <tr> <td> - <span class="ds-bl">閽堝鑷繁鍦ㄥ涔犺繃绋嬩腑鐨勭枒鎯戝拰闂鎻愰棶銆�</span> + <span class="ds-bl" + >閽堝鑷繁鍦ㄥ涔犺繃绋嬩腑鐨勭枒鎯戝拰闂鎻愰棶銆�</span + > </td> </tr> </table> @@ -1037,7 +1066,7 @@ </div> <!-- 92 --> <div class="page-box" page="100"> - <div v-if="showPageList.indexOf(100) > -1"> + <div v-if="showPageList.indexOf(100) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -1081,11 +1110,9 @@ </div> <!-- 93 --> <div class="page-box" page="101"> - <div v-if="showPageList.indexOf(101) > -1"> + <div v-if="showPageList.indexOf(101) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">93</span> </div> <div class="padding-96"> @@ -1127,11 +1154,11 @@ <p>绗叓锛岀敤椋熸寚銆佹媷鎸囩鎹忓皬涓革紝鎹忔椂鑵曢儴绂绘闈紝浠庝笂闈㈡崗銆�</p> <p>绗節锛屼复鎽圭敾鍦嗭紝涓嶅彲绀鸿寖锛屼笉鍙鍑哄悕绉般�傜嚎鐨勫ご灏捐繛鎺ユ垚鍦嗗嵆鍙��</p> </div> - </div> + </div> </div> <!-- 94 --> <div class="page-box" page="102"> - <div v-if="showPageList.indexOf(102) > -1"> + <div v-if="showPageList.indexOf(102) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -1184,15 +1211,13 @@ 绗簩鍗佸叓锛屽槺鍎跨鍚庨��璧帮紝鍓嶈剼璺熶笌鍚庤剼灏栫殑璺濈涓嶈秴杩�2.5鍘樼背銆傛鏌ヨ�呭彲绀鸿寖锛岃姹傚効绔ヨ繛缁��4姝ャ�傦紙3璇�2鎴愬姛绠楅�氳繃銆傦級 </p> </div> - </div> + </div> </div> <!-- 95 --> <div class="page-box" page="103"> - <div v-if="showPageList.indexOf(103) > -1"> + <div v-if="showPageList.indexOf(103) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">95</span> </div> <div class="padding-96"> @@ -1264,7 +1289,7 @@ </div> <!-- 96 --> <div class="page-box" page="104"> - <div v-if="showPageList.indexOf(104) > -1"> + <div v-if="showPageList.indexOf(104) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -1313,15 +1338,13 @@ 璐濆埄濠村効鍙戣偛閲忚〃璇勪及濠村辜鍎挎櫤鍔涘彂鑲叉按骞崇浉瀵硅緝鍏ㄩ潰銆佺簿纭�傛瘡娆℃祴楠屾椂闂�45锝�60鍒嗛挓锛屼腑鍥藉凡鏈夋爣鍑嗗寲鐨勯噺琛ㄣ�� </p> </div> - </div> + </div> </div> <!-- 97 --> <div class="page-box" page="105"> - <div v-if="showPageList.indexOf(105) > -1"> + <div v-if="showPageList.indexOf(105) > -1"> <div class="page-header-box"> - <span class="page-header-text" - >涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span - > + <span class="page-header-text">涓撻鍥� 瀛﹀墠鍎跨鍋ュ悍璇勪环</span> <span class="page-header-num">97</span> </div> <div class="padding-96"> @@ -1351,7 +1374,12 @@ </h6> <p class="blockh6-c center"> <span class="img center dl-bl w100">涓撻鍥� 瀛︿範涓婚浜�</span> - <examinations v-if="questionData && questionData[105]" :cardList="questionData[105]" :chapter="4" :page="97" /> + <examinations + v-if="questionData && questionData[105]" + :cardList="questionData[105]" + :chapter="4" + :page="97" + /> </p> <h6 class="Conclusion-title4">涓撻灏忕粨</h6> <p class="blockh6"> @@ -1367,11 +1395,11 @@ 瑙d簹瀹併�佹埓鏅撻槼锛氥�婂疄鐢ㄥ績鐞嗘祴楠屻�嬶紝30锝�35椤碉紝鍖椾含锛屼腑鍥藉尰鑽鎶�鍑虹増绀撅紝2006銆� </p> </div> - </div> + </div> </div> <!-- 98 --> <div class="page-box" page="106"> - <div v-if="showPageList.indexOf(106) > -1"> + <div v-if="showPageList.indexOf(106) > -1"> <div class="header-box"> <div class="header-border-box"></div> <div class="header-num-box"> @@ -1427,10 +1455,20 @@ <p class="blockh6-c"> 瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵鎵爜娴嬩竴娴嬪惂锛�<br /> <span class="img">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級1</span><br /> - <examinations v-if="questionData && questionData[106][1]" :cardList="questionData[106][1]" :chapter="4" :page="981" /> + <examinations + v-if="questionData && questionData[106][1]" + :cardList="questionData[106][1]" + :chapter="4" + :page="981" + /> <span class="span-border"></span> <span class="img mt-20 dl-bl">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級2</span> - <examinations v-if="questionData && questionData[106][2]" :cardList="questionData[106][2]" :chapter="4" :page="982" /> + <examinations + v-if="questionData && questionData[106][2]" + :cardList="questionData[106][2]" + :chapter="4" + :page="982" + /> </p> <p class="custom_tag">鈥㈠簲鐢ㄤ笌鎺㈣鈥�</p> <p>1.娴嬮噺骞煎効鐨勮韩楂樸�佷綋閲嶃�佸ご鍥村拰鑳稿洿銆�</p> @@ -1449,23 +1487,27 @@ ></textarea> </p> </div> - </div> + </div> </div> </div> </template> <script> import examinations from "@/components/examinations/index.vue"; -import {getResourcePath} from "@/assets/methods/resources"; +import { getResourcePath } from "@/assets/methods/resources"; export default { - components: { examinations }, - props:{ - questionData:{ - type:Object + components: { examinations }, + props: { + questionData: { + type: Object, }, - showPageList:{ - type:Array - } + showPageList: { + type: Array, + }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -1477,7 +1519,7 @@ pathFour: "", pathFive: "", pathSix: "", - saveTime:20, + saveTime: 20, chapterFourData: { experienceOne: "", experienceTwo: "", @@ -1489,9 +1531,9 @@ qFour: "", qFive: "", qSix: "", - qSeven:"", - qEnight:"", - qNine:"" + qSeven: "", + qEnight: "", + qNine: "", }, learnTableTwo: { qOne: "", @@ -1505,32 +1547,37 @@ short: { qOne: "", qTwo: "", - qThree:"", - qFour:"", - qFive:"", + qThree: "", + qFour: "", + qFive: "", }, }, }, }; }, async mounted() { - const localData = localStorage.getItem("chapterFourData"); - if (localData) { - this.chapterFourData = JSON.parse(localData); - } - window.timerFour = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if (!this.isSearch) { + const localData = localStorage.getItem("chapterFourData"); + if (localData) { + this.chapterFourData = JSON.parse(localData); } - }, 1000); - this.getVideoPath() + window.timerFour = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + this.getVideoPath(); + } }, unmounted() { if (window.timerFour) { clearInterval(window.timerFour); } - localStorage.setItem("chapterFourData", JSON.stringify(this.chapterFourData)); + localStorage.setItem( + "chapterFourData", + JSON.stringify(this.chapterFourData) + ); }, methods: { changeResources(type) { @@ -1541,14 +1588,24 @@ } }, async getVideoPath() { - this.$data.pathOne = await getResourcePath("f2980359eb32cb3b74b284bf5348a596"); - this.$data.pathTwo = await getResourcePath("2677fc38748eeac767a4b3fab5989a38"); + this.$data.pathOne = await getResourcePath( + "f2980359eb32cb3b74b284bf5348a596" + ); + this.$data.pathTwo = await getResourcePath( + "2677fc38748eeac767a4b3fab5989a38" + ); this.$data.pathThree = await getResourcePath( "87836d6f409df33817589b6b67514979" ); - this.$data.pathFour = await getResourcePath("24a624217470bdea16d22e3a25cc8aa5"); - this.$data.pathFive = await getResourcePath("df98433d6a6cbd5e768ec1bf721619e4"); - this.$data.pathSix = await getResourcePath("14916e143d49e15f94964ad0f8c372f1"); + this.$data.pathFour = await getResourcePath( + "24a624217470bdea16d22e3a25cc8aa5" + ); + this.$data.pathFive = await getResourcePath( + "df98433d6a6cbd5e768ec1bf721619e4" + ); + this.$data.pathSix = await getResourcePath( + "14916e143d49e15f94964ad0f8c372f1" + ); }, saveChapterOneData() { this.saveTime = 20; diff --git a/src/books/childHealth/view/content/components/chapter001.vue b/src/books/childHealth/view/content/components/chapter001.vue index 4722135..ca336c6 100644 --- a/src/books/childHealth/view/content/components/chapter001.vue +++ b/src/books/childHealth/view/content/components/chapter001.vue @@ -60,7 +60,7 @@ </div> </div> <!-- 2 --> - <div class="page-box" page="10" :show="showPageList.indexOf(10) > -1"> + <div class="page-box" page="10" :show="showPageList.indexOf(10) > -1"> <div v-show="showPageList.indexOf(10) > -1"> <div class="header-box"> <div class="header-border-box"></div> @@ -389,7 +389,11 @@ </p> <div class="text-img-box"> <div style="margin-right: 50px" class="openImgBox"> - <img src="../../../assets/images/chapterOne/0015-5.jpg" class="w100" alt=""> + <img + src="../../../assets/images/chapterOne/0015-5.jpg" + class="w100" + alt="" + /> <span class="img">鍥�1-1 浜轰綋鍏ㄨ韩楠ㄩ锛堝墠闈㈣锛�</span> </div> <div> @@ -458,34 +462,25 @@ </div> <div class="bottom-right" style="width: 35%"> <div class="mt-40"> - <div class="banshi openImgBox" style="height: 364px;"> + <div class="banshi openImgBox" style="height: 364px"> <div class="swiper-container swiper-img"> <div class="swiper-wrapper"> <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > + <div class="imgBox" style="width: 100%; height: 100%"> <img src="../../../assets/images/chapterOne/bones1.png" /> </div> </div> <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > + <div class="imgBox" style="width: 100%; height: 100%"> <img src="../../../assets/images/chapterOne/bones2.png" /> </div> </div> <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > + <div class="imgBox" style="width: 100%; height: 100%"> <img src="../../../assets/images/chapterOne/bones3.png" /> @@ -528,7 +523,11 @@ class="left fl fl-di fl-evenly openImgBox" style="width: 30%; margin-top: 5px" > - <img src="../../../assets/images/chapterOne/0017-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0017-1.jpg" + alt="" + class="w100" + /> <p class="img">鍥�1-3 鍏宠妭妯″紡鍥�</p> </div> <div class="right" style="width: 70%; padding-left: 20px"> @@ -546,33 +545,29 @@ <div class="fl"> <div class="left" style="width: 30%"> <div class="banshi openImgBox"> - <div class="swiper-container swiper-img"> - <div class="swiper-wrapper"> - <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > - <img - src="../../../assets/images/chapterOne/foot-01.png" alt="姝e父瓒�" - /> - </div> - </div> - <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > - <img - src="../../../assets/images/chapterOne/foot-02.png" alt="鎵佸钩瓒�" - /> - </div> + <div class="swiper-container swiper-img"> + <div class="swiper-wrapper"> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img + src="../../../assets/images/chapterOne/foot-01.png" + alt="姝e父瓒�" + /> </div> </div> - <div class="swiper-button-next"></div> - <div class="swiper-button-prev"></div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img + src="../../../assets/images/chapterOne/foot-02.png" + alt="鎵佸钩瓒�" + /> + </div> + </div> </div> + <div class="swiper-button-next"></div> + <div class="swiper-button-prev"></div> </div> + </div> <p class="img">鍥�1-4 姝e父瓒冲拰鎵佸钩瓒�</p> </div> <div class="right" style="width: 70%; padding-left: 20px"> @@ -609,43 +604,34 @@ </p> <div class="right fl fl-cn fl-di" style="width: 55%"> <div class="banshi openImgBox"> - <div class="swiper-container swiper-img"> - <div class="swiper-wrapper"> - <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > - <img - src="../../../assets/images/chapterOne/posture-01.png" - /> - </div> - </div> - <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > - <img - src="../../../assets/images/chapterOne/posture-02.png" - /> - </div> - </div> - <div class="swiper-slide"> - <div - class="imgBox" - style="width: 100%; height: 100%" - > - <img - src="../../../assets/images/chapterOne/posture-03.png" - /> - </div> + <div class="swiper-container swiper-img"> + <div class="swiper-wrapper"> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img + src="../../../assets/images/chapterOne/posture-01.png" + /> </div> </div> - <div class="swiper-button-next"></div> - <div class="swiper-button-prev"></div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img + src="../../../assets/images/chapterOne/posture-02.png" + /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img + src="../../../assets/images/chapterOne/posture-03.png" + /> + </div> + </div> </div> + <div class="swiper-button-next"></div> + <div class="swiper-button-prev"></div> </div> + </div> <p class="img">鍥�1-5 鍧愬Э瀵硅剨鏌辩殑褰卞搷</p> </div> </div> @@ -975,7 +961,11 @@ <h5 id="e012">1.榧�</h5> </div> <div class="right openImgBox" style="width: 50%"> - <img src="../../../assets/images/chapterOne/0020-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0020-2.jpg" + alt="" + class="w100" + /> <p class="img">鍥�1-6 鍛煎惛绯荤粺绀烘剰鍥�</p> </div> </div> @@ -1046,7 +1036,11 @@ </div> <div class="right" style="width: 20%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0021-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0021-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-7 鍠夎厰妯″紡鍥�</p> </div> @@ -1070,7 +1064,11 @@ </p> <p class="img">琛�1-1 涓嶅悓骞撮緞鐨勪汉鐨勫懠鍚搁鐜�</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0021-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0021-2.jpg" + alt="" + class="w100" + /> </p> </div> </div> @@ -1420,7 +1418,11 @@ 寰幆绯荤粺鍖呮嫭琛�娑插惊鐜郴缁燂紙蹇冭绠$郴缁燂級鍜屾穻宸寸郴缁熴�傝娑插惊鐜郴缁熺敱蹇冭剰鍜岃绠$粍鎴愶紝琛�绠″寘鎷姩鑴夈�侀潤鑴夊拰姣涚粏琛�绠★紙瑙佸浘1-8锛夈�傛穻宸寸郴缁熺敱娣嬪反绠¢亾銆佹穻宸村櫒瀹樺拰娣嬪反缁勭粐缁勬垚銆� </p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0024-1.jpg" alt="" style="width:80%"> + <img + src="../../../assets/images/chapterOne/0024-1.jpg" + alt="" + style="width: 80%" + /> </p> <p class="img">鍥�1-8 琛�娑插惊鐜ず鎰忓浘</p> @@ -1456,7 +1458,11 @@ <p>锛�1锛夎娑查噺鍗犱綋閲嶇殑姣斾緥澶т簬鎴愪汉锛堣琛�1-2锛�</p> <p class="img">琛�1-2 涓嶅悓骞撮緞鐨勮娑查噺</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0024-3.jpg" alt="" class="w100" /> + <img + src="../../../assets/images/chapterOne/0024-3.jpg" + alt="" + class="w100" + /> </p> </div> </div> @@ -1507,7 +1513,11 @@ </p> <p class="img">琛�1-3 涓嶅悓骞撮緞鐨勫績鐜�</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0025-1.jpg" alt="" class="w100" /> + <img + src="../../../assets/images/chapterOne/0025-1.jpg" + alt="" + class="w100" + /> </p> </div> </div> @@ -1616,7 +1626,7 @@ <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span> <examinations :cardList="questionData[22]" - v-if="questionData && questionData[22]" + v-if="questionData && questionData[22]" :chapter="1" :page="14" /> @@ -1869,7 +1879,11 @@ </div> <div class="right" style="width: 35%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0028-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0028-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-9 娑堝寲绯荤粺妯″紡鍥�</p> </div> @@ -1929,11 +1943,19 @@ <p>姣忎竴棰椾钩鐗欏拰鎭掔墮鐨勮悓鍑洪兘鏈夊浐瀹氱殑鏃堕棿锛岃琛�1-4銆佽〃1-5銆�</p> <p class="img">琛�1-4 涔崇墮钀屽嚭鏃堕棿椤哄簭锛堜互鏈堥緞璁$畻锛�</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0029-1.jpg" alt="" class="w100" /> + <img + src="../../../assets/images/chapterOne/0029-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">琛�1-5 鎭掔墮钀屽嚭鏃堕棿</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0029-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0029-2.jpg" + alt="" + class="w100" + /> </p> <h5 id="e021">2.鑸�</h5> <p> @@ -2079,7 +2101,7 @@ <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚鍥�</span> <examinations :cardList="questionData[27]" - v-if="questionData && questionData[27]" + v-if="questionData && questionData[27]" :chapter="1" :page="19" /> @@ -2328,7 +2350,11 @@ <div class="fl fl-around"> <div class="left" style="width: 35%"> <p class="center openImgBox" style="margin-top: 0"> - <img src="../../../assets/images/chapterOne/0033-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0033-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-10 娉屽翱绯荤粺妯″紡鍥撅紙鐢锋�э級</p> </div> @@ -2641,13 +2667,21 @@ <div class="fl"> <div class="left" style="width: 50%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0036-1.png" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0036-1.png" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-11 鐢锋�х敓娈栫郴缁熺ず鎰忓浘</p> </div> <div class="right" style="width: 50%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0036-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0036-2.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-12 濂虫�х敓娈栫郴缁熺ず鎰忓浘</p> </div> @@ -2703,7 +2737,7 @@ > <examinations :cardList="questionData[32]" - v-if="questionData && questionData[32]" + v-if="questionData && questionData[32]" :chapter="1" :page="24" /> @@ -2966,7 +3000,11 @@ </div> <div class="right" style="width: 50%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0038-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0038-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-13 鍐呭垎娉岀郴缁熺ず鎰忓浘</p> </div> @@ -2989,7 +3027,11 @@ </div> <div class="right" style="width: 36%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0038-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0038-2.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-14 鎴愬勾渚忓剴鐥囨偅鑰呬笌姝e父鎴愪汉鐨勮韩楂樻瘮杈�</p> </div> @@ -3041,7 +3083,7 @@ <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涓�</span> <examinations :cardList="questionData[34]" - v-if="questionData && questionData[34]" + v-if="questionData && questionData[34]" :chapter="1" :page="26" /> @@ -3277,7 +3319,11 @@ </div> <div class="right" style="width: 50%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0040-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0040-1.jpg" + alt="" + class="w100" + /> </p> <p class="img cneter">鍥�1-15 绁炵粡鍏冩ā寮忓浘</p> </div> @@ -3342,13 +3388,21 @@ 澶ц剳鍒嗗乏銆佸彸涓ゅ崐鐞冿紙瑙佸浘1-16锛夛紝琛ㄩ潰鍑瑰嚫涓嶅钩锛屽嚬闄峰绉颁负鈥滄矡鈥濓紝闅嗚捣澶勭О涓衡�滃洖鈥濓紝鈥滄矡鈥濅笌鈥滃洖鈥濆ぇ澶у鍔犱簡澶ц剳鐨勮〃闈㈢Н銆傝緝澶х殑娌熸湁涓ぎ娌熴�佸ぇ鑴戝渚ф矡鍜岄《鏋曟矡锛岃繖浜涙矡灏嗗ぇ鑴戣〃闈㈠垎鎴愰鍙躲�侀《鍙躲�侀鍙跺拰鏋曞彾鍥涢儴鍒嗐�� </p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0041-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0041-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-16 澶ц剳宸︺�佸彸涓ゅ崐鐞冪殑鍔熻兘姣旇緝</p> <div class="fl fl-around"> <div class="left" style="width: 48%; margin-right: 10px"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0041-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0041-2.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-17 澶ц剳鐨眰鍒嗗尯鍥�</p> </div> @@ -3411,7 +3465,11 @@ </p> <p class="img">琛�1-6 浜ゆ劅绁炵粡鍜屽壇浜ゆ劅绁炵粡鐨勪綔鐢ㄤ笌鍖哄埆</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0042-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0042-1.jpg" + alt="" + class="w100" + /> </p> <h3 id="c016">浜屻�佸鍓嶅効绔ョ缁忕郴缁熺殑鐗圭偣锛烇紴锛烇紴锛烇紴</h3> <h4 id="d056">锛堜竴锛夎剳鍙戣偛闈炲父杩呴��</h4> @@ -3437,7 +3495,11 @@ </p> <p class="img">琛�1-7 涓嶅悓骞撮緞鑴戣川閲忕殑鍙樺寲</p> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0043-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0043-1.jpg" + alt="" + class="w100" + /> </p> <h4 id="d057">锛堜簩锛変腑鏋㈢缁忕郴缁熺殑鍙戣偛涓嶅潎琛�</h4> <p> @@ -3506,7 +3568,7 @@ <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚鍏�</span> <examinations :cardList="questionData[39]" - v-if="questionData && questionData[39]" + v-if="questionData && questionData[39]" :chapter="1" :page="31" /> @@ -3828,7 +3890,11 @@ </div> <div class="right" style="width: 35%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0046-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0046-2.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-18 鐪肩悆缁撴瀯妯″紡鍥�</p> </div> @@ -3937,7 +4003,11 @@ </div> <div class="right" style="width: 58%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0048-1.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0048-1.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-19 鑰崇殑缁撴瀯鍥�</p> </div> @@ -3960,7 +4030,11 @@ </div> <div class="right" style="width: 48%"> <p class="center openImgBox"> - <img src="../../../assets/images/chapterOne/0048-2.jpg" alt="" class="w100"> + <img + src="../../../assets/images/chapterOne/0048-2.jpg" + alt="" + class="w100" + /> </p> <p class="img">鍥�1-20 鎴愪汉鍜屽鍓嶅効绔ュ捊榧撶涔嬫瘮杈�</p> </div> @@ -4273,7 +4347,7 @@ <!-- <img class="img-g" alt="" src="image/0053-1.jpg" /><br /> --> <span class="img center dl-bl w100">涓撻涓� 瀛︿範涓婚涔�</span> <examinations - :cardList="questionData[48] " + :cardList="questionData[48]" v-if="questionData && questionData[48]" :chapter="1" :page="40" @@ -4518,18 +4592,22 @@ </template> <script> import examinations from "@/components/examinations/index.vue"; -import {getResourcePath} from "@/assets/methods/resources"; +import { getResourcePath } from "@/assets/methods/resources"; export default { name: "chapter-one", components: { examinations }, props: { showPageList: { type: Array, - default: [] + default: [], }, questionData: { - type: Object - } + type: Object, + }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -4581,7 +4659,7 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableTwo: { qOne: "", @@ -4592,7 +4670,7 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableThree: { qOne: "", @@ -4603,7 +4681,7 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableFour: { qOne: "", @@ -4614,7 +4692,7 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableFive: { qOne: "", @@ -4625,14 +4703,14 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableSix: { qOne: "", qTwo: "", qThree: "", qFour: "", - qFive: "" + qFive: "", }, learnTableSeven: { qOne: "", @@ -4641,7 +4719,7 @@ qFour: "", qFive: "", qSix: "", - qSeven: "" + qSeven: "", }, learnTableEnight: { qOne: "", @@ -4652,7 +4730,7 @@ qSix: "", qSeven: "", qEight: "", - qNine: "" + qNine: "", }, learnTableNine: { qOne: "", @@ -4662,36 +4740,36 @@ qFive: "", qSix: "", qSeven: "", - qEight: "" + qEight: "", }, question: { judge: { qOne: "", qTwo: "", qThree: "", - qFour: "" + qFour: "", }, fill: { qOne: { one: "", - two: "" + two: "", }, qTwo: { oen: "", - two: "" + two: "", }, qThree: { one: "", - two: "" + two: "", }, qFour: { one: "", - two: "" + two: "", }, qFive: { one: "", - two: "" - } + two: "", + }, }, short: { qOne: "", @@ -4700,30 +4778,27 @@ qFour: "", qFive: "", qSix: "", - qSeven: "" - } - } + qSeven: "", + }, + }, }, - swiper: null + swiper: null, }; }, async mounted() { - this.getVideoPath(); - const localData = localStorage.getItem("chapterOneData"); - if (localData) { - this.chapterOneData = JSON.parse(localData); - } - window.timerOne = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if (!this.isSearch) { + this.getVideoPath(); + const localData = localStorage.getItem("chapterOneData"); + if (localData) { + this.chapterOneData = JSON.parse(localData); } - }, 1000); - // this.$data.questionData = await getQuestionData( - // "1", - // testData[1], - // this.config.activeBook - // ); + window.timerOne = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + } }, unmounted() { if (window.timerOne) { @@ -4735,8 +4810,8 @@ showPageList: { handler(newVal, oldVal) { console.log(newVal, "绔犺妭鎺ユ敹鍐呭"); - } - } + }, + }, }, methods: { changeResources(type) { @@ -4766,23 +4841,40 @@ } }, async getVideoPath() { - console.log('pathOne',await getResourcePath("f6f6588a75086576b87bed2fb9ca1ec1")) - this.$data.pathOne = await getResourcePath("f6f6588a75086576b87bed2fb9ca1ec1"); - this.$data.pathTwo = await getResourcePath("e5993b62684fe55d13190cfe52bf00ed"); + console.log( + "pathOne", + await getResourcePath("f6f6588a75086576b87bed2fb9ca1ec1") + ); + this.$data.pathOne = await getResourcePath( + "f6f6588a75086576b87bed2fb9ca1ec1" + ); + this.$data.pathTwo = await getResourcePath( + "e5993b62684fe55d13190cfe52bf00ed" + ); this.$data.pathThree = getResourcePath( "6b6d42213aa85aa5ff7724aaf96ffee6" ); - this.$data.pathFour = await getResourcePath("17fb1555f98c8fceabce5ff75077af58"); - this.$data.pathFive = await getResourcePath("163c06871b763954952d1cd74373c618"); - this.$data.pathSix = await getResourcePath("1d57d897974b22f7f3191f4073ea0641"); - this.$data.pathSeven = await getResourcePath( + this.$data.pathFour = await getResourcePath( + "17fb1555f98c8fceabce5ff75077af58" + ); + this.$data.pathFive = await getResourcePath( + "163c06871b763954952d1cd74373c618" + ); + this.$data.pathSix = await getResourcePath( + "1d57d897974b22f7f3191f4073ea0641" + ); + this.$data.pathSeven = await getResourcePath( "e67262b8e73ca5b05374b903defd874f" ); this.$data.pathEight = await getResourcePath( "6731ebf8ea78297eedcb56521726481d" ); - this.$data.pathNine = await getResourcePath("5ef5496040abee4013a5f61e3c5b42b9"); - this.$data.pathTen = await getResourcePath("4afe59338bb841a498593cbe458c7d7d"); + this.$data.pathNine = await getResourcePath( + "5ef5496040abee4013a5f61e3c5b42b9" + ); + this.$data.pathTen = await getResourcePath( + "4afe59338bb841a498593cbe458c7d7d" + ); }, saveChapterOneData() { // 璁板綍绗竴寮犺緭鍏ユ暟鎹� @@ -4792,7 +4884,7 @@ JSON.stringify(this.chapterOneData) ); }, - } + }, }; </script> diff --git a/src/books/childHealth/view/content/components/chapter002.vue b/src/books/childHealth/view/content/components/chapter002.vue index 3b41e7e..49a8582 100644 --- a/src/books/childHealth/view/content/components/chapter002.vue +++ b/src/books/childHealth/view/content/components/chapter002.vue @@ -1336,6 +1336,10 @@ }, showPageList:{ type:Array + }, + isSearch:{ + type:Boolean, + default:false } }, data() { @@ -1426,7 +1430,8 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterTwoData"); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterTwoData"); if (localData) { this.chapterTwoData = JSON.parse(localData); } @@ -1437,6 +1442,7 @@ } }, 1000); this.getVideoPath(); + } }, unmounted() { if (window.timerTwo) { diff --git a/src/books/childHealth/view/content/components/chapter003.vue b/src/books/childHealth/view/content/components/chapter003.vue index 5c64ef2..b71fd35 100644 --- a/src/books/childHealth/view/content/components/chapter003.vue +++ b/src/books/childHealth/view/content/components/chapter003.vue @@ -1950,6 +1950,10 @@ }, showPageList:{ type:Array + }, + isSearch:{ + type:Boolean, + default:false } }, data() { @@ -2056,7 +2060,8 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterThreeData"); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterThreeData"); if (localData) { this.chapterThreeData = JSON.parse(localData); } @@ -2067,6 +2072,8 @@ } }, 1000); this.getVideoPath() + } + }, unmounted() { if (window.timerThree) { diff --git a/src/books/childHealth/view/content/components/chapter005.vue b/src/books/childHealth/view/content/components/chapter005.vue index 1b8da2b..8282584 100644 --- a/src/books/childHealth/view/content/components/chapter005.vue +++ b/src/books/childHealth/view/content/components/chapter005.vue @@ -2734,6 +2734,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { diff --git a/src/books/childHealth/view/content/components/chapter006.vue b/src/books/childHealth/view/content/components/chapter006.vue index fb2997a..a7c5fe3 100644 --- a/src/books/childHealth/view/content/components/chapter006.vue +++ b/src/books/childHealth/view/content/components/chapter006.vue @@ -2731,6 +2731,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -2850,17 +2854,19 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterSixData"); - if (localData) { - this.chapterSixData = JSON.parse(localData); - } - window.timerSix = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterSixData"); + if (localData) { + this.chapterSixData = JSON.parse(localData); } - }, 1000); - this.getVideoPath(); + window.timerSix = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + this.getVideoPath(); + } }, unmounted() { if (window.timerSix) { diff --git a/src/books/childHealth/view/content/components/chapter007.vue b/src/books/childHealth/view/content/components/chapter007.vue index 3d97cd9..7284f1d 100644 --- a/src/books/childHealth/view/content/components/chapter007.vue +++ b/src/books/childHealth/view/content/components/chapter007.vue @@ -3616,6 +3616,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -3745,7 +3749,8 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterSevenData"); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterSevenData"); if (localData) { this.chapterSevenData = JSON.parse(localData); } @@ -3756,6 +3761,7 @@ } }, 1000); this.getVideoPath() + } }, unmounted() { if (window.timerSeven) { diff --git a/src/books/childHealth/view/content/components/chapter008.vue b/src/books/childHealth/view/content/components/chapter008.vue index 33762ff..e5bd495 100644 --- a/src/books/childHealth/view/content/components/chapter008.vue +++ b/src/books/childHealth/view/content/components/chapter008.vue @@ -2406,6 +2406,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -2510,17 +2514,19 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterEnightData"); - if (localData) { - this.chapterEnightData = JSON.parse(localData); - } - window.timerEnight = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterEnightData"); + if (localData) { + this.chapterEnightData = JSON.parse(localData); } - }, 1000); - this.getVideoPath(); + window.timerEnight = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + this.getVideoPath(); + } }, unmounted() { if (window.timerEnight) { diff --git a/src/books/childHealth/view/content/components/chapter009.vue b/src/books/childHealth/view/content/components/chapter009.vue index aa3beca..29af446 100644 --- a/src/books/childHealth/view/content/components/chapter009.vue +++ b/src/books/childHealth/view/content/components/chapter009.vue @@ -1746,6 +1746,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -1830,17 +1834,19 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterNineData"); - if (localData) { - this.chapterNineData = JSON.parse(localData); - } - window.timerNine = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterNineData"); + if (localData) { + this.chapterNineData = JSON.parse(localData); } - }, 1000); - this.getVideoPath(); + window.timerNine = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + this.getVideoPath(); + } }, unmounted() { if (window.timerNine) { diff --git a/src/books/childHealth/view/content/components/chapter010.vue b/src/books/childHealth/view/content/components/chapter010.vue index 2715bc8..64cc7d2 100644 --- a/src/books/childHealth/view/content/components/chapter010.vue +++ b/src/books/childHealth/view/content/components/chapter010.vue @@ -1364,6 +1364,10 @@ showPageList: { type: Array, }, + isSearch: { + type: Boolean, + default: false, + }, }, data() { return { @@ -1426,17 +1430,19 @@ }; }, async mounted() { - const localData = localStorage.getItem("chapterTenData"); - if (localData) { - this.chapterTenData = JSON.parse(localData); - } - window.timerTen = setInterval(() => { - this.saveTime--; - if (this.saveTime == 0) { - this.saveChapterOneData(); + if(!this.isSearch) { + const localData = localStorage.getItem("chapterTenData"); + if (localData) { + this.chapterTenData = JSON.parse(localData); } - }, 1000); - this.getVideoPath(); + window.timerTen = setInterval(() => { + this.saveTime--; + if (this.saveTime == 0) { + this.saveChapterOneData(); + } + }, 1000); + this.getVideoPath(); + } }, unmounted() { if (window.timerTen) { diff --git a/src/books/childHealth/view/content/components/header.vue b/src/books/childHealth/view/content/components/header.vue index 855a0ce..7bd41bf 100644 --- a/src/books/childHealth/view/content/components/header.vue +++ b/src/books/childHealth/view/content/components/header.vue @@ -215,7 +215,7 @@ object-fit: contain; } .box { - width: 400px; + max-width: 400px; margin: 0 auto; } .line { diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue index cfac6ed..45ecee6 100644 --- a/src/books/childHealth/view/content/index.vue +++ b/src/books/childHealth/view/content/index.vue @@ -21,51 +21,61 @@ v-if="showCatalogList.indexOf(2) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterOne> <chapterTwo v-if="showCatalogList.indexOf(3) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterTwo> <chapterThree v-if="showCatalogList.indexOf(4) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterThree> <chapterFour v-if="showCatalogList.indexOf(5) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterFour> <chapterFive v-if="showCatalogList.indexOf(6) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterFive> <chapterSix v-if="showCatalogList.indexOf(7) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterSix> <chapterSeven v-if="showCatalogList.indexOf(8) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterSeven> <chapterEight v-if="showCatalogList.indexOf(9) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterEight> <chapterNine v-if="showCatalogList.indexOf(10) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterNine> <chapterTen v-if="showCatalogList.indexOf(11) > -1" :showPageList="loadPageList" :questionData="questionDataMap" + :isSearch="isSearch" ></chapterTen> <chapterEleven v-if="showCatalogList.indexOf(12) > -1" @@ -171,7 +181,7 @@ }, mounted() { // 榛樿鍔犺浇绔犺妭 - this.showCatalogList = [3]; + this.showCatalogList = [1]; // 婊氬姩鐩戝惉鑺傛祦 this.throttledScrollHandler = _.throttle( this.scrollFun, diff --git a/src/books/sportsAndHealth/css/default.less b/src/books/sportsAndHealth/css/default.less index 1ce3327..1a9ac8e 100644 --- a/src/books/sportsAndHealth/css/default.less +++ b/src/books/sportsAndHealth/css/default.less @@ -1492,14 +1492,12 @@ } .bj1-mk { - width: 120px; - height: 50px; - display: block; background-image: url('../image/mk.png'); background-position: center; background-repeat: no-repeat; background-size: 100% 100%; color: #ffffff; + padding: 5px 28px 15px 25px; // padding: 0.3em 0.7em 0.3em 0.7em; font-weight: bold; font-size: 1em; diff --git a/src/books/sportsAndHealth/image/354-1.png b/src/books/sportsAndHealth/image/354-1.png new file mode 100644 index 0000000..545093f --- /dev/null +++ b/src/books/sportsAndHealth/image/354-1.png Binary files differ diff --git a/src/books/sportsAndHealth/image/354-2.png b/src/books/sportsAndHealth/image/354-2.png new file mode 100644 index 0000000..6031e01 --- /dev/null +++ b/src/books/sportsAndHealth/image/354-2.png Binary files differ diff --git a/src/books/sportsAndHealth/image/354-3.png b/src/books/sportsAndHealth/image/354-3.png new file mode 100644 index 0000000..ee7a704 --- /dev/null +++ b/src/books/sportsAndHealth/image/354-3.png Binary files differ diff --git a/src/books/sportsAndHealth/image/354-4.png b/src/books/sportsAndHealth/image/354-4.png new file mode 100644 index 0000000..933dfb2 --- /dev/null +++ b/src/books/sportsAndHealth/image/354-4.png Binary files differ diff --git a/src/books/sportsAndHealth/image/355-1.png b/src/books/sportsAndHealth/image/355-1.png new file mode 100644 index 0000000..78da8b3 --- /dev/null +++ b/src/books/sportsAndHealth/image/355-1.png Binary files differ diff --git a/src/books/sportsAndHealth/image/355-2.png b/src/books/sportsAndHealth/image/355-2.png new file mode 100644 index 0000000..e5f645a --- /dev/null +++ b/src/books/sportsAndHealth/image/355-2.png Binary files differ diff --git a/src/books/sportsAndHealth/image/355-3.png b/src/books/sportsAndHealth/image/355-3.png new file mode 100644 index 0000000..a2539db --- /dev/null +++ b/src/books/sportsAndHealth/image/355-3.png Binary files differ diff --git a/src/books/sportsAndHealth/view/chapter005.html b/src/books/sportsAndHealth/view/chapter005.html index 1e246e8..f778ca4 100644 --- a/src/books/sportsAndHealth/view/chapter005.html +++ b/src/books/sportsAndHealth/view/chapter005.html @@ -1108,10 +1108,12 @@ <p>锛�2锛夌粌涔犺姹�</p> <p>绔欏湪鐞冨彴鐨勫乏鍗婂彴锛岀鐞冨彴40锝�50鍘樼背銆傛帹鎸′负鐩寸嚎锛屾鎵嬫敾鐞冧负鏂滅嚎锛岃惤鐐逛綅缃湪宸﹀崐鍙扮殑杈圭嚎浣嶇疆銆傞�氳繃姝ユ硶绉诲姩淇濊瘉鍑荤悆鐐瑰湪韬綋鐨勪晶鍓嶆柟銆�</p> <h5 id="e101"><span class="bj1-mk">妯″潡浜�</span></h5> -<p>鏈ā鍧楀湪涓婁竴妯″潡瀛︾粌鐨勫熀纭�涓婏紝杩涢樁鎬у湴璁剧疆浜嗕箳涔撶悆杩愬姩鏂扮殑瀛︾粌鍐呭銆傚叾涓紝鍗曢」鎶�鏈缁冨寘鎷敾鐞冦�佹帹鎸″拰蹇悡锛屾參鎼擄紝浠ュ強璇剧▼骞冲彴涓殑姝f墜蹇甫銆佽浆涓庝笉杞悆鍙戠悆锛涘熀鏈垬鏈缁冨寘鎷鏀绘垬鏈紝浠ュ強璇剧▼骞冲彴涓殑鍙戣浆涓庝笉杞悆鎶㈡敾锛� +<p>鏈ā鍧楀湪涓婁竴妯″潡瀛︾粌鐨勫熀纭�涓婏紝杩涢樁鎬у湴璁剧疆浜嗕箳涔撶悆杩愬姩鏂扮殑瀛︾粌鍐呭銆傚叾涓紝鍗曢」鎶�鏈缁冨寘鎷敾鐞冦�佹帹鎸″拰蹇悡锛屾參鎼擄紝浠ュ強璇剧▼骞冲彴涓殑姝f墜蹇甫銆佽浆涓庝笉杞悆鍙戠悆锛� -缁勫悎鎶�鑳界粌涔犺缃殑鏄帹鎸�+渚ц韩鏀伙紝浠ュ強璇剧▼骞冲彴涓殑宸︽帹+鍙虫敾銆傚悓瀛︿滑瀛︾粌鏈ā鍧楃殑鍐呭锛屽湪鎺屾彙涓�瀹氶毦搴︽妧鎴樻湳鍜岀粍鍚堟妧鑳界殑鍩虹涓婏紝鑳藉鍙備笌鏈ā鍧楄缃殑姣旇禌娲诲姩锛屽苟涓洪毦搴︽洿楂樼殑涓嬩竴妯″潡鐨勫缁冨仛濂介摵鍨��</p> + + +鍩烘湰鎴樻湳瀛︾粌鍖呮嫭瀵规敾鎴樻湳锛屼互鍙婅绋嬪钩鍙颁腑鐨勫彂杞笌涓嶈浆鐞冩姠鏀伙紱缁勫悎鎶�鑳界粌涔犺缃殑鏄帹鎸�+渚ц韩鏀伙紝浠ュ強璇剧▼骞冲彴涓殑宸︽帹+鍙虫敾銆傚悓瀛︿滑瀛︾粌鏈ā鍧楃殑鍐呭锛屽湪鎺屾彙涓�瀹氶毦搴︽妧鎴樻湳鍜岀粍鍚堟妧鑳界殑鍩虹涓婏紝鑳藉鍙備笌鏈ā鍧楄缃殑姣旇禌娲诲姩锛屽苟涓洪毦搴︽洿楂樼殑涓嬩竴妯″潡鐨勫缁冨仛濂介摵鍨��</p> <p><span class="zt-ls">锛堜竴锛夊崟椤规妧鏈缁�</span></p> <p><span class="zt-cs">1.鏀荤悆銆佹帹鎸″拰蹇悡</span></p> <p>锛�1锛夊姩浣滆棰�</p> diff --git a/src/books/sportsAndHealth/view/testPp.vue b/src/books/sportsAndHealth/view/testPp.vue index fa710ca..e63c4c9 100644 --- a/src/books/sportsAndHealth/view/testPp.vue +++ b/src/books/sportsAndHealth/view/testPp.vue @@ -247,6 +247,13 @@ <div v-if="showPageList.indexOf(37) > -1"> <div class="bodystyle"> <p><span class="zt-ls">锛堜簩锛夊熀鏈垬鏈缁�</span></p> + <div class="pdf-wall"> + <div class="pdf-item"> + <img :src="pingpang" alt="" /><span @click="toUrl(4)" + >4 妯″潡涓�锛堜簩锛夊熀鏈垬鏈缁� 鎺ュ钩鍑荤悆鎶㈡敾</span + > + </div> + </div> <p><span class="zt-cs">鍙戝钩鍑荤悆鎶㈡敾</span></p> <p>锛�1锛夋垬鏈柟娉�</p> <p>鈶犲厛瑕佹爲绔嬪彂鐞冩姠鏀荤殑鎴樻湳鎰忚瘑銆�</p> @@ -268,6 +275,13 @@ <p>4.娉ㄦ剰鍙戠悆绾胯矾鐨勫彉鍖栥��</p> </div> <p><span class="zt-ls">锛堜笁锛夌粍鍚堟妧鑳界粌涔�</span></p> + <div class="pdf-wall"> + <div class="pdf-item"> + <img :src="pingpang" alt="" /><span @click="toUrl(5)" + >5 妯″潡涓�锛堜笁锛夌粍鍚堟妧鑳界粌涔� 鎺ㄦ尅+渚ц韩鏀�</span + > + </div> + </div> <p><span class="zt-cs">1/2宸︽帹+鍙虫敾</span></p> <p>锛�1锛夌粌涔犳柟娉�</p> <p> @@ -282,14 +296,115 @@ </p> <h5 id="e101"><span class="bj1-mk">妯″潡浜�</span></h5> <p> - 鏈ā鍧楀湪涓婁竴妯″潡瀛︾粌鐨勫熀纭�涓婏紝杩涢樁鎬у湴璁剧疆浜嗕箳涔撶悆杩愬姩鏂扮殑瀛︾粌鍐呭銆傚叾涓紝鍗曢」鎶�鏈缁冨寘鎷敾鐞冦�佹帹鎸″拰蹇悡锛屾參鎼擄紝浠ュ強璇剧▼骞冲彴涓殑姝f墜蹇甫銆佽浆涓庝笉杞悆鍙戠悆锛涘熀鏈垬鏈缁冨寘鎷鏀绘垬鏈紝浠ュ強璇剧▼骞冲彴涓殑鍙戣浆涓庝笉杞悆鎶㈡敾锛� + 鏈ā鍧楀湪涓婁竴妯″潡瀛︾粌鐨勫熀纭�涓婏紝杩涢樁鎬у湴璁剧疆浜嗕箳涔撶悆杩愬姩鏂扮殑瀛︾粌鍐呭銆傚叾涓紝鍗曢」鎶�鏈缁冨寘鎷敾鐞冦�佹帹鎸″拰蹇悡锛屾參鎼擄紝浠ュ強璇剧▼骞冲彴涓殑姝f墜蹇甫銆佽浆涓庝笉杞悆鍙戠悆锛� </p> </div> </div> </div> <div class="page-box" page="38"> <div v-if="showPageList.indexOf(38) > -1"> - <div class="bodystyle"></div> + <div class="bodystyle"> + <p> + 鍩烘湰鎴樻湳瀛︾粌鍖呮嫭瀵规敾鎴樻湳锛屼互鍙婅绋嬪钩鍙颁腑鐨勫彂杞笌涓嶈浆鐞冩姠鏀伙紱缁勫悎鎶�鑳界粌涔犺缃殑鏄帹鎸�+渚ц韩鏀伙紝浠ュ強璇剧▼骞冲彴涓殑宸︽帹+鍙虫敾銆傚悓瀛︿滑瀛︾粌鏈ā鍧楃殑鍐呭锛屽湪鎺屾彙涓�瀹氶毦搴︽妧鎴樻湳鍜岀粍鍚堟妧鑳界殑鍩虹涓婏紝鑳藉鍙備笌鏈ā鍧楄缃殑姣旇禌娲诲姩锛屽苟涓洪毦搴︽洿楂樼殑涓嬩竴妯″潡鐨勫缁冨仛濂介摵鍨�� + </p> + <p><span class="zt-ls">锛堜竴锛夊崟椤规妧鏈缁�</span></p> + <div class="pdf-wall"> + <div class="pdf-item"> + <img :src="pingpang" alt="" /><span @click="toUrl(6)" + >6 妯″潡浜岋紙涓�锛夊崟椤规妧鏈缁� 姝f墜蹇甫</span + > + </div> + </div> + <p><span class="zt-cs">1.鏀荤悆銆佹帹鎸″拰蹇悡</span></p> + <p>锛�1锛夊姩浣滆棰�</p> + <p> + 鏀荤悆銆佹帹鎸°�佸揩鎼撴妧鏈寜鐓ф牳蹇冩妧鏈繘琛屽垎鏋愶紝閮芥槸鐢辨敮鎾戝拰鍗峰甫涓や釜杩炶疮鐨勫姩浣滅粍鎴愮殑銆� + </p> + <p> + 鈶犳鎵嬫敾鐞冿細鎸ユ媿鎵嬬敱鍓嶈噦甯﹀姩鎵嬭厱澶栧睍90掳褰㈡垚鏀拺鍔ㄤ綔锛屽湪鍑荤悆鐨勮繃绋嬩腑鍚戜晶鍓嶆柟鎸ユ媿锛屾墜鑵曠敱澶栧睍鍙樻垚鍐呮棆90掳瀹屾垚鍗峰甫鍔ㄤ綔銆� + </p> + <p> + 鈶℃帹鎸★細鎸ユ媿鎵嬬敱鍓嶈噦甯﹀姩鎵嬭厱鍐呮棆90掳褰㈡垚鏀拺鍔ㄤ綔锛屽湪鍑荤悆鐨勮繃绋嬩腑鍚戜晶鍓嶆柟鎸ユ媿锛屾墜鑵曠敱鍐呮棆鍙樻垚澶栧睍90掳瀹屾垚鍗峰甫鍔ㄤ綔銆� + </p> + <p> + 鈶㈠揩鎼擄細鎸ユ媿鎵嬬敱鍓嶈噦甯﹀姩鎵嬭厱鍐呮棆90掳褰㈡垚鏀拺鍔ㄤ綔锛屽湪鍑荤悆鐨勮繃绋嬩腑鍚戜晶涓嬫柟鎸ユ媿锛屾墜鑵曠敱鍐呮棆鍙樻垚澶栧睍90掳瀹屾垚鍗峰甫鍔ㄤ綔銆� + </p> + <!-- <p class="center"> + <img class="img-a" alt="" src="../image/0122-1.jpg" /> + </p> --> + <div class="imgBox-003 openImgBox"> + <div class="swiper-container swiper-img"> + <div class="swiper-wrapper"> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/354-1.png" /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/354-2.png" /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/354-3.png" /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/354-4.png" /> + </div> + </div> + </div> + <div class="swiper-button-next"></div> + <div class="swiper-button-prev"></div> + </div> + </div> + <p class="img">鍥�3-5-4 蹇悡</p> + <p>锛�2锛夊缁冨缓璁�</p> + <p>鈶犲涔犳鍙嶆墜鐨勬敮鎾戝姩浣溿��</p> + <p>鈶℃鍙嶆墜鏀拺鍔ㄤ綔瀹屾垚鍚庯紝鍐嶅畬鎴愪晶鍓嶆柟鍗峰甫鍔ㄤ綔銆�</p> + <p>鈶㈡鍙嶆墜鏀拺鍔ㄤ綔瀹屾垚鍚庯紝鍐嶅畬鎴愪晶涓嬫柟鍗峰甫鍔ㄤ綔銆�</p> + <p>鈶f嫇灞曠粌涔狅細閫氳繃姝e弽鎵嬬殑杞崲缁冧範浣撻獙鏍稿績鎶�鏈殑鍖哄埆涓庤仈绯汇��</p> + <p><span class="zt-cs">2.鎱㈡悡</span></p> + <div class="bk-xyx"> + <p class="bj1-xyx">娉ㄦ剰浜嬮」</p> + <p>1.鏀拺鍔ㄤ綔涓�瀹氳骞炽��</p> + <p>2.鍏堥珮寮х嚎鏀拺锛岀啛缁冨悗鍐嶉�愭闄嶄綆寮х嚎銆�</p> + <p>3.鏀拺鐔熺粌鍚庤繘琛屾敮鎾戝嵎甯︾粌涔犮��</p> + <p>4.閰嶅悎閲嶅績鐨勮浆绉诲拰鑴氭鐨勭Щ鍔ㄤ繚鎸佸嚮鐞冪偣鍦ㄨ韩浣撶殑渚у墠鏂广��</p> + </div> + <!-- <p class="center"> + <img class="img-b" alt="" src="../image/0122-2.jpg" /> + </p> --> + <div class="imgBox-003 openImgBox"> + <div class="swiper-container swiper-img"> + <div class="swiper-wrapper"> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/355-1.png" /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/355-2.png" /> + </div> + </div> + <div class="swiper-slide"> + <div class="imgBox" style="width: 100%; height: 100%"> + <img src="../image/355-3.png" /> + </div> + </div> + </div> + <div class="swiper-button-next"></div> + <div class="swiper-button-prev"></div> + </div> + </div> + <p class="img">鍥�3-5-5 鎱㈡悡</p> + <p> + 鎼撶悆鏄繎鍙拌繕鍑讳笅鏃嬬悆鐨勪竴绉嶅熀鏈妧鏈紝鍙敤瀹冧负鎷夊姬鍦堢悆鍒涢�犳潯浠躲�傚畠涓庢敾鐞冩妧鏈粨鍚堣捣鏉ュ彲浠ュ舰鎴愭悡鏀绘垬鏈�傛悡鐞冨湪鎺ュ彂鐞冩椂鍙互鏈夋晥鍦拌繃娓★紝涓鸿嚜宸变笅涓�鏉垮垱閫犺繘鏀绘満浼氥�� + </p> + </div> </div> </div> </div> diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue index 85cb98d..875ff46 100644 --- a/src/components/matching/matching.vue +++ b/src/components/matching/matching.vue @@ -54,7 +54,7 @@ </div> <!-- 瑙f瀽 --> <ul class="show-answer" v-if="isShowAnswer"> - <li>绛旀缁撴灉锛�</li> + <li v-if="isRight !== null">绛旀缁撴灉锛�<span v-if="isRight" style="color: #83e089;">姝g‘</span> <span v-if="isRight == false" style="color:#d81e06">閿欒</span></li> <li class="show-answer-box"> <div>绛旀:</div> <div> @@ -85,7 +85,7 @@ checkItemIndex: null, isShowAnswer: false, isRight: null, - value:[{left:0,right:0}], + value:[], pageNum:null }; }, @@ -336,13 +336,13 @@ const rightIndex = this.item.options.linkValues.findIndex( (citem) => citem.oldId == item.oldId ); - debugger; answerArr.push({ left: index, right: rightIndex, }); } this.isRight = this.areArraysEqual(this.item.userChoise,answerArr) + this.item.showAnswer = true console.log( "绛旀", answerArr, @@ -385,6 +385,7 @@ }, // 閲嶅仛 redo() { + this.item.showAnswer = false localStorage.removeItem(this.config.activeBook.name + '-matching-' + this.pageNum) this.value = [] for (let index = 0; index < this.leftArr.length; index++) { @@ -460,10 +461,9 @@ margin: 30px auto; width: 100%; height: min-content; - // background-color: pink; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); - .show-answer-box { - padding: 10px; + li { + padding:10px } } .btn-bottom { diff --git a/src/components/miniAudio/index.vue b/src/components/miniAudio/index.vue new file mode 100644 index 0000000..a014da5 --- /dev/null +++ b/src/components/miniAudio/index.vue @@ -0,0 +1,24 @@ +<template> + <div class="mini-audio" v-if="path"> + <audio controls :src="path"></audio> + </div> +</template> + +<script> + export default { + name:"mini-audio", + props:{ + path:{ + type:String + } + } + } +</script> + +<style lang="less" scoped> +.mini-audio { + position: fixed; + right:40px; + bottom: 100px; +} +</style> \ No newline at end of file -- Gitblit v1.9.1