From 7811bbfe3e9fac5e27a1cfa179744dadb8182970 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Wed, 4 Dec 2024 16:28:52 +0800 Subject: [PATCH] =?UTF-8?q?s=E7=94=9F=E6=88=90PPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron.vite.config.mjs | 2 +- src/renderer/src/views/model/index.vue | 8 +++--- .../views/prepare/container/ai-pptistV2.vue | 28 ++++++++++--------- .../views/prepare/container/pptist-dialog.vue | 2 +- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index dd0b3a1..962bf8f 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -34,7 +34,7 @@ export default defineConfig({ '/dev-api': { target: 'http://27.128.240.72:7865', // target: 'http://36.134.181.164:7863', - // target: 'http://192.168.2.52:7863', + // target: 'http://192.168.0.102:7865', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') }, diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index d2a6bf0..d09f75d 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -52,12 +52,12 @@ import { useRouter } from 'vue-router' import { Plus, Refresh, Upload, Files, UploadFilled } from '@element-plus/icons-vue' import useUserStore from '@/store/modules/user' // 用户信息 import msgUtils from '@/plugins/modal' // 消息工具 -import { createWindow, sessionStore } from '@/utils/tool' // 相关工具 +import { createWindow } from '@/utils/tool' // 相关工具 import * as API_smarttalk from '@/api/file' // 文件相关api import * as API_entpcourse from '@/api/education/entpcourse' // 相关api import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api import { dataSetJson } from '@/utils/comm' // 数据集id文生图 -// import { sessionStore } from '@/utils/store' // 学科名字文生图 +import { sessionStore } from '@/utils/store' // 学科名字文生图 // 组件引入 import ChooseTextbook from '@/components/choose-textbook/index.vue' import { menusEvent } from '@/plugins/vue3-menus' // 右键菜单 @@ -372,7 +372,7 @@ const getIcon = (o, type) => { justify-content: flex-start; .el-button { - flex: 1 1 15%; + flex: 1 1 15%; max-width: 15%; min-width: 15%; box-sizing: border-box; @@ -387,4 +387,4 @@ const getIcon = (o, type) => { } } } - \ No newline at end of file + diff --git a/src/renderer/src/views/prepare/container/ai-pptistV2.vue b/src/renderer/src/views/prepare/container/ai-pptistV2.vue index 0a1f50e..674c65a 100644 --- a/src/renderer/src/views/prepare/container/ai-pptistV2.vue +++ b/src/renderer/src/views/prepare/container/ai-pptistV2.vue @@ -57,11 +57,11 @@
上一步 - 生成PPT + 生成PPT
- + @@ -79,6 +79,7 @@ import { import CryptoJS from "crypto-js" import { getSignature } from "@/utils/index.js"; +import {sessionStore} from "@/utils/store"; let appId = "01ec9aa3"; let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy"; @@ -98,8 +99,8 @@ let secondArray = ref([]); //大纲的文字部分 const backGroundList = ref([]); - -const inputTheme = ref("高中语文《沁园春雪》的授课课件"); // 输入的主题 +let subjectdata = sessionStore.get('subject.curNode') +const inputTheme = ref(subjectdata.edustage + subjectdata.edusubject + "《" + subjectdata.itemtitle + "》的授课课件"); // 输入的主题 const inputRequire = ref("") // 输入的需求 const activeStep = ref(0); // 上方进度条 const combined = ref('') // 修改完毕的大纲数据，准备传入ppt生成模型 @@ -109,6 +110,8 @@ const status = ref("init"); const percentage = ref(0); +const createPPTLoading = ref(false); + const getBackgrounds = () => { treeData.value = []; getBackGroundV2().then((res) => { @@ -126,6 +129,8 @@ const outlineData = ref({ // templateId: 'auto', // ppt生成主题 author: 'AIX平台', isFigure: false, // 是否自动配图 + search: true, + language: "cn" } ) @@ -145,20 +150,17 @@ function updateStagingData(role, newData) { const outlineCreatePPT = () => { const newOutlineData = { ...outlineData.value, }; newOutlineData.query = outputText.value; - + createPPTLoading.value = true; createPPTV2(newOutlineData).then((res) => { console.log(res, "正在生成中"); + createPPTLoading.value = false; activeStep.value = 2 const checkProgress = () => { - getProgressV2(res.sid).then((response) => { - percentage.value = response.process; - if (response && response.pptUrl && response.pptUrl.length > 4) { - console.log('PPT',response) - // window.location.href = response.data.pptUrl; - //发消息到主进程，携带名称和URL，将URL下载下来后复制到文件列表并上传到服务 - // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFiledf28bf990a4c40ffb7477ed4b65392c27232357022409613439/%E3%80%8A%E9%9D%99%E5%A5%B3%E3%80%8B%E6%B7%B1%E5%BA%A6%E8%A7%A3%E8%AF%BB%E4%B8%8E%E7%A0%94%E7%A9%B6.pptx" - emit('addSuccess',res) + getProgressV2(res.sid).then(response => { + percentage.value = Math.round(response?.donePages/response?.totalPages)*100; + if (response.pptStatus === "done") { + emit('addSuccess',{...res,url:response.pptUrl}) ElMessage.success("生成成功"); } else { const sleepTime = 2000; diff --git a/src/renderer/src/views/prepare/container/pptist-dialog.vue b/src/renderer/src/views/prepare/container/pptist-dialog.vue index 84bf25f..22b2155 100644 --- a/src/renderer/src/views/prepare/container/pptist-dialog.vue +++ b/src/renderer/src/views/prepare/container/pptist-dialog.vue @@ -13,7 +13,7 @@