From b00c9d83f57f24178bf63a257a221face060b936 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期四, 12 六月 2025 16:42:03 +0800
Subject: [PATCH] Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
---
easegen-front/src/views/chooseTemplate/index.vue | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index 2428fc1..ca8bbe4 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -1808,6 +1808,11 @@
const saveSubmit = async (type) => {
console.log('鏄惁鍒犻櫎', DeleteD.value)
+ if ( selectLanguage.value?.value === undefined || selectLanguage.value.value === 'all_Language' ) {
+ message.error('璇峰厛閫夋嫨璇涓庡０闊崇被鍨�')
+ return
+ }
+
if (ChangeSoundTypeList.value.value === 2) {
//姝ゆ椂涓洪�氱敤
if (selectList.value === undefined || selectList.value === null) {
@@ -1986,8 +1991,7 @@
try {
if (
ChangeSoundTypeList.value?.value === undefined ||
- selectLanguage.value?.value === undefined ||
- selectLanguage.value?.value === 'all_Language'
+ selectLanguage.value?.value === undefined
) {
message.error('璇峰厛閫夋嫨璇涓庡０闊崇被鍨�')
return
@@ -2049,9 +2053,19 @@
pptList.forEach((item) => {
const originalPPT = item.innerPicture?.src || item.pictureUrl
-
- if (template.showBackground) {
+ console.log(template)
item.pictureUrl = template.bgImage
+ item.digitalHuman.show = template.showDigitalHuman
+ item.digitalHuman.w = template.humanW
+ item.digitalHuman.h = template.humanH
+ item.digitalHuman.x = template.humanX
+ item.digitalHuman.y = template.humanY
+ PPTArr.value.forEach((otherItem) => {
+ if (otherItem.templateId === item.templateId) {
+ otherItem.width = item.width
+ otherItem.height = item.height
+ }
+ })
if (template.showPpt) {
item.innerPicture = {
name: '鐢讳腑鐢�',
@@ -2071,23 +2085,6 @@
templateId: template.id
}
}
- } else {
- item.pictureUrl = originalPPT
- item.innerPicture.src = ''
- }
-
- item.digitalHuman.show = template.showDigitalHuman
- item.digitalHuman.w = template.humanW
- item.digitalHuman.h = template.humanH
- item.digitalHuman.x = template.humanX
- item.digitalHuman.y = template.humanY
-
- PPTArr.value.forEach((otherItem) => {
- if (otherItem.templateId === item.templateId) {
- otherItem.width = item.width
- otherItem.height = item.height
- }
- })
})
}
@@ -2387,7 +2384,6 @@
selectTemplate.value = cloneDeep(templates.value[0])
}
}
-
onMounted(async () => {
let data = await TemplateApi.getTemplatePage(queryParams1)
TEMPLATE_PRESETS.value = data.list.map((item) => ({
--
Gitblit v1.9.3