258a595f30a04d9b5b15d192629c50ed903665a7..b8034ea8d5eac3eb346ec18f905b4a79cd9fdc13
2 天以前 Flex
Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
b8034e 对比 | 目录
2 天以前 Flex
补充提交
56b0d4 对比 | 目录
已修改24个文件
67 ■■■■ 文件已修改
easegen-front/src/components/Crontab/src/Crontab.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/Dialog/src/Dialog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/File/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/chooseTemplate/index.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/chooseTemplate/rewriter.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/chooseTemplate/speakvideo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/autoReply/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/components/wx-video-play/main.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/draft/components/CoverSelect.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/draft/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/material/components/UploadVideo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/menu/components/MenuEditor.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/mp/message/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/myCourse/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/components/Crontab/src/Crontab.vue
@@ -535,6 +535,7 @@
    append-to-body
    destroy-on-close
    title="cron规则生成器"
    :close-on-click-modal="false"
  >
    <div class="sc-cron">
      <el-tabs>
easegen-front/src/components/Dialog/src/Dialog.vue
@@ -60,7 +60,7 @@
<template>
  <ElDialog
    v-bind="getBindValue"
    :close-on-click-modal="true"
    :close-on-click-modal="false"
    :fullscreen="isFullscreen"
    :width="width"
    destroy-on-close
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
@@ -195,6 +195,7 @@
      width="600px"
      append-to-body
      destroy-on-close
      :close-on-click-modal="false"
    >
      <el-form
        :model="listenerFieldForm"
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
@@ -239,6 +239,7 @@
      width="600px"
      append-to-body
      destroy-on-close
      :close-on-click-modal="false"
    >
      <el-form
        :model="listenerFieldForm"
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
@@ -139,7 +139,7 @@
    </el-drawer>
    <!-- 注入西段 编辑/创建 部分 -->
    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
    <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close :close-on-click-modal="false" >
      <el-form :model="listenerFieldForm" size="small" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
        <el-form-item label="字段名称:" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
          <el-input v-model="listenerFieldForm.name" clearable />
easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
@@ -36,6 +36,7 @@
      width="600px"
      append-to-body
      destroy-on-close
      :close-on-click-modal="false"
    >
      <el-form :model="propertyForm" label-width="80px" ref="attributeFormRef">
        <el-form-item label="属性名:" prop="name">
easegen-front/src/views/File/index.vue
@@ -85,7 +85,7 @@
    />
    <!-- 新增弹窗 -->
    <el-dialog :title="dialogTitle" v-model="open" width="40%" append-to-body>
    <el-dialog :title="dialogTitle" v-model="open" width="40%" append-to-body :close-on-click-modal="false" >
      <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="文件名" prop="name">
          <el-input v-model="form.name" placeholder="请输入文件名" />
@@ -109,7 +109,7 @@
    </el-dialog>
    <!-- 视频预览弹窗 -->
    <el-dialog title="视频预览" v-model="previewVisible" width="50%" append-to-body>
    <el-dialog title="视频预览" v-model="previewVisible" width="50%" append-to-body :close-on-click-modal="false" >
      <video
        v-if="previewUrl"
        :src="previewUrl"
easegen-front/src/views/chooseTemplate/index.vue
@@ -113,6 +113,7 @@
                      v-if="
                        element.digitalHuman?.show &&
                        element.digitalHuman?.host &&
                        element.digitalHuman.host.fixVideoUrl &&
                        element.digitalHuman?.host.fixVideoUrl !== null &&
                        element.digitalHuman?.host.pictureUrl !== null &&
                        element.digitalHuman?.host.videoUrl !== null
@@ -238,6 +239,7 @@
                  <Delete />
                </el-icon>
              </Vue3DraggableResizable>
              <Vue3DraggableResizable
                :key="selectPPT.id"
                v-if="
@@ -276,6 +278,7 @@
                  <Delete />
                </el-icon>
              </Vue3DraggableResizable>
              <Vue3DraggableResizable
                :key="selectPPT.id"
                v-if="
@@ -319,8 +322,8 @@
              <Vue3DraggableResizable
                v-if="
                  selectPPT.digitalHuman.show == true &&
                  selectPPT.digitalHuman?.host &&
                  selectPPT.digitalHuman.host !== null &&
                  selectPPT.digitalHuman.host &&
                  selectPPT.digitalHuman.host.fixVideoUrl &&
                  selectPPT.digitalHuman?.host.fixVideoUrl !== null &&
                  selectPPT.digitalHuman?.host.pictureUrl !== null &&
                  selectPPT.digitalHuman?.host.videoUrl !== null
@@ -366,8 +369,8 @@
              <Vue3DraggableResizable
                v-if="
                  selectPPT.digitalHuman.show == false &&
                  selectPPT.digitalHuman?.host &&
                  selectPPT.digitalHuman.host !== null &&
                  selectPPT.digitalHuman.host &&
                  selectPPT.digitalHuman.host.fixVideoUrl &&
                  selectPPT.digitalHuman?.host.fixVideoUrl !== null &&
                  selectPPT.digitalHuman?.host.pictureUrl !== null &&
                  selectPPT.digitalHuman?.host.videoUrl !== null
