From 609989d5dd46d2611b42f7d508f67ec89b355562 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期一, 17 六月 2024 15:17:43 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/childHealth/view/content/components/chapter002.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/books/childHealth/view/content/components/chapter002.vue b/src/books/childHealth/view/content/components/chapter002.vue
index ce192a4..7e0ff2d 100644
--- a/src/books/childHealth/view/content/components/chapter002.vue
+++ b/src/books/childHealth/view/content/components/chapter002.vue
@@ -218,7 +218,7 @@
<textarea
cols="30"
rows="4"
- v-model="chapterTwoData.learnTableOne.qEnight"
+ v-model="chapterTwoData.learnTableOne.qEight"
placeholder="璇疯緭鍏ュ唴瀹�"
maxlength="300"
class="w100 ta-br textarea-text"
@@ -283,8 +283,7 @@
</p>
<h3 id="c023">
浜屻�佸鍓嶅効绔ュ勾榫勯樁娈电殑鍒掑垎鍙婂悇闃舵鐢熼暱鍙戣偛鐨勭壒鐐癸紴锛烇紴锛烇紴锛�
- </h3>
-
+ </h3>
<div class="fl fl-around">
<div class="left" style="width: 38%">
<p>
@@ -302,7 +301,9 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
- class="video-border w100"
+ controlslist="nodownload"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氬効绔ュ悇闃舵鐨勭壒鐐瑰拰淇濆仴瑕佺偣</p>
</div>
@@ -494,7 +495,7 @@
<textarea
cols="30"
rows="4"
- v-model="chapterTwoData.learnTableTwo.qTwo"
+ v-model="chapterTwoData.learnTableTwo.qThree"
placeholder="璇疯緭鍏ュ唴瀹�"
maxlength="300"
class="w100 ta-br textarea-text"
@@ -546,7 +547,7 @@
<textarea
cols="30"
rows="4"
- v-model="chapterTwoData.learnTableTwo.qEnight"
+ v-model="chapterTwoData.learnTableTwo.qEight"
placeholder="璇疯緭鍏ュ唴瀹�"
maxlength="300"
class="w100 ta-br textarea-text"
@@ -635,7 +636,9 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
- class="video-border w100"
+ controlslist="nodownload"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
<p class="img">瑙嗛锛氱敓闀垮彂鑲茬殑鈥滈搧鈥濊寰�</p>
</div>
@@ -1015,12 +1018,6 @@
</g>
</svg>
</span>
- <!-- <img
- src="../../../assets/images/icon/video.png"
- alt=""
- @click="changeResources('videoState')"
- class="btn"
- /> -->
</div>
<div v-if="videoState">
<video
@@ -1033,7 +1030,9 @@
x5-video-player-fullscreen="true"
x5-playsinline=""
controls
- class="video-border w100"
+ controlslist="nodownload"
+ class="video-border w100 video"
+ @play="videoPlay"
></video>
</div>
</div>
@@ -1041,9 +1040,6 @@
<div class="fieldset">
<p class="block">
涔愪箰宸茬粡6宀佷簡锛屽湪骞煎効鍥笂澶х彮锛屼粠鍏ュ洯寮�濮嬶紝浠栧氨涓�鐩寸珯鍓嶆帓銆備箰涔愮殑鐖舵瘝寰堢儲鎭硷細鈥滄垜浠か濡讳袱浜洪兘鏄腑绛夊亸涓婄殑韬珮锛屾�庝箞鍎垮瓙鑰佹槸闀夸笉楂橈紵鈥濊皥璋堜綘鐨勭湅娉曘��
- </p>
- <p class="block">
- 瀛﹀墠鍎跨鐨勮韩楂樸�佷綋閲嶇瓑鐢熼暱鍙戣偛鎯呭喌寰堝ぇ绋嬪害涓婂彇鍐充簬閬椾紶鍩哄洜锛屽悓鏃朵篃涓庤惀鍏汇�佽繍鍔ㄧ瓑鍚庡ぉ鍥犵礌瀵嗕笉鍙垎銆傛妸鎻″厛澶╀紭鍔匡紝鍏呭垎鍒╃敤鍚庡ぉ鍥犵礌锛屼績杩涘鍓嶅効绔ヨ壇濂藉湴鐢熼暱鍙戣偛銆傛湰涓婚涓昏璁茶堪褰卞搷瀛﹀墠鍎跨鐢熼暱鍙戣偛鐨勫洜绱狅紝浠ュ府鍔╀繚鏁欏伐浣滆�呭湪宸ヤ綔涓湁鏁堟帶鍒跺奖鍝嶅鍓嶅効绔ョ敓闀垮彂鑲茬殑涓嶈壇鍥犵礌锛屼繚闅滃鍓嶅効绔ユ甯稿彂鑲插彂灞曘��
</p>
<textarea
cols="30"
@@ -1055,9 +1051,12 @@
@input="saveChapterOneData"
></textarea>
<p class="block">
- 瀛﹀墠鍎跨鐨勭敓闀垮彂鑲茶繃绋嬫槸涓綋鍦ㄥ厛澶╅仐浼犲拰鍚庡ぉ鐜涓悇绉嶅洜绱犵浉浜掍綔鐢ㄧ殑缁撴灉銆傚奖鍝嶇敓闀垮彂鑲茬殑鍥犵礌寰堝锛屾鎷捣鏉ユ湁涓ょ被锛氬唴鍦ㄧ殑閬椾紶鍥犵礌鍜屽鍦ㄧ殑鐜鍥犵礌銆傞仐浼犲洜绱犱竴鑸槸涓嶄細鏀瑰彉鐨勶紝鑰岀幆澧冩潯浠舵槸鍙互鏀瑰彉鐨勩�傞仐浼犲洜绱犲喅瀹氫簡鐢熼暱鍙戣偛鐨勬綔鍔涳紝鑰岀幆澧冨拰鏁欒偛鏉′欢褰卞搷浜嗛仐浼犳綔鍔涚殑鍙戞尌锛屾渶鍚庡喅瀹氬彂鑲茬殑閫熷害鍙婅揪鍒扮殑绋嬪害銆�
+ 瀛﹀墠鍎跨鐨勮韩楂樸�佷綋閲嶇瓑鐢熼暱鍙戣偛鎯呭喌寰堝ぇ绋嬪害涓婂彇鍐充簬閬椾紶鍩哄洜锛屽悓鏃朵篃涓庤惀鍏汇�佽繍鍔ㄧ瓑鍚庡ぉ鍥犵礌瀵嗕笉鍙垎銆傛妸鎻″厛澶╀紭鍔匡紝鍏呭垎鍒╃敤鍚庡ぉ鍥犵礌锛屼績杩涘鍓嶅効绔ヨ壇濂藉湴鐢熼暱鍙戣偛銆傛湰涓婚涓昏璁茶堪褰卞搷瀛﹀墠鍎跨鐢熼暱鍙戣偛鐨勫洜绱狅紝浠ュ府鍔╀繚鏁欏伐浣滆�呭湪宸ヤ綔涓湁鏁堟帶鍒跺奖鍝嶅鍓嶅効绔ョ敓闀垮彂鑲茬殑涓嶈壇鍥犵礌锛屼繚闅滃鍓嶅効绔ユ甯稿彂鑲插彂灞曘��
</p>
</div>
+ <p>
+ 瀛﹀墠鍎跨鐨勭敓闀垮彂鑲茶繃绋嬫槸涓綋鍦ㄥ厛澶╅仐浼犲拰鍚庡ぉ鐜涓悇绉嶅洜绱犵浉浜掍綔鐢ㄧ殑缁撴灉銆傚奖鍝嶇敓闀垮彂鑲茬殑鍥犵礌寰堝锛屾鎷捣鏉ユ湁涓ょ被锛氬唴鍦ㄧ殑閬椾紶鍥犵礌鍜屽鍦ㄧ殑鐜鍥犵礌銆傞仐浼犲洜绱犱竴鑸槸涓嶄細鏀瑰彉鐨勶紝鑰岀幆澧冩潯浠舵槸鍙互鏀瑰彉鐨勩�傞仐浼犲洜绱犲喅瀹氫簡鐢熼暱鍙戣偛鐨勬綔鍔涳紝鑰岀幆澧冨拰鏁欒偛鏉′欢褰卞搷浜嗛仐浼犳綔鍔涚殑鍙戞尌锛屾渶鍚庡喅瀹氬彂鑲茬殑閫熷害鍙婅揪鍒扮殑绋嬪害銆�
+ </p>
<h3 id="c029">涓�銆侀仐浼犲洜绱狅紴锛烇紴锛烇紴锛�</h3>
<p>
鍏堝ぉ閬椾紶鍥犵礌鏄奖鍝嶇敓闀垮彂鑲茬殑鏈�鍩烘湰鍥犵礌锛屽畠涓哄効绔ョ殑鐢熼暱鍙戣偛鎻愪緵浜嗗彲鑳芥�с�傚鍓嶅効绔ョ敓闀垮彂鑲茬殑鐗瑰緛銆佹綔鍔涖�佽秼鍚戙�侀檺搴﹂兘鍙楃埗姣嶅弻鏂归仐浼犲洜绱犵殑褰卞搷锛岄仐浼犳�х柧鐥呭鐢熼暱鍙戣偛涔熸湁褰卞搷銆傜爺绌惰〃鏄庯紝鍚屽嵉鍙岀敓瀛愭垚骞村悗韬珮宸埆寰堝皬锛屽ご鍥翠篃寰堟帴杩戯紝浣嗕綋閲�
@@ -1151,7 +1150,7 @@
/>
浜戞祴璇�
</h6>
- <p class="blockh6-c center">
+ <p class="blockh6-c ">
<!-- <img class="img-g" alt="" src="image/0065-1.jpg" /><br /> -->
<span class="img center dl-bl w100">涓撻浜� 瀛︿範涓婚涓�</span>
<examinations
@@ -1346,7 +1345,7 @@
浜戞祴璇�
</h6>
<p class="blockh6-c">
- 瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵鎵爜娴嬩竴娴嬪惂锛�<br />
+ 瀛︿範瀹屾湰涓撻锛屼綘鐨勫涔犳晥鏋滃浣曞憿锛熷挶浠竴璧锋潵娴嬩竴娴嬪惂锛�<br />
<span class="img">杩囧叧妫�娴嬶紙璧勬牸鑰冭瘯妯℃嫙棰橈級1</span><br />
<examinations v-if="questionData" :cardList="questionData[62] ? questionData[62][1] : []" />
<span class="span-border"></span>
@@ -1509,6 +1508,9 @@
JSON.stringify(this.chapterTwoData)
);
},
+ videoPlay(e) {
+ this.$emit('closeVideo',e.srcElement.currentSrc)
+ }
},
};
</script>
--
Gitblit v1.9.1