From d551fabb2a437effad7dff87fa7ab0e524c97b57 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期一, 31 三月 2025 15:34:58 +0800
Subject: [PATCH] 上传格式
---
easegen-front/src/components/AppLinkInput/AppLinkSelectDialog.vue | 4 +-
easegen-front/src/views/chooseTemplate/index.vue | 2 +
easegen-front/src/views/digitalcourse/digitalhumans/index.vue | 8 ++--
easegen-front/src/views/digitalcourse/template/TemplateForm.vue | 55 +++++++++++++++++----------
4 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/easegen-front/src/components/AppLinkInput/AppLinkSelectDialog.vue b/easegen-front/src/components/AppLinkInput/AppLinkSelectDialog.vue
index 63f1966..cae8bfc 100644
--- a/easegen-front/src/components/AppLinkInput/AppLinkSelectDialog.vue
+++ b/easegen-front/src/components/AppLinkInput/AppLinkSelectDialog.vue
@@ -111,7 +111,7 @@
detailSelectDialog.value.type = appLink.type
// 杩旀樉
detailSelectDialog.value.id =
- getUrlNumberValue('id', 'http://127.0.0.1' + activeAppLink.value.path) || undefined
+ getUrlNumberValue('id', 'http://192.168.3.159' + activeAppLink.value.path) || undefined
break
default:
break
@@ -193,7 +193,7 @@
})
// 澶勭悊璇︽儏閫夋嫨
const handleProductCategorySelected = (id: number) => {
- const url = new URL(activeAppLink.value.path, 'http://127.0.0.1')
+ const url = new URL(activeAppLink.value.path, 'http://192.168.3.159')
// 淇敼 id 鍙傛暟
url.searchParams.set('id', `${id}`)
// 鎺掗櫎鍩熷悕
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index e7e4af2..8156eb2 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -221,6 +221,7 @@
<Vue3DraggableResizable
v-if="selectPPT.showDigitalHuman"
:parent="true"
+ :lockAspectRatio="true"
:initW="PPTpositon.w"
:initH="PPTpositon.h"
v-model:x="PPTpositon.x"
@@ -1408,6 +1409,7 @@
matting: 1,
marker: 1
}
+
let pageNum = 1
if (PPTArr.value && PPTArr.value.length > 0) {
console.log('寮�濮嬪鐞哖PTArr鏁版嵁')
diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/index.vue b/easegen-front/src/views/digitalcourse/digitalhumans/index.vue
index df47d71..ba7c633 100644
--- a/easegen-front/src/views/digitalcourse/digitalhumans/index.vue
+++ b/easegen-front/src/views/digitalcourse/digitalhumans/index.vue
@@ -121,9 +121,9 @@
</el-table-column>
<el-table-column :label="t('digitalhumans.picture')" align="center" prop="pictureUrl" width="100">
<template #default="scope">
- <el-image
+ <el-image
v-if="scope.row.pictureUrl"
- :src="scope.row.pictureUrl"
+ :src="scope.row.pictureUrl"
:preview-src-list="[scope.row.pictureUrl]"
fit="contain"
class="w-[50px] h-[50px] cursor-pointer"
@@ -154,7 +154,7 @@
<!-- :disabled="scope.row.status == 3" -->
<el-button
v-if="superAdminProcess(scope.row.status, scope.row.type)"
- :disabled="scope.row.status == 3"
+ :disabled="scope.row.status == 3"
link
type="primary"
@click="openAuditForm('update', scope.row.id)"
@@ -315,4 +315,4 @@
.el-scrollbar__view .el-table__body{
width: 100% !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
index c50e7c0..3205f80 100644
--- a/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
+++ b/easegen-front/src/views/digitalcourse/template/TemplateForm.vue
@@ -77,14 +77,33 @@
</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" v-model="formData.humanW" :placeholder="t('common.inputText') + t('template.digitalPeopleWidth')" />
+ <el-input type="number" disabled v-model="formData.humanW" :placeholder="t('common.inputText') + t('template.digitalPeopleWidth')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="t('template.digitalPeopleHeight')" prop="humanH">
- <el-input type="number" v-model="formData.humanH" :placeholder="t('common.inputText') + t('template.digitalPeopleHeight')" />
+ <el-input type="number" disabled v-model="formData.humanH" :placeholder="t('common.inputText') + t('template.digitalPeopleHeight')" />
</el-form-item>
</el-col>
</el-row>
@@ -100,23 +119,7 @@
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item :label="t('template.templateSize')" prop="templateSize">
- <el-select
- v-model="formData.templateSize"
- clearable
- :placeholder="t('common.selectText') + t('template.templateSize')"
- class="!w-240px"
- >
- <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-row>
<el-row>
<el-col :span="12">
@@ -184,6 +187,7 @@
pptX: [{ required: true, message: t('template.topPositionPPT') + t('common.notEmpty'), trigger: 'blur' }],
pptY: [{ required: true, message: t('template.leftPositionPPT') + t('common.notEmpty'), trigger: 'blur' }],
humanW: [{ required: true, message: t('template.digitalPeopleWidth') + t('common.notEmpty'), trigger: 'blur' }],
+ templateSize: [{ required: true, message: t('template.templateSize') + t('common.notEmpty'), trigger: 'blur' }],
humanH: [{ required: true, message: t('template.digitalPeopleHeight') + t('common.notEmpty'), trigger: 'blur' }],
humanX: [{ required: true, message: t('template.topPositionDigitalPeople') + t('common.notEmpty'), trigger: 'blur' }],
humanY: [{ required: true, message: t('template.leftPositionDigitalPeople') + t('common.notEmpty'), trigger: 'blur' }],
@@ -207,7 +211,18 @@
}
}
defineExpose({ open }) // 鎻愪緵 open 鏂规硶锛岀敤浜庢墦寮�寮圭獥
-
+const changeTemplateSize = () => {
+ console.log(formData.value.templateSize)
+ const screenWidth = window.screen.width;
+ const screenHeight = window.screen.height;
+ if(formData.value.templateSize=='16:9'){
+ formData.value.humanW = screenWidth / 3;
+ formData.value.humanH = screenHeight / 3;
+ }else if(formData.value.templateSize=='9:16'){
+ formData.value.humanH = screenWidth / 3;
+ formData.value.humanW = screenHeight / 3;
+ }
+}
/** 鎻愪氦琛ㄥ崟 */
const emit = defineEmits(['success']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const submitForm = async () => {
--
Gitblit v1.9.3