@@ -774,6 +777,7 @@
      title="点击需要纠正的多音字,选择正确的发音"
      width="500"
      @close="dialogVisible = false"
      :close-on-click-modal="false"
    >
      <el-tag
        v-for="(item, index) in textList"
@@ -786,14 +790,14 @@
        {{ item }}
      </el-tag>
    </el-dialog>
    <el-dialog v-model="dialogVisible1" title="提示" width="500px" style="height: 150px">
    <el-dialog v-model="dialogVisible1" title="提示" width="500px" style="height: 150px" :close-on-click-modal="false" >
      <p style="margin-bottom: 20px; font-size: 18px">是否要将此模板应用到所有页面</p>
      <span class="dialog-footer">
        <el-button @click="handleTemplateSelection1(1)">应用当前页</el-button>
        <el-button type="primary" @click="handleTemplateSelection1(2)">应用所有页</el-button>
      </span>
    </el-dialog>
    <el-dialog v-model="dialogVisible2" title="提示" width="500px" style="height: 150px">
    <el-dialog v-model="dialogVisible2" title="提示" width="500px" style="height: 150px" :close-on-click-modal="false" >
      <p style="margin-bottom: 20px; font-size: 18px">是否要将此数字人应用到所有页面</p>
      <span class="dialog-footer">
        <el-button @click="chooseHost1(1)">应用当前页</el-button>
@@ -913,6 +917,7 @@
    initHumanPositon(host, page.digitalHuman)
  })
  selectPPT.value.digitalHuman.host = host
  console.log( "PPTArr.value", PPTArr.value )
}
const saveEdit = () => {
  isEditing.value = false
@@ -1313,7 +1318,6 @@
})
// 确定按钮点击处理函数
const submitForm = () => {
  console.log(selectLanguage.value)
  if (selectLanguage.value.value === 'all_Language') {
    // message.warning('请将语种按钮由全部语种修改为您需要生成的声音的文本的语种类型')
    message.warning('请先选择语种与声音类型')
@@ -1655,6 +1659,7 @@
          }
          let ppturl = item.pictureUrl
          console.log( "ppturl", ppturl )
          if (selectTemplate.value.showBackground) {
            item.pictureUrl = selectTemplate.value.bgImage
          } else {
@@ -1746,6 +1751,7 @@
  })
    .then(() => {
      PPTArr.value = PPTArr.value.filter((child) => child.id !== item.id)
      //已经进行过删除操作
      DeleteD.value = true
    })
