From b115cefe21a1c1aadc6fd4311720217e2c88dc33 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期一, 16 六月 2025 09:55:23 +0800
Subject: [PATCH] 解决冲突
---
easegen-front/src/views/chooseTemplate/index.vue | 8 +++++---
easegen-front/src/components/Table/src/Table.vue | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/easegen-front/src/components/Table/src/Table.vue b/easegen-front/src/components/Table/src/Table.vue
index 279a9fa..e9e50af 100644
--- a/easegen-front/src/components/Table/src/Table.vue
+++ b/easegen-front/src/components/Table/src/Table.vue
@@ -56,7 +56,7 @@
// 娉ㄥ唽
onMounted(() => {
const tableRef = unref(elTableRef)
- emit('register', tableRef?.$parent, elTableRef)
+ emit('register', tableRef?.$parent, elTableRef.value)
})
const pageSizeRef = ref(props.pageSize)
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index 3f5452d..c8e6bec 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -753,7 +753,8 @@
Headset,
Delete,
VideoPlay,
- CopyDocument
+ CopyDocument,
+Select
} from '@element-plus/icons-vue'
import { generateUUID } from '@/utils'
import { useRoute, useRouter } from 'vue-router'
@@ -1761,6 +1762,7 @@
// 鑾峰彇鍗曠被鏁板瓧浜哄舰璞�
const GetHumanList = async (query) => {
let data = await pptTemplateApi.pageList(query)
+ console.log( "pptdata", data )
AllHumanList.value = [...AllHumanList.value, ...data.list]
}
@@ -2029,8 +2031,6 @@
return
}
}
-
-
try {
const res = await pptTemplateApi.coursesSave(JSON.stringify(saveSubmitForm))
@@ -2448,6 +2448,8 @@
]
}
+ console.log( "selectPPT.value", selectPPT.value )
+
// 璁剧疆闊抽閫夋嫨鏁版嵁
const firstScene = res.scenes[0]
if (firstScene.voice) {
--
Gitblit v1.9.3