Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen

Flex

2025-04-21 a6c24eaf3b22bd4b26c444de10c5839c8194daf8

Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen

 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;


 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 @@
  //向原始ppt添加数据，用作后续ppt中是否包含人脸的数据校验原始数据
  const InitPpt = PPTArr.value.map( (item)=>{
      return item.innerPicture.src
  } ) 
  } )
  const { detectFacesInImages } = useFaceDetection()
  const IsHaveFace = await detectFacesInImages(InitPpt)
  if( IsHaveFace ){

 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

 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") + "%");
                }