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

zouyf_dev #341

Merged
zouyf merged 4 commits from zouyf_dev into main 2024-10-19 17:20:44 +08:00
Conversation 0 Commits 4 Files Changed 5 +115 -64
17 changed files with 115 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a2d3f54b7 - Show all commits

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({

7
src/renderer/src/plugins/imChat/index.js
View File

@ -285,8 +285,11 @@ export class ImChat {
// callback: (data) => {}
}
// console.log('发送消息', option)
this.setConsole('%cim-chat: 发送消息', option)
return this.timChat.TIMMsgSendMessageV2(option)
this.setConsole('%cim-chat: 发送消息【req】', conv_id, msg)
return this.timChat.TIMMsgSendMessageV2(option).then(res => {
this.setConsole('%cim-chat: 发送消息【res】', JSON.stringify(res))
return res
})
}
/**
* @description 发送群消息

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/classTask/classTask.vue
View File

@ -58,17 +58,17 @@
<script setup>
import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
import { listByDeadDate, listClassworkdata, listClassworkdataNew } from '@/api/classTask'
import { listByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
// import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool'
import { getCurrentTime, getTomorrow } from '@/utils/date'
import { getCurrentTime } from '@/utils/date'
import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask";
import {createWindow} from '@/utils/tool'
import {sessionStore} from '@/utils/store'
import {throttle,debounce } from '@/utils/comm'
import {debounce } from '@/utils/comm'
const toolState = useToolState();
@ -141,14 +141,12 @@ const getClassWorkList = async () => {
{
// 班级作业数据，包含多个班级 homeworklist
const response = await listByDeadDate({
//classidarray: classTaskStore.classListIds.join(','),
edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 弃用
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC',
pageSize: 100,
})
@ -182,7 +180,7 @@ const getClassWorkList = async () => {
// 处理任务类型的UI
if (list[i].worktype == '学习目标定位') {
list[i].workclass = 'success'
list[i].workcodesList = JSON.parse(response.rows[i].workcodes)
list[i].workcodesList = JSON.parse(list[i].workcodes)
} else if (list[i].worktype == '教材研读') {
list[i].workclass = 'primary'
} else if (list[i].worktype == '框架梳理') {

15
src/renderer/src/views/classTask/classTaskAssign.vue
View File

@ -121,12 +121,12 @@
</el-table-column>
<el-table-column label="分值" align="center" width="180">
<template #default="scope">
<el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"></el-input-number >
<el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="currentWorkEdit.currentType == 'query'?true:false"></el-input-number >
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button>
<el-button :disabled="currentWorkEdit.currentType == 'query'?true:false" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -203,8 +203,7 @@
<div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
<div style="display: flex">
<el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
@click="submitStudy('submit')">确 定</el-button>
<el-button type="primary" style="margin-left: auto" @click="workEdit = false">确 定</el-button>
</div>
</div>
</el-dialog>
@ -779,7 +778,12 @@ const handleTaskAssignToAllClass = () => {
*/
const handleNewClassWorkDialog = () => {
// 打开作业设计页面
router.push({ path: '/newClassTask' });
router.push({
path: '/newClassTask',
query: {
isBack: true,
}
});
}
/**
@ -930,3 +934,4 @@ watch(() => courseObj.node, (newVal,oldVal) => {
}
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

2
src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue
View File

@ -74,7 +74,7 @@ function initChart() {
position: 'top',
formatter: params => {
const value = dataList.value[params.dataIndex].value;
const percentage = ((value / total) * 100).toFixed(); // 计算百分比并保留两位小数
const percentage = value ? ((value / total) * 100).toFixed() : 0; // 计算百分比并保留两位小数
return `${value}人 ${percentage}%`; // 显示为百分比形式
},
color: '#333',

19
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -266,6 +266,10 @@ const props = defineProps({
isedit: {
type: Boolean,
default: false
},
isback:{
type: Boolean,
default: false
}
})
@ -740,14 +744,16 @@ const handleClassWorkSave = async () => {
//这里分离了，所以不需要更新表单数据了
// this.getClassWorkAllList();
// TODO 后续看是否跳转到 作业布置页面
//TODO 下面3个后续看是啥
// this.newWorkSpace = false;
// this.newWorkSpaceEdit = false;
// this.workEdit = false;
})
}
if(props.isback){
// 其他页面进入的 返回上一页
router.back();
}else{
// 首页进入的，跳转到作业布置页面
router.push({ path: '/classTaskAssign' });
}
}
});
};
@ -980,3 +986,4 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

5
src/renderer/src/views/classTask/newClassTask.vue
View File

@ -16,6 +16,7 @@
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
<el-col :span="12" style="padding-left: 20px; text-align: left;">
<div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
<i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
<span>课程目录</span>
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
@ -35,7 +36,7 @@
</el-col>
</el-row>
<!-- 作业类型:内容 -->
<task-type-view :bookobj="courseObj" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/>
<task-type-view :bookobj="courseObj" :isback="isback" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/>
</div>
</div>
</template>
@ -53,6 +54,7 @@ const route = useRoute();
const router = useRouter()
const { proxy } = getCurrentInstance()
const isback = ref(route.query.isBack?true:false);
const classtaskObj = route.query.classtaskObj;//作业布置的内容对象
const bookTitle = ref(classtaskObj? JSON.parse(classtaskObj).bookName: '');// 课程名称
const isOpenLeftBook = ref(classtaskObj? JSON.parse(classtaskObj).id ? true : false: false ); // 是否打开左侧目录
@ -184,3 +186,4 @@ onMounted(() => {
}
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

2
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -51,7 +51,7 @@ const getHomework = async () => {
loading.value = true
const { edustage, edusubject } = user
try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 })
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
// 只展示进行中的
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算进行中 弃用

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("生成成功");

7
src/renderer/src/views/prepare/index.vue
View File

@ -689,7 +689,12 @@ export default {
// 前往作业设计页面
goNewClassTask(){
// router.push({ path: '/newClassTask' });
this.$router.push({ path: '/newClassTask' });
this.$router.push({
path: '/newClassTask',
query: {
isBack: true,
}
});
},
getWeekday1(date) {
const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']

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>

2
src/renderer/src/views/tool/components/homework.vue
View File

@ -128,7 +128,7 @@ const closeHomework = async() => {
const successHomework = (data)=>{
// console.log('推送成功', data)
// 发送im消息-推送作业(app|平板)
ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
// ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
}
// 章节目录change
const changeChapter = async (data)=>{

2
src/renderer/src/views/tool/components/imChat.vue
View File

@ -12,7 +12,7 @@ const props = defineProps({
})
const imChatObj = reactive({imChat:null})
onMounted(() => {
ipcMainHandle() // 绑定-监听ipcMain im相关消息
// ipcMainHandle() // 绑定-监听ipcMain im相关消息
})
// 初始化 im-chat
const initImChat = async (timGroupId) => {

4
src/renderer/src/views/tool/sphere.vue
View File

@ -105,7 +105,7 @@ const getClassInfo = async () => {
const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat
if (!timGroupId) timGroupId = chat?.timGroupId
if (!timGroupId) return ElMessage.error('房间创建-失败')
classManageApi.startClass(classObj.id, timGroupId) // 开始上课
if (data.status != '上课中') classManageApi.startClass(classObj.id, timGroupId) // 开始上课
}
// 切换tab-change
const tabChange = (val) => {
@ -158,7 +158,7 @@ const touchChange = (e) => {
const chatChange = (type, data, ...args) => {
if (type == 'createGroup') { // 创建群-监听
console.log('创建群:', data)
!!data && classManageApi.startClass(classObj.id, data)
// !!data && classManageApi.startClass(classObj.id, data)
} else if (type == 'msg') { // im-chat 消息监听
if (!data) return // 没有msg数据 message_msg_id
const msgId = (args||[])[0].message_msg_id