zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge pull request 'zhuhao_dev' (#331) from zhuhao_dev into main 

Reviewed-on: #331
This commit is contained in:
朱浩 2024-10-18 16:34:01 +08:00
parent 83c377fd9e 6de43cbab3
commit e02f67e3e5
6 changed files with 67 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "2.1.9",
"version": "2.1.12",
"description": "",
"main": "./out/main/index.js",
"author": "example.com",

7
src/main/file.js
View File

@ -246,8 +246,10 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
/*创建新的ppt文件*/
ipcMain.on('creat-ai-file-default', (e, { name, url, uploadData, cookie }) => {
createFolder('tempFile').then(async () => {
let lastname = decodeURIComponent(url);
name = lastname.substring(lastname.lastIndexOf("/")+1)
let path = appTempFilePath + name.replace(/[\\/:*?"<>|]/, '')
let {type,item} = await downloadFile(url,name)
let {type,item} = await downloadFiles(url,name)
if (type==="成功") {
let fileType = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
let formData = new FormData()
@ -279,7 +281,8 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
function downloadFile(url,fileName) {
function downloadFiles(url,fileName) {
console.log(url,fileName)
return new Promise((resolve, reject)=>{
const browserWindow = BrowserWindow.getFocusedWindow()
const id = manager.download({

42
src/renderer/src/utils/ppt-request.js
View File

@ -1,27 +1,49 @@
import axios from "axios";
import { getSignature } from "./index";
import { ElMessage } from "element-plus";
import request from '@/utils/request'
let appId = "01ec9aa3";
let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy";
let timestamp = Math.floor(Date.now() / 1000);
let signature = getSignature(appId, secret, timestamp);
let req = (url, type, data)=>{
let config = {
headers: {
"Content-Type": "application/json",
appId: appId,
timestamp: timestamp,
signature: signature,
},
url: url,
method: type,
}
if (type === "GET") {
config.params = data;
} else {
config.data = data;
}
return request(config)
}
const instance = axios.create({
baseURL: "",
/*const instance = axios.create({
// baseURL: import.meta.env.VITE_APP_ENV === "development"?"/parth":import.meta.env.VITE_APP_BASE_API,
baseURL: "/dev-api",
headers: {
"Content-Type": "application/json",
'Authorization': 'Bearer ' + getToken(),
appId: appId,
timestamp: timestamp,
signature: signature,
},
});
});*/
const createOutline = async (data) => {
console.log("createOutline data:", data);
try {
const response = await instance.post(
"/parth/api/aippt/createOutline",
const response = await req(
"/api/aippt/createOutline",
"POST",
data
);
console.log("createOutline response:", response);
@ -36,7 +58,7 @@ const createOutline = async (data) => {
};
const getBackGround = async () => {
try {
const response = await instance.get("/parth/api/aippt/themeList");
const response = await req("/api/aippt/themeList", "GET");
return response.data;
} catch (error) {
console.error("请求失败:", error);
@ -45,7 +67,7 @@ const getBackGround = async () => {
};
const createPPT = async (data) => {
try {
const response = await instance.post("/parth/api/aippt/create", data);
const response = await req("/api/aippt/create", "POST", data);
console.log("createOutline response:", response);
return response.data;
@ -56,7 +78,7 @@ const createPPT = async (data) => {
};
const createByOutline = async (data) => {
try {
const response = await instance.post("/parth/api/aippt/createByOutline", data);
const response = await req("/api/aippt/createByOutline","POST", data);
console.log("createByOutline response:", response);
return response.data;
@ -67,7 +89,7 @@ const createByOutline = async (data) => {
};
const getProgress = async (id) => {
try {
const response = await instance.get(`/parth/api/aippt/progress?sid=${id}`);
const response = await req(`/api/aippt/progress?sid=${id}`, "GET");
return response.data;
} catch (error) {
console.error("请求失败:", error);
@ -75,4 +97,4 @@ const getProgress = async (id) => {
}
};
export { instance, createOutline, getBackGround, createPPT, getProgress, createByOutline };
export { createOutline, getBackGround, createPPT, getProgress, createByOutline };

10
src/renderer/src/views/prepare/container/ai-ppt.vue
View File

@ -178,7 +178,7 @@ const getBackground = () => {
treeData.value = [];
getBackGround().then((res) => {
console.log(res);
backGroundList.value = res.data;
backGroundList.value = res;
});
};
@ -222,14 +222,14 @@ const outlineCreatePPT = () => {
activeStep.value = 4
const checkProgress = () => {
getProgress(res.data.sid).then((response) => {
percentage.value = response.data.process;
if (response.data && response.data.pptUrl && response.data.pptUrl.length > 4) {
getProgress(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"
creatAIPPT(props.currentNode.itemtitle + '.pptx',response.data.pptUrl, props.uploadData).then((res) => {
creatAIPPT(props.currentNode.itemtitle + '.pptx',response.pptUrl, props.uploadData).then((res) => {
emit('addSuccess',res)
})
ElMessage.success("生成成功");

21
src/renderer/src/views/teach/standardAnalysis/index.vue
View File

@ -7,7 +7,7 @@
<el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
</div>
<div class="stand-head-right">
<div class="stand-head-right-tit">{{bookInfo ? bookInfo.bookName : ''}}</div>
<div class="stand-head-right-tit">{{bookInfo ? bookInfo.itemtitle : ''}}</div>
<i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
<div class="stand-head-right-row">
<div class="stand-head-right-row-time">更新2024.9.10</div>
@ -72,7 +72,7 @@
<div class="booklist">
<div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
<el-image class="bookimg" :src="item.avartar" />
<div class="bookname">{{item.bookName}}</div>
<div class="bookname">{{item.itemtitle}}</div>
</div>
</div>
</el-dialog>
@ -173,7 +173,7 @@ const selectHandel = (value) => {
}
//保存json文件
const saveJSON = (data) => {
let filename = ''
// const data = {
// name: 'txt',
@ -247,11 +247,12 @@ const getAllSubject = async () => {
rows && rows.map(item => {
if(edustage === item.edustage && item.edusubject === edusubject){
bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)}
}
if(item.fileurl !== ''){
bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: bookNameFormat(item.edustage,item.edusubject)})
if(item.fileurl !== ''){
bookList.value.push(bookInfo.value)
}
}
})
console.log(bookList)
const textselidx = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
booksel.value = textselidx
const filePath = import.meta.env.VITE_APP_RES_FILE_PATH + bookList.value[textselidx].fileurl.replace('.txt','.pdf')
@ -282,7 +283,7 @@ onMounted(async () => {
const searchh = searchref.value.offsetHeight;
listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
}
window.addEventListener('resize', () => {
if(cardref.value && headref.value){
const cardH = cardref.value.offsetHeight;
@ -333,9 +334,9 @@ onMounted(async () => {
console.log('转换后整体文字------',StartStr + midStr + EndStr);
}
})
// const isDev = process.env.NODE_ENV == 'development'
// if (isDev)
// if (isDev)
// pdfUrl.value = '/'+getStaticUrl('aaa.pdf', 'user', 'selfFile', true)
// else
// pdfUrl.value = getStaticUrl(route.query.path, 'user', 'selfFile', true)
@ -552,4 +553,4 @@ onMounted(async () => {
color: #ffffff;
}
}
</style>
</style>

22
src/renderer/src/views/textbookAnalysis/index.vue
View File

@ -7,7 +7,7 @@
<el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
</div>
<div class="stand-head-right">
<div class="stand-head-right-tit">{{bookInfo ? bookInfo.bookName: ''}}</div>
<div class="stand-head-right-tit">{{bookInfo ? bookInfo.itemtitle: ''}}</div>
<i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
<div class="stand-head-right-row">
<div class="stand-head-right-row-time">更新2024.9.10</div>
@ -72,7 +72,7 @@
<div class="booklist">
<div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item,idx)">
<el-image class="bookimg" :src="item.avartar" />
<div class="bookname">{{item.bookName}}</div>
<div class="bookname">{{item.itemtitle}}</div>
</div>
</div>
</el-dialog>
@ -175,7 +175,7 @@ const selectHandel = (value) => {
}
//保存json文件
const saveJSON = (data) => {
let filename = ''
// const data = {
// name: 'txt',
@ -249,7 +249,11 @@ const getAllSubject = async () => {
const dataList = [];
rows && rows.map((item,idx) => {
if(item.fileurl !== ''){
dataList.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: item.fileurl.replace('.txt','')})
let infos = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar,bookName: item.fileurl.replace('.txt','')}
if(infos.itemgroup==="校本课程") {
infos.avartar = item.avartar
}
dataList.push(infos)
}
})
bookList.value = dataList
@ -265,7 +269,7 @@ const getAllSubject = async () => {
bookInfo.value = {...dataList[0]}
filePath += dataList[0].fileurl.replace('.txt','.pdf')
}
await loadPdfAnimation(filePath)
await loadPdfAnimation(filePath)
}else{
bookInfo.value = {...dataList[0]}
filePath += dataList[0].fileurl.replace('.txt','.pdf')
@ -295,7 +299,7 @@ onMounted(async () => {
const searchh = searchref.value.offsetHeight;
listHeight.value = Math.floor(cardH) - Math.floor(headh) - Math.floor(searchh) - 60;
}
window.addEventListener('resize', () => {
if(cardref.value && headref.value){
const cardH = cardref.value.offsetHeight;
@ -346,9 +350,9 @@ onMounted(async () => {
console.log('转换后整体文字------',StartStr + midStr + EndStr);
}
})
// const isDev = process.env.NODE_ENV == 'development'
// if (isDev)
// if (isDev)
// pdfUrl.value = '/'+getStaticUrl('aaa.pdf', 'user', 'selfFile', true)
// else
// pdfUrl.value = getStaticUrl(route.query.path, 'user', 'selfFile', true)
@ -570,4 +574,4 @@ onMounted(async () => {
color: #ffffff;
}
}
</style>
</style>