From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期一, 28 四月 2025 18:34:51 +0800 Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout --- src/books/civilServices/view/components/chapter004.vue | 52 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/books/civilServices/view/components/chapter004.vue b/src/books/civilServices/view/components/chapter004.vue index 277a58a..529bc8a 100644 --- a/src/books/civilServices/view/components/chapter004.vue +++ b/src/books/civilServices/view/components/chapter004.vue @@ -259,7 +259,7 @@ <span>瑙嗛锛氱數璇濊绁ㄤ笌鍞エ澶勬湇鍔″績鐞嗕笌绛栫暐 </span> <el-tooltip class="item" effect="dark" :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> - <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" + <img :src="collectResourceList.findIndex(item => item.id == '594ca0426d4afd67b79c46761467b485') > -1 ? collectCheck : collectImg" alt="" class="collect-btn" @click="handleCollect('video-01')" /> </el-tooltip> </p> @@ -460,7 +460,7 @@ class="zt-h4 unit4-c">鍊兼満澶勬湇鍔″績鐞嗕笌绛栫暐</span></h4> <div class="video-box"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <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> @@ -468,9 +468,9 @@ <p class="center videoname"> <span>瑙嗛锛氬�兼満澶勩�佸�欐満瀹ゅ拰琛屾潕鏌ヨ澶勬湇鍔″績鐞嗕笌绛栫暐 </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> - <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + :content="chapterData.isCollectVideo01 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == '685d853fd235dd0a380062ed05b20f43') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-02')" /> </el-tooltip> </p> </div> @@ -1190,7 +1190,7 @@ </p> <div class="video-box-left"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <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> @@ -1198,9 +1198,9 @@ <p class="center videoname"> <span>瑙嗛锛氬啿绐併�佹姇璇夌殑鍘熷洜 </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> - <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + :content="chapterData.isCollectVideo02 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == 'cd191bd1d937651d2e5948fb23900222') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-03')" /> </el-tooltip> </p> </div> @@ -1360,7 +1360,7 @@ <p class="p-odd">涓庢皯鑸湇鍔′汉鍛樺彂鐢熷啿绐佸強鎶曡瘔鏃舵梾瀹㈢殑蹇冪悊鍥犱汉鑰屽紓锛屼絾涓�鑸潵璁叉湁浠ヤ笅鍑犵銆�</p> <div class="video-box-left"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <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> @@ -1368,9 +1368,9 @@ <p class="center videoname"> <span>瑙嗛锛氬鐞嗘皯鑸梾瀹㈢殑鍐茬獊涓庢姇璇� </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> - <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + :content="chapterData.isCollectVideo03 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == '1351bc9bab28122d133ca5bd4de60bbc') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-04')" /> </el-tooltip> </p> </div> @@ -1774,6 +1774,9 @@ collectImg: require("../../assets/images/icon/heart.png"), collectCheck: require("../../assets/images/icon/heart-check.png"), videoPathOne: "", + videoPathTwo: "", + videoPathThree: "", + videoPathFour: "", collectResourceList: [], questionData: { isComplete: false, @@ -1864,6 +1867,8 @@ chapterData: { isCollectVideo: false, isCollectVideo01: false, + isCollectVideo02: false, + isCollectVideo03: false, }, }; }, @@ -1890,10 +1895,16 @@ methods: { async getVidoePath() { this.videoPathOne = await getResourcePath( - "f230fd8fd7952a4ad4dd05d94df7e797" + "594ca0426d4afd67b79c46761467b485" ); this.videoPathTwo = await getResourcePath( - "700cfdb8b85b372045b1e97e3356ae3a" + "685d853fd235dd0a380062ed05b20f43" + ); + this.videoPathThree = await getResourcePath( + "cd191bd1d937651d2e5948fb23900222" + ); + this.videoPathFour = await getResourcePath( + "1351bc9bab28122d133ca5bd4de60bbc" ); for (let index = 0; index < this.chapter004.videoMd5.length; index++) { const item = this.chapter004.videoMd5[index]; @@ -1936,11 +1947,18 @@ this.handleCollectResource(e.md5, e.md5, '', "瑙嗛", "bits", '寰灏忚鍫傦細' + e.name) e.isCollectVideo = !e.isCollectVideo } else if (e == 'video-01') { - this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗗鐨勬祦娲�') + this.handleCollectResource("594ca0426d4afd67b79c46761467b485", "594ca0426d4afd67b79c46761467b485", '', "瑙嗛", "bits", '瑙嗛锛氱數璇濊绁ㄤ笌鍞エ澶勬湇鍔″績鐞嗕笌绛栫暐') this.chapterData.isCollectVideo = !this.chapterData.isCollectVideo } else if (e == 'video-02') { - this.handleCollectResource("700cfdb8b85b372045b1e97e3356ae3a", "700cfdb8b85b372045b1e97e3356ae3a", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗗鐨勭爺绌跺唴瀹�') + this.handleCollectResource("685d853fd235dd0a380062ed05b20f43", "685d853fd235dd0a380062ed05b20f43", '', "瑙嗛", "bits", '瑙嗛锛氬�兼満澶勩�佸�欐満瀹ゅ拰琛屾潕鏌ヨ澶勬湇鍔″績鐞嗕笌绛栫暐') this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01 + } else if (e == 'video-03') { + this.handleCollectResource("cd191bd1d937651d2e5948fb23900222", "cd191bd1d937651d2e5948fb23900222", '', "瑙嗛", "bits", '瑙嗛锛氬啿绐併�佹姇璇夌殑鍘熷洜') + this.chapterData.isCollectVideo02 = !this.chapterData.isCollectVideo02 + } + else if (e == 'video-04') { + this.handleCollectResource("1351bc9bab28122d133ca5bd4de60bbc", "1351bc9bab28122d133ca5bd4de60bbc", '', "瑙嗛", "bits", '瑙嗛锛氬鐞嗘皯鑸梾瀹㈢殑鍐茬獊涓庢姇璇�') + this.chapterData.isCollectVideo03 = !this.chapterData.isCollectVideo03 } this.handlechapter004(); this.handleChapterData(); -- Gitblit v1.9.1