Merge branch 'main' into zouyf_dev
This commit is contained in:
commit
7bcf4b718b
|
@ -1,10 +1,10 @@
|
||||||
appId: com.electron.app.yc
|
appId: com.electron.app.yc
|
||||||
productName: 文枢课堂
|
productName: 永川中小学AI教学系统
|
||||||
directories:
|
directories:
|
||||||
output: dist
|
output: dist
|
||||||
buildResources: build
|
buildResources: build
|
||||||
win:
|
win:
|
||||||
executableName: 文枢课堂
|
executableName: 永川中小学AI教学系统
|
||||||
icon: resources/yc-logo.png
|
icon: resources/yc-logo.png
|
||||||
files:
|
files:
|
||||||
- '!**/.vscode/*'
|
- '!**/.vscode/*'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "aix-win-ws",
|
"name": "aix-win-ws",
|
||||||
"version": "2.5.11",
|
"version": "2.5.14",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "./out/main/index.js",
|
"main": "./out/main/index.js",
|
||||||
"author": "上海交大重庆人工智能研究院",
|
"author": "上海交大重庆人工智能研究院",
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
<!-- 边框样式 -->
|
<!-- 边框样式 -->
|
||||||
<div class="blockBox">
|
<div class="blockBox">
|
||||||
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
|
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
|
||||||
<el-button><el-image src="../../../src/assets/images/borderstyle.png"
|
<el-button><el-image :src="borderStyleImg"
|
||||||
style="width: 14px; height: 14px"></el-image></el-button>
|
style="width: 14px; height: 14px"></el-image></el-button>
|
||||||
<template #dropdown>
|
<template #dropdown>
|
||||||
<el-dropdown-menu>
|
<el-dropdown-menu>
|
||||||
|
@ -303,6 +303,7 @@ import {
|
||||||
import Contextmenu from './components/Contextmenu.vue'
|
import Contextmenu from './components/Contextmenu.vue'
|
||||||
import { fontFamilyList, fontSizeList } from './constants'
|
import { fontFamilyList, fontSizeList } from './constants'
|
||||||
|
|
||||||
|
const borderStyleImg = new URL('../../../src/assets/images/borderstyle.png', import.meta.url).href
|
||||||
const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
|
const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
|
||||||
const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
|
const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
|
||||||
const { proxy } = getCurrentInstance()
|
const { proxy } = getCurrentInstance()
|
||||||
|
|
|
@ -106,6 +106,18 @@ const getBackGroundV2 = async () => {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const createOutlineV2 = async (data) => {
|
||||||
|
try {
|
||||||
|
const response = await req("/api/aipptV2/createOutlineV2", "POST", data);
|
||||||
|
console.log("createOutline response:", response);
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("请求失败:", error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
const createPPTV2 = async (data) => {
|
const createPPTV2 = async (data) => {
|
||||||
try {
|
try {
|
||||||
const response = await req("/api/aipptV2/createV2", "POST", data);
|
const response = await req("/api/aipptV2/createV2", "POST", data);
|
||||||
|
@ -127,4 +139,4 @@ const getProgressV2 = async (id) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createPPTV2, getProgressV2, createByOutline };
|
export { createOutline, getBackGround, createPPT, getProgress, getBackGroundV2, createOutlineV2, createPPTV2, getProgressV2, createByOutline };
|
||||||
|
|
|
@ -74,6 +74,7 @@ emitter.on('onShow', (data)=>{
|
||||||
const getDetails = (id) =>{
|
const getDetails = (id) =>{
|
||||||
syllabuss(id).then( res =>{
|
syllabuss(id).then( res =>{
|
||||||
Object.assign(curItem, res.data)
|
Object.assign(curItem, res.data)
|
||||||
|
emitter.emit('onResult', res.data)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue