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/chpater002.vue | 174 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 136 insertions(+), 38 deletions(-) diff --git a/src/books/civilServices/view/components/chpater002.vue b/src/books/civilServices/view/components/chpater002.vue index e3da2a1..2056b2d 100644 --- a/src/books/civilServices/view/components/chpater002.vue +++ b/src/books/civilServices/view/components/chpater002.vue @@ -1125,7 +1125,7 @@ </p> <div class="video-box-left"> <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> @@ -1133,9 +1133,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 == '1112e7daf609c501c2a99cfc53974ad0') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-02')" /> </el-tooltip> </p> </div> @@ -1692,7 +1692,7 @@ <p class="p-odd td-0">灏婇噸鐨勯渶瑕佷笌鑷垜瀹炵幇鐨勯渶瑕佷负楂樼骇闇�瑕併��</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> @@ -1700,9 +1700,9 @@ <p class="center videoname"> <span>瑙嗛锛氶┈鏂礇鐨勯渶瑕佸眰娆$悊璁� </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + :content="chapterData.isCollectVideo02 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + alt="" class="collect-btn" @click="handleCollect('video-03')" /> </el-tooltip> </p> </div> @@ -2223,7 +2223,7 @@ </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> @@ -2231,9 +2231,9 @@ <p class="center videoname"> <span>瑙嗛锛氱壒娈婃梾瀹㈡湇鍔� </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + :content="chapterData.isCollectVideo03 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + alt="" class="collect-btn" @click="handleCollect('video-04')" /> </el-tooltip> </p> </div> @@ -2727,6 +2727,22 @@ </div> <h4 id="d030" class="p-odd"><span class="zt-h4 unit2-c">浜屻��</span><span class="zt-h4 unit2-c">鍥涚姘旇川绫诲瀷鐨勭壒寰�</span></h4> + <div class="video-box-left"> + <p class="center text"> + <video :src="videoPathFive" 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.isCollectVideo04 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == '544f826ccecc3a5ef5a924f3de20b50d') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-05')" /> + </el-tooltip> + </p> + </div> <h5 id="e043" class="p-odd">锛堜竴锛夎儐姹佽川</h5> <p class="p-odd">鑳嗘眮璐ㄧ殑浜烘劅鍙楁�т綆锛岃�愬彈鎬ч珮锛涘弽搴斾笉闅忔剰鎬у崰浼樺娍锛涘鍊炬�ф槑鏄撅紝鎯呯华鍏村鎬ч珮锛屾姂鍒惰兘鍔涘樊锛涘弽搴斿揩锛屼絾涓嶇伒娲汇��</p> <p class="p-odd"> @@ -2946,7 +2962,7 @@ class="zt-h4 unit2-c">涓嶅悓姘旇川绫诲瀷鏃呭鐨勪釜鎬х壒寰佷笌鏈嶅姟瑕佺偣</span></h4> <div class="video-box"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <video :src="videoPathSix" 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> @@ -2954,9 +2970,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.isCollectVideo05 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == '544f826ccecc3a5ef5a924f3de20b50d') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-06')" /> </el-tooltip> </p> </div> @@ -3423,7 +3439,7 @@ <p class="p-even td-0">缁紱姣忓綋杩欎簺鎯呯华鍙戠敓鏃讹紝浜轰滑閮戒細浣撻獙鍒扮埍鍥戒富涔夌殑鎯呮劅銆�</p> <div class="video-box-left"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <video :src="videoPathSeven" 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> @@ -3431,9 +3447,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.isCollectVideo06 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == 'ebc74289f2e6628c92f721e8946863d3') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-07')" /> </el-tooltip> </p> </div> @@ -4272,17 +4288,17 @@ <p class="p-even">鎯呯华鐨勮嚜鎴戣皟鑺傛柟娉曞绉嶅鏍凤紝浣嗗彧瑕佹皯鑸湇鍔′汉鍛樻妸鎻′笅鍒楀嚑涓鐐瑰苟鎺屾彙鐩稿叧鐨勬柟娉曪紝灏变竴瀹氳兘鍏嬫湇涓嶈壇鎯呯华锛屼娇鑷繁蹇箰璧锋潵銆�</p> <div class="video-box"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <video :src="videoPathEight" 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> + <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.isCollectVideo07 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == '2249b07d554da66c40b31a3738b5be41') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-08')" /> </el-tooltip> </p> </div> @@ -4769,7 +4785,7 @@ </p> <div class="video-box-left"> <p class="center text"> - <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true" + <video :src="videoPathNine" 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> @@ -4777,9 +4793,9 @@ <p class="center videoname"> <span>瑙嗛锛氭�佸害 </span> <el-tooltip class="item" effect="dark" - :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + :content="chapterData.isCollectVideo08 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" - alt="" class="collect-btn" @click="handleCollect('video-01')" /> + alt="" class="collect-btn" @click="handleCollect('video-09')" /> </el-tooltip> </p> </div> @@ -5006,6 +5022,22 @@ <p class="p-odd"> 姘戣埅鏃呭鐨勬�佸害锛屾槸鎸囨梾瀹㈠姘戣埅鍙婂叾鏈嶅姟浜哄憳鎵�鎸佺殑璇勪环浠ュ強蹇冪悊鍊惧悜锛屽弽鏄犱簡鏃呭瀵规皯鑸強鍏舵湇鍔′汉鍛樻彁渚涚殑鏈嶅姟鐨勬弧鎰忓害銆傚畠婧愪簬鏃呭鍦ㄦ秷璐硅繃绋嬩腑鎵�浜х敓鐨勬劅鍙椾笌鏈熸湜鍊肩殑瀵规瘮銆備釜鍒梾瀹㈢殑鎰熻鍜岃瘎浠峰鑸┖鍏徃鎴栨皯鑸湇鍔′汉鍛樼殑褰卞搷涓嶅ぇ锛屼絾鎵�鏈夋梾瀹㈠鑸┖鍏徃銆佹皯鑸湇鍔′汉鍛樼殑鎬讳綋鎬佸害锛屽氨鍐冲畾浜嗚埅绌哄叕鍙哥殑鐢熷瓨涓庡彂灞曘�傚洜姝わ紝鍔姏鎻愰珮鏃呭鐨勬弧鎰忓害鏄敼鍙樻皯鑸梾瀹㈡�佸害鐨勫叧閿紝鍏锋湁鑷冲叧閲嶈鐨勪綔鐢ㄣ�� </p> + <div class="video-box-left"> + <p class="center text"> + <video :src="videoPathTen" 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.isCollectVideo09 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start"> + <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg" + alt="" class="collect-btn" @click="handleCollect('video-10')" /> + </el-tooltip> + </p> + </div> <h4 id="d048"><span class="zt-h4 unit2-c">涓�銆�</span><span class="zt-h4 unit2-c">姘戣埅鏈嶅姟鎬佸害</span></h4> <p class="p-odd"> 姘戣埅鏈嶅姟鎬佸害鏄寚姘戣埅鏈嶅姟浜哄憳瀵规梾瀹㈠強姘戣埅鏈嶅姟宸ヤ綔鐨勮鐭ャ�佹儏鎰熶笌琛屼负鍊惧悜銆傚畠鏄皯鑸湇鍔¤川閲忕殑涓�椤归噸瑕佸唴瀹广�傚湪姘戣埅鏈嶅姟杩囩▼涓紝姘戣埅鏈嶅姟浜哄憳蹇呴』鍏呭垎灏婇噸鏃呭锛岀敤鑷繁鐪熻瘹鐨勫井绗戝拰鐑勘鐨勬�佸害璁╂梾瀹㈡弧鎰忥紝缁欐梾瀹㈢暀涓嬬編濂借�屾繁鍒荤殑鍗拌薄銆� @@ -5616,6 +5648,15 @@ collectImg: require("../../assets/images/icon/heart.png"), collectCheck: require("../../assets/images/icon/heart-check.png"), videoPathOne: "", + videoPathTwo: "", + videoPathThree: "", + videoPathFour: "", + videoPathFive: "", + videoPathSix: "", + videoPathSeven: "", + videoPathEight: "", + videoPathNine: "", + videoPathTen: "", collectResourceList: [], questionData: { isComplete: false, @@ -5836,8 +5877,15 @@ chapterData: { isCollectVideo: false, isCollectVideo01: false, + isCollectVideo02: false, + isCollectVideo03: false, + isCollectVideo04: false, + isCollectVideo05: false, + isCollectVideo06: false, + isCollectVideo07: false, + isCollectVideo08: false, + isCollectVideo09: false, }, - }; }, async mounted() { @@ -5866,8 +5914,33 @@ "f230fd8fd7952a4ad4dd05d94df7e797" ); this.videoPathTwo = await getResourcePath( - "700cfdb8b85b372045b1e97e3356ae3a" + "1112e7daf609c501c2a99cfc53974ad0" ); + this.videoPathThree = await getResourcePath( + "f230fd8fd7952a4ad4dd05d94df7e797" + ); + this.videoPathFour = await getResourcePath( + "f230fd8fd7952a4ad4dd05d94df7e797" + ); + this.videoPathFive = await getResourcePath( + "f230fd8fd7952a4ad4dd05d94df7e797" + ); + this.videoPathSix = await getResourcePath( + "544f826ccecc3a5ef5a924f3de20b50d" + ); + this.videoPathSeven = await getResourcePath( + "ebc74289f2e6628c92f721e8946863d3" + ); + this.videoPathEight = await getResourcePath( + "2249b07d554da66c40b31a3738b5be41" + ); + this.videoPathNine = await getResourcePath( + "f230fd8fd7952a4ad4dd05d94df7e797" + ); + this.videoPathTen = await getResourcePath( + "f230fd8fd7952a4ad4dd05d94df7e797" + ); + for (let index = 0; index < this.chapter002.videoMd5.length; index++) { const item = this.chapter002.videoMd5[index]; if (item.md5 && !item.md5.includes('https:')) { @@ -5907,12 +5980,37 @@ 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("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗘晥搴�') this.chapterData.isCollectVideo = !this.chapterData.isCollectVideo } else if (e == 'video-02') { - this.handleCollectResource("700cfdb8b85b372045b1e97e3356ae3a", "700cfdb8b85b372045b1e97e3356ae3a", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗗鐨勭爺绌跺唴瀹�') + this.handleCollectResource("1112e7daf609c501c2a99cfc53974ad0", "1112e7daf609c501c2a99cfc53974ad0", '', "瑙嗛", "bits", '瑙嗛锛氭劅鐭ヨ鐨勫熀鏈唴瀹�') this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01 + } else if (e == 'video-03') { + this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氶┈鏂礇鐨勯渶瑕佸眰娆$悊璁�') + this.chapterData.isCollectVideo02 = !this.chapterData.isCollectVideo02 + } else if (e == 'video-04') { + this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氱壒娈婃梾瀹㈡湇鍔�') + this.chapterData.isCollectVideo03 = !this.chapterData.isCollectVideo03 + } else if (e == 'video-05') { + this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氭皵璐ㄧ被鍨�') + this.chapterData.isCollectVideo04 = !this.chapterData.isCollectVideo04 + } else if (e == 'video-06') { + this.handleCollectResource("544f826ccecc3a5ef5a924f3de20b50d", "544f826ccecc3a5ef5a924f3de20b50d", '', "瑙嗛", "bits", '瑙嗛锛氫笉鍚屾皵璐ㄧ被鍨嬫梾瀹㈢殑涓�х壒寰佷笌鏈嶅姟瑕佺偣') + this.chapterData.isCollectVideo05 = !this.chapterData.isCollectVideo05 + } else if (e == 'video-07') { + this.handleCollectResource("ebc74289f2e6628c92f721e8946863d3", "ebc74289f2e6628c92f721e8946863d3", '', "瑙嗛", "bits", '瑙嗛锛氭儏缁�') + this.chapterData.isCollectVideo06 = !this.chapterData.isCollectVideo06 + } else if (e == 'video-08') { + this.handleCollectResource("2249b07d554da66c40b31a3738b5be41", "2249b07d554da66c40b31a3738b5be41", '', "瑙嗛", "bits", '瑙嗛锛氭皯鑸湇鍔′汉鍛樼殑鎯呯华璋冩帶') + this.chapterData.isCollectVideo07 = !this.chapterData.isCollectVideo07 + } else if (e == 'video-09') { + this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氭�佸害') + this.chapterData.isCollectVideo08 = !this.chapterData.isCollectVideo08 + } else if (e == 'video-10') { + this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氭皯鑸湇鍔℃�佸害') + this.chapterData.isCollectVideo09 = !this.chapterData.isCollectVideo09 } + this.handleChapter002(); this.handleChapterData(); }, @@ -5942,12 +6040,12 @@ </script> <style lang="less" scoped> -hr{ - margin-left: 0; - margin-bottom: 4px; - width: 15.5%; - border: none; - height: 1.5px; - background-color: #000; - } +hr { + margin-left: 0; + margin-bottom: 4px; + width: 15.5%; + border: none; + height: 1.5px; + background-color: #000; +} </style> -- Gitblit v1.9.1