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

Flex

7 天以前 4ff484000fda6dc1151557c5c4d2e2453e97e460

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

 easegen-front/src/views/chooseTemplate/index.vue

@@ -199,11 +199,10 @@
                :src="selectPPT.pictureUrl"
                style="z-index: 1"
              />

              <!-- 画中画 -->
              <Vue3DraggableResizable
                :key="selectPPT.digitalHuman.x + '-' + selectPPT.digitalHuman.y"
                v-if="selectPPT.innerPicture && selectPPT.innerPicture.src"
                  :key="selectPPT.id"
                  v-if="selectPPT.innerPicture &&selectPPT.innerPicture.marginLeft==0 && selectPPT.innerPicture.top==0 && selectPPT.innerPicture.src"
                :parent="true"
                :initW="selectPPT.innerPicture.width"
                :initH="selectPPT.innerPicture.height"
@@ -234,6 +233,40 @@
                  <Delete />
                </el-icon>
              </Vue3DraggableResizable>
                <Vue3DraggableResizable
                  :key="selectPPT.id"
                  v-if="selectPPT.innerPicture && selectPPT.innerPicture.marginLeft!=0 && selectPPT.innerPicture.top!=0 && selectPPT.innerPicture.src"
                  :parent="true"
                  :initW="selectPPT.innerPicture.width"
                  :initH="selectPPT.innerPicture.height"
                  v-model:x="selectPPT.innerPicture.marginLeft"
                  v-model:y="selectPPT.innerPicture.top"
                  v-model:w="selectPPT.innerPicture.width"
                  v-model:h="selectPPT.innerPicture.height"
                  :draggable="true"
                  :resizable="true"
                  @activated="print('PPT activated')"
                  @deactivated="print('PPT deactivated')"
                  @drag-start="print('PPT drag-start')"
                  @resize-start="print('PPT resize-start')"
                  @dragging="print('PPT dragging')"
                  @resizing="print('PPT resizing')"
                  @drag-end="print('PPT drag-end')"
                  @resize-end="print('PPT resize-end')"
                  style="z-index: 3"
                >
                  <el-image class="ppt-bg" :src="selectPPT.innerPicture.src" />
                  <el-icon
                    v-if="selectPPT.innerPicture.active"
                    size="20"
                    color="#409eff"
                    style="position: absolute; top: 5px; right: 5px; z-index: 4"
                    @click.stop="deleteInnerPicture"
                  >
                    <Delete />
                  </el-icon>
                </Vue3DraggableResizable>

              <!-- 数字人 -->
              <Vue3DraggableResizable
                v-if="
@@ -2120,9 +2153,7 @@

const applyTemplate = (ppt = null) => {
  let template = selectTemplate.value
  console.log('template', selectTemplate.value)
  const pptList = applyAllTemplate.value ? PPTArr.value : [selectPPT.value]

  pptList.forEach((item) => {
    const originalPPT = item.innerPicture?.src || item.pictureUrl
    console.log(template)
@@ -2138,7 +2169,6 @@
        otherItem.height = item.height
      }
    })
    if (template.showPpt) {
      item.innerPicture = {
        name: '画中画',
        src: originalPPT,
@@ -2156,8 +2186,10 @@
        entityId: 1,
        templateId: template.id
      }
    }

  })
  console.log('pptList', selectPPT.value)

}

const replaceDialog = ref(null)