From 4ff484000fda6dc1151557c5c4d2e2453e97e460 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期一, 16 六月 2025 11:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
---
easegen-front/src/views/chooseTemplate/index.vue | 108 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 70 insertions(+), 38 deletions(-)
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index c042c68..9cd6586 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -199,41 +199,74 @@
:src="selectPPT.pictureUrl"
style="z-index: 1"
/>
-
<!-- 鐢讳腑鐢� -->
- <Vue3DraggableResizable
- :key="selectPPT.digitalHuman.x + '-' + selectPPT.digitalHuman.y"
- v-if="selectPPT.innerPicture && 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"
+ <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"
>
- <Delete />
- </el-icon>
- </Vue3DraggableResizable>
+ <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
+ :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,8 +2169,7 @@
otherItem.height = item.height
}
})
- if (template.showPpt) {
- item.innerPicture = {
+ item.innerPicture = {
name: '鐢讳腑鐢�',
src: originalPPT,
cover: template.bgImage,
@@ -2156,8 +2186,10 @@
entityId: 1,
templateId: template.id
}
- }
+
})
+ console.log('pptList', selectPPT.value)
+
}
const replaceDialog = ref(null)
--
Gitblit v1.9.3