@@ -1848,7 +1854,6 @@
  AllHumanList.value = [...AllHumanList.value, ...data.list]
  if (curQuery.type === '1') {
    let id = route.query.id?route.query.id:sessionStorage.getItem("courseInfo")
    console.log(id)
    if (id !== "" ) {
      await getCourseDetail(id)
    } else {
@@ -1964,6 +1969,7 @@
const IsSaved = ref(false)
const saveSubmit = async (type) => {
  console.log( "PPTArr.value", PPTArr.value )
  console.log('是否删除', DeleteD.value)
@@ -2414,7 +2420,6 @@
}
const goBack = () => {
  // if () {
  if ( PPTArr.value.length == 0 || !IsSaved.value) {
    pptTemplateApi.coursesDelete(courseInfo.value.id).then((res) => {
      router.go(-1)
@@ -2484,6 +2489,11 @@
  const res = await pptTemplateApi.coursesDetail(id)
  if (res) {
    courseInfo.value = res
    if( courseInfo.value.height === 0 && courseInfo.value.name === "未命名草稿" && courseInfo.value.width === 0 && !route.query.id && sessionStorage.getItem("courseInfo")!=="" ){
      courseInfo.value.height = 1920
      courseInfo.value.width = 1080
    }
    if (res.scenes && res.scenes.length > 0) {
      res.scenes.forEach((item) => {
        item.isActive = false
@@ -3166,8 +3176,10 @@
          justify-content: space-around;
          align-items: center;
          position: relative;
          padding: 5px 0;
          box-sizing: border-box;
          > .ImgBox {
            width: 34%;
            width: 30%;
            margin: 0 auto;
            border-radius: 50%;
            overflow: hidden;
easegen-front/src/views/chooseTemplate/rewriter.vue
@@ -4,6 +4,7 @@
    :title="t('courseCenter.intelligentSpeech')"
    width="80%"
    :before-close="handleClose"
    :close-on-click-modal="false"
  >
    <div class="rewriter-container flex-col">
      <div class="content-wrapper flex-col">
easegen-front/src/views/chooseTemplate/speakvideo.vue
@@ -564,7 +564,7 @@
      @confirm="handleRewritten"
    />
     <!-- 多音字 -->
     <el-dialog v-model="dialogVisible" title="点击需要纠正的多音字,选择正确的发音" width="500" @close="dialogVisible = false">
     <el-dialog v-model="dialogVisible" title="点击需要纠正的多音字,选择正确的发音" width="500" @close="dialogVisible = false" :close-on-click-modal="false" >
      <el-tag v-for="(item, index) in textList" :key="index" type="primary" effect="dark" style="margin-right: 10px;cursor: pointer;" @click="handleTag(item)">
          {{ item }}
      </el-tag>
easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
@@ -106,7 +106,7 @@
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
    <el-dialog v-model="mapDialogVisible" title="获取经纬度" append-to-body>
    <el-dialog v-model="mapDialogVisible" title="获取经纬度" append-to-body :close-on-click-modal="false" >
      <IFrame class="h-609px" :src="tencentLbsUrl" />
    </el-dialog>
  </Dialog>
easegen-front/src/views/mp/autoReply/index.vue
@@ -58,6 +58,7 @@
      v-model="showDialog"
      width="800px"
      destroy-on-close
      :close-on-click-modal="false"
    >
      <ReplyForm v-model="replyForm" v-model:reply="reply" :msg-type="msgType" ref="formRef" />
      <template #footer>
easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue
@@ -23,6 +23,7 @@
          width="90%"
          append-to-body
          destroy-on-close
          :close-on-click-modal="false"
        >
          <WxMaterialSelect
            type="image"
easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue
@@ -37,6 +37,7 @@
          width="80%"
          append-to-body
          destroy-on-close
          :close-on-click-modal="false"
        >
          <WxMaterialSelect
            type="image"
easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue
@@ -20,7 +20,7 @@
          </el-col>
        </el-row>
      </el-col>
      <el-dialog title="选择图文" v-model="showDialog" width="90%" append-to-body destroy-on-close>
      <el-dialog title="选择图文" v-model="showDialog" width="90%" append-to-body destroy-on-close :close-on-click-modal="false" >
        <WxMaterialSelect
          type="news"
          :account-id="reply.accountId"
easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue
@@ -19,6 +19,7 @@
              width="90%"
              append-to-body
              destroy-on-close
              :close-on-click-modal="false"
            >
              <WxMaterialSelect
                type="video"
easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue
@@ -21,6 +21,7 @@
          width="90%"
          append-to-body
          destroy-on-close
          :close-on-click-modal="false"
        >
          <WxMaterialSelect
            type="voice"
easegen-front/src/views/mp/components/wx-video-play/main.vue
@@ -19,7 +19,7 @@
    </div>
    <!-- 弹窗播放 -->
    <el-dialog v-model="dialogVideo" title="视频播放" append-to-body>
    <el-dialog v-model="dialogVideo" title="视频播放" append-to-body :close-on-click-modal="false" >
      <video-player
        v-if="dialogVideo"
        class="video-player vjs-big-play-centered"
easegen-front/src/views/mp/draft/components/CoverSelect.vue
@@ -48,6 +48,7 @@
        width="80%"
        append-to-body
        destroy-on-close
        :close-on-click-modal="false"
      >
        <WxMaterialSelect
          type="image"
easegen-front/src/views/mp/draft/index.vue
@@ -52,6 +52,7 @@
    v-model="showDialog"
    :before-close="onBeforeDialogClose"
    destroy-on-close
    :close-on-click-modal="false"
  >
    <NewsForm v-model="newsList" v-loading="isSubmitting" :is-creating="isCreating" />
    <template #footer>
easegen-front/src/views/mp/material/components/UploadVideo.vue
@@ -13,6 +13,7 @@
      ref="uploadVideoRef"
      :auto-upload="false"
      class="mb-5"
      :close-on-click-modal="false"
    >
      <template #trigger>
        <el-button type="primary" plain>选择视频</el-button>
easegen-front/src/views/mp/menu/components/MenuEditor.vue
@@ -92,7 +92,7 @@
                </el-col>
              </el-row>
            </div>
            <el-dialog title="选择图文" v-model="showNewsDialog" width="80%" destroy-on-close>
            <el-dialog title="选择图文" v-model="showNewsDialog" width="80%" destroy-on-close :close-on-click-modal="false" >
              <WxMaterialSelect
                type="news"
                :account-id="props.accountId"
easegen-front/src/views/mp/message/index.vue
@@ -75,6 +75,7 @@
    @click="messageBox.show = true"
    width="50%"
    destroy-on-close
    :close-on-click-modal="false"
  >
    <WxMsg :user-id="messageBox.userId" />
  </el-dialog>
easegen-front/src/views/myCourse/index.vue
@@ -156,6 +156,7 @@
    width="70%"
    class="subtitle-dialog"
    @close="pauseAllVideos('subtitle')"
    :close-on-click-modal="false"
  >
    <el-tabs v-model="activeSubtitleTab">
      <el-tab-pane label="字幕设置" name="setting">
@@ -279,6 +280,7 @@
    title="片头片尾"
    width="70%"
    @close="pauseAllVideos('headerFooter')"
    :close-on-click-modal="false"
  >
    <el-tabs v-model="activeTab">
      <el-tab-pane label="合成视频" name="merge">
@@ -434,6 +436,7 @@
    v-model="dialogVisible"
    title="视频合成"
    width="50%"
    :close-on-click-modal="false"
  >
    <el-form :model="formData1" label-width="120px">
      <el-form-item label="视频格式">