From 6997ee42e0fd3519f8ae418ee02749a85255707b Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 23 十二月 2024 14:35:21 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/aviationBasicSkills/view/components/chapter005.vue | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 17 deletions(-)
diff --git a/src/books/aviationBasicSkills/view/components/chapter005.vue b/src/books/aviationBasicSkills/view/components/chapter005.vue
index 4ce532b..2e02129 100644
--- a/src/books/aviationBasicSkills/view/components/chapter005.vue
+++ b/src/books/aviationBasicSkills/view/components/chapter005.vue
@@ -22,7 +22,22 @@
<p class="bj-1-zt">2.鍩瑰吇韪忓疄鑲共銆佸嫟濂嬪ソ瀛︺�佷笂涓嬭仈鍔ㄣ�佺Н鏋佹矡閫氱殑鑱屼笟绱犲吇銆�</p>
<p class="bj-1-zt">3.鍏绘垚涓ヨ皑鍔″疄銆佸紑鎷撳垱鏂般�佺湡鎯呭疄鎰忋�佷互浜轰负鏈殑鑱屼笟鎬佸害銆�</p>
<p><br></p>
- <p><br></p>
+ <div class="video-box-cover">
+ <p class="center text">
+ <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true"
+ playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
+ x5-playsinline="" controls controlslist="nodownload" class="w100 video"
+ style=" border-radius: 10px; "></video>
+ </p>
+ <p class="center videoname">
+ <span>瑙嗛锛氶」鐩簲 瀵煎叆_1 </span>
+ <el-tooltip class="item" effect="dark"
+ :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == '665da7513bb7123d5bae84feae3cd6d6') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-01')" />
+ </el-tooltip>
+ </p>
+ </div>
<p><br></p>
</div>
</div>
@@ -162,6 +177,22 @@
<p class="p-odd">
鏃呭浣跨敤鎵嬫満涓婄綉鐧诲綍鑸┖鍏徃缃戠珯鎴栦娇鐢ㄥ皬绋嬪簭閫夋嫨鐩稿簲鐨勮埅绋嬶紝鑷鎿嶄綔瀹屾垚閫夊骇锛岀敓鎴愮數瀛愮櫥鏈虹墝銆傞渶瑕佹墭杩愯鏉庣殑鏃呭鍒拌揪鏈哄満鍚庡彲鍒颁汉宸ユ煖鍙颁氦杩愯鏉庯紝鎵撳嵃鐧绘満鐗屻�傛梾瀹㈠嚟鐢靛瓙鐧绘満鐗屾垨绾歌川鐧绘満鐗岄兘鍙畬鎴愬畨妫�鐧绘満銆�
</p>
+ <div class="video-box-left">
+ <p class="center text">
+ <video :src="videoPathTwo" webkit-playsinline="true" x-webkit-airplay="true"
+ playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
+ x5-playsinline="" controls controlslist="nodownload" class="w100 video"
+ style=" border-radius: 10px; "></video>
+ </p>
+ <p class="center videoname">
+ <span>瑙嗛锛氶」鐩簲 浠诲姟1 </span>
+ <el-tooltip class="item" effect="dark"
+ :content="chapterData.isCollectVideo01 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == 'd54fca9b232c021dbd52762af605c926') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-02')" />
+ </el-tooltip>
+ </p>
+ </div>
<div class="bj5 mr-9">
<div class="bj5-xyx">
<p class="td-0"><span class="bj5-xyx">璇惧爞鐮旇</span></p>
@@ -505,6 +536,22 @@
</p>
<h4 id="d126" class="p-even">锛堜簩锛夊姙鐞嗕箻鏈烘墜缁�</h4>
<p class="p-even">鍔炵悊涔樻満鎵嬬画鐨勪富瑕佸唴瀹规槸鏌ラ獙鏃呭鐨勬梾琛屾枃浠讹紝涓烘梾瀹㈠畨鎺掑骇浣嶃�佹墭杩愯鏉庛�佹墦鍗扮櫥鏈虹墝鍜岃鏉庢潯銆�</p>
+ <div class="video-box">
+ <p class="center text">
+ <video :src="videoPathThree" webkit-playsinline="true" x-webkit-airplay="true"
+ playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
+ x5-playsinline="" controls controlslist="nodownload" class="w100 video"
+ style=" border-radius: 10px; "></video>
+ </p>
+ <p class="center videoname">
+ <span>瑙嗛锛氶」鐩簲 浠诲姟浜� </span>
+ <el-tooltip class="item" effect="dark"
+ :content="chapterData.isCollectVideo02 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == '42a9fba9050e235ec7511ba0c4b2c0b4') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-03')" />
+ </el-tooltip>
+ </p>
+ </div>
<h4 id="d127" class="p-even">锛堜笁锛夌粨绠楁姤杞�</h4>
<p class="p-even">鈶犺埅鐝叧闂悗锛岃繘琛屼袱澶嶆牳銆傚氨鏄煡鐪嬬櫥鏈虹墝鍙戞斁鏁颁笌绂绘腐绯荤粺鍔炵悊鐨勪汉鏁版槸鍚﹀畬鍏ㄤ竴鑷达紝濡傛灉涓嶄竴鑷达紝瑕佺珛鍗虫煡鎵惧師鍥犮��</p>
<p class="p-even">鈶′笌瑁呭嵏闃熸牳瀵硅鏉庝欢鏁板拰璐ㄩ噺锛屽姙鐞嗕氦鎺ユ墜缁��</p>
@@ -798,13 +845,15 @@
<p class="p-odd">1.鍊兼満鏌滃彴鍒嗕负鍝嚑绉嶏紵</p>
<textarea v-model="questionData.teskTwo.three" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
class="fz-16 mr-9 textarea-box-right" @change="setBookQuestion"></textarea>
- <p class="p-odd">2.鎵樿繍琛屾潕鐨勮川閲忔瘡浠朵笉鑳借秴杩�<input v-model="questionData.teskTwo.four" class="input-bottom-border fz-14"
- @change="setBookQuestion" />鍗冨厠锛屼綋绉瘡浠朵笉鑳借秴杩�<input v-model="questionData.teskTwo.five" class="input-bottom-border fz-14"
- @change="setBookQuestion" />鍘樼背锛岃嫢瓒呰繃闇�瑕佸幓<input v-model="questionData.teskTwo.six" class="input-bottom-border fz-14"
- @change="setBookQuestion" />鍔炵悊鍊兼満鎵嬬画銆�</p>
- <p class="p-odd">3.鑸彮鍏抽棴涓ゅ鏍革紝灏辨槸鏌ョ湅<input v-model="questionData.teskTwo.seven" class="input-bottom-border fz-14"
- @change="setBookQuestion" />涓�<input v-model="questionData.teskTwo.eight" class="input-bottom-border fz-14"
- @change="setBookQuestion" />銆�</p>
+ <p class="p-odd">2.鎵樿繍琛屾潕鐨勮川閲忔瘡浠朵笉鑳借秴杩�<input v-model="questionData.teskTwo.four"
+ class="input-bottom-border fz-14" @change="setBookQuestion" />鍗冨厠锛屼綋绉瘡浠朵笉鑳借秴杩�<input
+ v-model="questionData.teskTwo.five" class="input-bottom-border fz-14"
+ @change="setBookQuestion" />鍘樼背锛岃嫢瓒呰繃闇�瑕佸幓<input v-model="questionData.teskTwo.six"
+ class="input-bottom-border fz-14" @change="setBookQuestion" />鍔炵悊鍊兼満鎵嬬画銆�</p>
+ <p class="p-odd">3.鑸彮鍏抽棴涓ゅ鏍革紝灏辨槸鏌ョ湅<input v-model="questionData.teskTwo.seven"
+ class="input-bottom-border fz-14" @change="setBookQuestion" />涓�<input
+ v-model="questionData.teskTwo.eight" class="input-bottom-border fz-14"
+ @change="setBookQuestion" />銆�</p>
<p class="p-odd">4.绠�杩拌埅绋嬩笉鍚岄樁娈电殑鍊兼満宸ヤ綔娴佺▼銆�</p>
<textarea v-model="questionData.teskTwo.nine" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
class="fz-16 textarea-box-right" @change="setBookQuestion"></textarea>
@@ -937,6 +986,22 @@
<p class="p-odd">鈶㈡鏌ヨ鏉庣殑鍖呰銆佷綋绉�佽川閲忔槸鍚︾鍚堣姹傘��</p>
<p class="p-odd">鈶ｈ鏉庣О閲嶏紝涓庡厤璐硅鏉庨姣旇緝锛屽喅瀹氭槸鍚︽敹璐癸紝骞跺搴旇鏀惰垂鐨勬敹鍙栭�鹃噸琛屾潕璐广��</p>
</span>
+ <div class="video-box-left">
+ <p class="center text">
+ <video :src="videoPathFour" webkit-playsinline="true" x-webkit-airplay="true"
+ playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
+ x5-playsinline="" controls controlslist="nodownload" class="w100 video"
+ style=" border-radius: 10px; "></video>
+ </p>
+ <p class="center videoname">
+ <span>瑙嗛锛氶」鐩簲 浠诲姟涓塤1 </span>
+ <el-tooltip class="item" effect="dark"
+ :content="chapterData.isCollectVideo03 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == 'e30cc3eb8514972b784bcfcacb82d26f') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-04')" />
+ </el-tooltip>
+ </p>
+ </div>
<h3 id="c047" class="p-odd"><span class="zt-h4">鍏��</span><span class="qyls-h4">鎶ヨ浇</span></h3>
<p class="p-odd">
鈶犲�兼満鍛樹负鏃呭鍔炵悊瀹屽�兼満涓氬姟銆佸叧闂湰娆¤埅鐝悗锛屽簲缁熻鍙戞斁鐧绘満鐗岀殑鏁伴噺锛屽苟涓庣娓郴缁熶腑鐨勪汉鏁般�佽鏉庝欢鏁般�佽鏉庤川閲忚繘琛屾牳瀵癸紝鐢ㄥ璁叉満涓庤鏉庢埧鏍稿琛屾潕浠舵暟銆傚鏋滆揣杩愭敹杩愪簡鍥㈤槦琛屾潕锛屽簲灏嗕欢鏁板拰璐ㄩ噺閫氱煡璇ヨ埅鐝�兼満鍛橈紝鍊兼満鍛樺簲鍙婃椂灏嗚鏉庝欢鏁般�佽川閲忓姞鍏ョ娓绠楁満绯荤粺涓紝浠ヤ究閰嶈浇鍛橀厤杞戒互鍙婃牳瀵广��
@@ -1169,7 +1234,7 @@
<td class="center w20">搴忓彿</td>
<td class="center" colspan="2">妫�鏌ヤ簨椤�</td>
<td class="center w15">缁勯暱绛惧瓧</td>
- </tr>
+ </tr>
<tr class="table-tr-bc">
<td class="center">
<input v-model="tableData.teskTableThree.three" class="table-input-border fz-14"
@@ -1300,7 +1365,7 @@
<p class="p-odd">锛�2锛夋瘡缁勬垚鍛橀�夊畾瑙掕壊锛屼娇鐢ㄧ櫥鏈虹墝銆佽鏉庣鍜岃鏉庢潯绛夊紑灞曚箻鏈烘墜缁殑鍔炵悊娲诲姩銆�</p>
<p class="left p-oddd"><span class="bj2">鑷垜璇勪环鈻�</span></p>
<textarea v-model="questionData.teskThree.three" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- class="fz-16 mr-9 textarea-box" @change="setBookQuestion"></textarea>
+ class="fz-16 mr-9 textarea-box" @change="setBookQuestion"></textarea>
</div>
</div>
</div>
@@ -1311,6 +1376,8 @@
</template>
<script>
+import { getResourcePath } from "@/assets/methods/resources";
+import { getCollectResource, setCollectResource } from "@/assets/methods/resources";
export default {
name: "chapterFive",
props: {
@@ -1320,6 +1387,19 @@
},
data() {
return {
+ collectImg: require("../../assets/images/icon/heart.png"),
+ collectCheck: require("../../assets/images/icon/heart-check.png"),
+ videoPathOne: "",
+ videoPathTwo: "",
+ videoPathThree: "",
+ videoPathFour: "",
+ collectResourceList: [],
+ chapterData: {
+ isCollectVideo: false,
+ isCollectVideo01: false,
+ isCollectVideo02: false,
+ isCollectVideo03: false,
+ },
questionData: {
teskOne: {
one: "",
@@ -1398,17 +1478,17 @@
twelve: "",
thirteen: "",
fourteen: "",
- fifteen:"",
- sixteen:"",
- seventeen:"",
- eighteen:"",
- nineteen:"",
- twenty:"",
+ fifteen: "",
+ sixteen: "",
+ seventeen: "",
+ eighteen: "",
+ nineteen: "",
+ twenty: "",
},
},
};
},
- mounted() {
+ async mounted() {
const bookQuestion = localStorage.getItem("aviation-book-chapter05");
if (bookQuestion) {
this.questionData = JSON.parse(bookQuestion);
@@ -1418,8 +1498,72 @@
this.tableData = JSON.parse(bookTableData);
}
+ const choiceQuestion = localStorage.getItem("aviation-book-chapter05-Data");
+ if (choiceQuestion) {
+ this.chapterData = JSON.parse(choiceQuestion);
+ }
+ this.getVidoePath();
+ this.collectResourceList = await getCollectResource(this.config.activeBook.bookId)
},
methods: {
+ async getVidoePath() {
+ this.videoPathOne = await getResourcePath(
+ "665da7513bb7123d5bae84feae3cd6d6"
+ );
+ this.videoPathTwo = await getResourcePath(
+ "d54fca9b232c021dbd52762af605c926"
+ );
+ this.videoPathThree = await getResourcePath(
+ "42a9fba9050e235ec7511ba0c4b2c0b4"
+ );
+ this.videoPathFour = await getResourcePath(
+ "e30cc3eb8514972b784bcfcacb82d26f"
+ );
+ },
+ handleCollect(e) {
+ if (e == 'video-01') {
+ this.handleCollectResource("665da7513bb7123d5bae84feae3cd6d6", "665da7513bb7123d5bae84feae3cd6d6", '', "瑙嗛", "bits", '瑙嗛锛氶」鐩簲 瀵煎叆_1')
+ this.chapterData.isCollectVideo = !this.chapterData.isCollectVideo
+ } else if (e == 'video-02') {
+ this.handleCollectResource("d54fca9b232c021dbd52762af605c926", "d54fca9b232c021dbd52762af605c926", '', "瑙嗛", "bits", '瑙嗛锛氶」鐩簲 浠诲姟1')
+ this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01
+ } else if (e == 'video-03') {
+ this.handleCollectResource("42a9fba9050e235ec7511ba0c4b2c0b4", "42a9fba9050e235ec7511ba0c4b2c0b4", '', "瑙嗛", "bits", '瑙嗛锛氶」鐩簲 浠诲姟浜�')
+ this.chapterData.isCollectVideo02 = !this.chapterData.isCollectVideo02
+ } else if (e == 'video-04') {
+ this.handleCollectResource("e30cc3eb8514972b784bcfcacb82d26f", "e30cc3eb8514972b784bcfcacb82d26f", '', "瑙嗛", "bits", '瑙嗛锛氶」鐩簲 浠诲姟涓塤1')
+ this.chapterData.isCollectVideo03 = !this.chapterData.isCollectVideo03
+ }
+ this.handleChapterData();
+ },
+
+ //璧勬簮鏀惰棌浜嬩欢
+ // resourcePath 鏂囦欢璺緞锛�
+ // resourceType 鏂囦欢绫诲瀷
+ // source 鏂囦欢鏉ユ簮
+ handleCollectResource(id, md5, resourcePath, resourceType, source, resourceName) {
+ let list = this.collectResourceList
+ if (list.findIndex(item => item.id == id) > -1) {
+ list = list.filter(item => item.id != id)
+ } else {
+ list.push({
+ id,
+ md5,
+ resourcePath,
+ resourceType,
+ source,
+ resourceName,
+ })
+ }
+ this.collectResourceList = list
+ setCollectResource(this.config.activeBook.bookId, this.collectResourceList)
+ },
+ handleChapterData() {
+ localStorage.setItem(
+ "aviation-book-chapter05-Data",
+ JSON.stringify(this.chapterData)
+ );
+ },
setBookQuestion() {
localStorage.setItem(
"aviation-book-chapter05",
--
Gitblit v1.9.1