From 0503695700df772d0db112d6a9fcdc28db118bbe Mon Sep 17 00:00:00 2001
From: 康鲁杰 <60095866+KangLujie@users.noreply.github.com>
Date: 星期一, 14 四月 2025 09:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
easegen-front/src/views/digitalcourse/template/TemplateForm.vue | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
index 3205f80..381de05 100644
--- a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
+++ b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
@@ -53,6 +53,25 @@
</el-col>
</el-row>
<el-row>
+ <el-col :span="24">
+ <el-form-item :label="t('template.templateSize')" prop="templateSize">
+ <el-select
+ style="width: 100%"
+ v-model="formData.templateSize"
+ clearable
+ :placeholder="t('common.selectText') + t('template.templateSize')"
+ class="!w-240px"
+ @change="changeTemplateSize"
+ >
+ <el-option
+ v-for="dict in getStrDictOptions(DICT_TYPE.TEMPLATE_SIZE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item :label="t('template.pptWidth')" prop="pptW">
<el-input type="number" v-model="formData.pptW" :placeholder="t('common.inputText') + t('template.pptWidth')" />
@@ -77,25 +96,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
- <el-form-item :label="t('template.templateSize')" prop="templateSize">
- <el-select
- style="width: 100%"
- v-model="formData.templateSize"
- clearable
- :placeholder="t('common.selectText') + t('template.templateSize')"
- class="!w-240px"
- @change="changeTemplateSize"
- >
- <el-option
- v-for="dict in getStrDictOptions(DICT_TYPE.TEMPLATE_SIZE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
+
<el-col :span="12">
<el-form-item :label="t('template.digitalPeopleWidth')" prop="humanW">
<el-input type="number" disabled v-model="formData.humanW" :placeholder="t('common.inputText') + t('template.digitalPeopleWidth')" />
@@ -218,9 +219,13 @@
if(formData.value.templateSize=='16:9'){
formData.value.humanW = screenWidth / 3;
formData.value.humanH = screenHeight / 3;
+ formData.value.pptW = '505';
+ formData.value.pptH = '290';
}else if(formData.value.templateSize=='9:16'){
formData.value.humanH = screenWidth / 3;
formData.value.humanW = screenHeight / 3;
+ formData.value.pptH = '505';
+ formData.value.pptW = '290';
}
}
/** 鎻愪氦琛ㄥ崟 */
--
Gitblit v1.9.3