From a6c24eaf3b22bd4b26c444de10c5839c8194daf8 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期一, 21 四月 2025 10:00:13 +0800
Subject: [PATCH] Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
---
easegen-front/src/views/chooseTemplate/index.vue | 3 ++-
easegen-front/src/views/myCourse/index.vue | 17 +----------------
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java | 2 +-
easegen-front/src/styles/var.css | 2 +-
4 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/easegen-front/src/styles/var.css b/easegen-front/src/styles/var.css
index 44f9405..6548350 100644
--- a/easegen-front/src/styles/var.css
+++ b/easegen-front/src/styles/var.css
@@ -48,7 +48,7 @@
--app-content-padding: 20px;
- --app-content-bg-color: #f5f7f9;
+ --app-content-bg-color: #fff;
--app-footer-height: 50px;
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index a865a19..312d572 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -1119,6 +1119,7 @@
}
percentagePPT.value = parseInt(`${progress * 100}`)
} else if (res && res.length > 0) {
+ console.log('瑙ｆ瀽鎴愬姛', res)
console.log('courseInfo', courseInfo.value)
res.forEach((item) => {
item.isActive = false
@@ -1455,7 +1456,7 @@
//鍚戝師濮媝pt娣诲姞鏁版嵁锛岀敤浣滃悗缁璸pt涓槸鍚﹀寘鍚汉鑴哥殑鏁版嵁鏍￠獙鍘熷鏁版嵁
const InitPpt = PPTArr.value.map( (item)=>{
return item.innerPicture.src
- } )
+ } )
const { detectFacesInImages } = useFaceDetection()
const IsHaveFace = await detectFacesInImages(InitPpt)
if( IsHaveFace ){
diff --git a/easegen-front/src/views/myCourse/index.vue b/easegen-front/src/views/myCourse/index.vue
index 83b4e7c..7229ee4 100644
--- a/easegen-front/src/views/myCourse/index.vue
+++ b/easegen-front/src/views/myCourse/index.vue
@@ -147,22 +147,7 @@
</ContentWrap>
<!-- 瑙嗛鎾斁寮规 -->
- <el-dialog
- v-model="videoPlayDialogVisible"
- title="瑙嗛棰勮"
- width="60%"
- @close="handleVideoPlayClose"
- >
- <div class="video-play-container">
- <video
- ref="currentPlayVideo"
- v-if="currentPlayUrl"
- :src="currentPlayUrl"
- controls
- class="play-video"
- ></video>
- </div>
- </el-dialog>
+ <videoDialog ref="videoRef" />
<!-- 瀛楀箷鐢熸垚寮规 -->
<el-dialog
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
index 19403c3..71be55f 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceUtil.java
@@ -373,7 +373,7 @@
result = data.getString("result");
System.out.println("浠诲姟宸插畬鎴愶紝缁撴灉鏂囦欢璺緞: " + result);
} else if (status == 3){
- throw new RuntimeException("浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ throw new RuntimeException(data.getString("msg"));
}else {
System.out.println("浠诲姟灏氭湭瀹屾垚锛屽綋鍓嶈繘搴�: " + data.getIntValue("progress") + "%");
}
--
Gitblit v1.9.3