From e7fbf453476e31d7d9cf15b64acb6052fca6d78d Mon Sep 17 00:00:00 2001
From: shenrongliang <1328040932@qq.com>
Date: 星期一, 07 四月 2025 14:54:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
easegen-front/src/views/chooseTemplate/index.vue | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index 9fa14cf..ed64afd 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -175,7 +175,7 @@
<div class="list">
<div
class="main-image-box"
- :style="{ width: viewSize.width + 'px', height: viewSize.height + 'px' }"
+ :style="{ width: viewSize.width + 'px', height: viewSize.height + 'px',position: 'relative' }"
>
<!-- 鑳屾櫙(蹇呮樉绀�) -->
<el-image
@@ -183,6 +183,7 @@
class="background"
:src="selectPPT.pictureUrl"
/>
+
<!-- 鐢讳腑鐢� -->
<Vue3DraggableResizable
v-if="selectPPT.innerPicture && selectPPT.innerPicture.src"
@@ -217,43 +218,48 @@
<Delete />
</el-icon>
</Vue3DraggableResizable>
- <Vue3DraggableResizable
- v-if="selectPPT.showDigitalHuman"
- :parent="false"
- :initW="PPTpositon.w"
- :initH="PPTpositon.h"
- @drag-move="onDragMove"
- v-model:x="PPTpositon.x"
- v-model:y="PPTpositon.y"
- v-model:w="PPTpositon.w"
- v-model:h="PPTpositon.h"
- v-model:active="PPTpositon.active"
- :draggable="true"
- :resizable="true"
- @activated="print('activated')"
- @deactivated="print('deactivated')"
- @drag-start="print('drag-start')"
- @resize-start="print('resize-start')"
- @dragging="print('dragging')"
- @resizing="print('resizing')"
- @drag-end="print('drag-end')"
- @resize-end="print('resize-end')"
- style="z-index: 2"
- >
- <el-image
- class="minddle-host-image"
- :src="selectHost ? selectHost.pictureUrl : ''"
- />
- <el-icon
- v-if="PPTpositon.active"
- size="20"
- color="#409eff"
- style="position: absolute; top: 5px; right: 5px; z-index: 4"
- @click.stop="deleteDigitalHuman"
+ <div style="width: 160%;height: 100%;position: absolute;top: 0;left: -30%">
+ <Vue3DraggableResizable
+ v-if="selectPPT.showDigitalHuman"
+ :parent="true"
+ :initW="PPTpositon.w"
+ :initH="PPTpositon.h"
+ @drag-move="onDragMove"
+ v-model:x="PPTpositon.x"
+ v-model:y="PPTpositon.y"
+ v-model:w="PPTpositon.w"
+ v-model:h="PPTpositon.h"
+ v-model:active="PPTpositon.active"
+ :draggable="true"
+ :resizable="true"
+ @activated="print('activated')"
+ @deactivated="print('deactivated')"
+ @drag-start="print('drag-start')"
+ @resize-start="print('resize-start')"
+ @dragging="print('dragging')"
+ @resizing="print('resizing')"
+ @drag-end="print('drag-end')"
+ @resize-end="print('resize-end')"
+ style="z-index: 4"
>
- <Delete />
- </el-icon>
- </Vue3DraggableResizable>
+ <!-- {{PPTpositon.w}}{{PPTpositon.h}}-->
+ <el-image
+ class="minddle-host-image"
+ :src="selectHost ? selectHost.pictureUrl : ''"
+ />
+
+ <el-icon
+ v-if="PPTpositon.active"
+ size="20"
+ color="#409eff"
+ style="position: absolute; top: 5px; right: 5px; z-index: 4"
+ @click.stop="deleteDigitalHuman"
+ >
+ <Delete />
+ </el-icon>
+ </Vue3DraggableResizable>
+ </div>
+
</div>
</div>
<el-card
@@ -1956,8 +1962,8 @@
const template = selectTemplate.value
const pptList = applyAllTemplate.value ? PPTArr.value : [selectPPT.value]
- //鏁板瓧浜烘槸缁熶竴鐢熸晥鐨勶紝鍏堝鐞�
-
+ // 鏁板瓧浜烘槸缁熶竴鐢熸晥鐨勶紝鍏堝鐞�
+ console.log(template)
pptList.forEach((item) => {
// 淇濆瓨鍘熷ppt鍥剧墖
const originalPPT = item.innerPicture?.src || item.pictureUrl
@@ -1979,7 +1985,8 @@
entityType: 1,
originHeight: courseInfo.value.height,
originWidth: courseInfo.value.width,
- entityId: 1
+ entityId: 1,
+ templateId: template.id,
}
}
} else {
@@ -1988,7 +1995,17 @@
}
item.showDigitalHuman = template.showDigitalHuman
+ // 娣诲姞鍚屾瀹介珮鐨勯�昏緫
+ const targetTemplate = selectTemplate.value
+ console.log(PPTArr)
+ PPTArr.value.forEach((otherItem) => {
+ if (otherItem.templateId === item.templateId) {
+ otherItem.width = item.width
+ otherItem.height = item.height
+ }
+ })
})
+
// 鏁板瓧浜轰綅缃篃闇�瑕佺缉鏀�
PPTpositon.w = selectTemplate.value.humanW
PPTpositon.h = selectTemplate.value.humanH
@@ -2059,7 +2076,7 @@
}
.minddle-host-image {
- z-index: 3;
+ z-index: 5;
width: 100%;
height: 100%;
}
--
Gitblit v1.9.3