zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev

This commit is contained in:
zdg 2024-12-12 16:38:44 +08:00
parent 75b5884210 c5e71e6e7b
commit 80b66ffb28
2 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
View File

@ -208,6 +208,18 @@ const insertImageElement = (files: FileList) => {
// }) // })
} }
//获取当前的时间
const getTime=()=>{
const now = new Date();
const year = now.getFullYear();
const month = ('0' + (now.getMonth() + 1)).slice(-2);
const day = ('0' + now.getDate()).slice(-2);
const hours = ('0' + now.getHours()).slice(-2);
const minutes = ('0' + now.getMinutes()).slice(-2);
const seconds = ('0' + now.getSeconds()).slice(-2);
return `${year}-${month}-${day}_${hours}:${minutes}:${seconds}`;
};
/** /**
* base64转图片File * base64转图片File
* @param {String} base64 图片base64 * @param {String} base64 图片base64
@ -234,9 +246,10 @@ const base64ToFile = (base64: string, fileName = '试题图片') => {
// charCodeAt()：获取给定索引处字符对应的 UTF-16 代码单元 // charCodeAt()：获取给定索引处字符对应的 UTF-16 代码单元
u8arr[n] = bstr.charCodeAt(n) u8arr[n] = bstr.charCodeAt(n)
} }
const filename = fileName+getTime()
// 利用构造函数创建File文件对象 // 利用构造函数创建File文件对象
// new File(bits, name, options) // new File(bits, name, options)
const file = new File([u8arr], `${fileName}.${suffix}`, { const file = new File([u8arr], `${filename}.${suffix}`, {
type: type type: type
}) })
// 返回file // 返回file

62
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -714,37 +714,39 @@ const closeDialog = () => {
// im监听消息回调 // im监听消息回调
const msgHandle = (msg) => { const msgHandle = (msg) => {
const { type, data } = msg if (typeof msg === 'object'){
switch(type) { const { head, content, ...other } = msg
case MsgEnum.HEADS.MSG_closed: // 下课: switch(head) {
case MsgEnum.HEADS.MSG_closed: // 下课:
window.close() // 关闭窗口
break
case MsgEnum.HEADS.MSG_finishHomework: // 跟新作业:
const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
openDialog(data, false);
break
case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
window.close() // 关闭窗口 window.close() // 关闭窗口
break break
case MsgEnum.HEADS.MSG_finishHomework: // 跟新作业: // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
const data = JSON.parse(localStorage.getItem('teachClassWorkItem')); // {
openDialog(data, false); // (data||[]).forEach(o => {
break // const msgArr = o?.message_elem_array||[]
case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面 // msgArr.forEach(info => {
window.close() // 关闭窗口 // const msgType = info?.elem_type // 消息类型 TIMElemType
break // const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
// case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[] // // 处理学生端反馈得消息
// { // //console.log('msgData->', msgData);
// (data||[]).forEach(o => { // if (msgData.msgKey == "finishHomework"){
// const msgArr = o?.message_elem_array||[] // // 刷新
// msgArr.forEach(info => { // const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
// const msgType = info?.elem_type // 消息类型 TIMElemType // //console.log('data->', data);
// const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : '' // openDialog(data, false);
// // 处理学生端反馈得消息 // }
// //console.log('msgData->', msgData); // })
// if (msgData.msgKey == "finishHomework"){ // })
// // 刷新 // }
// const data = JSON.parse(localStorage.getItem('teachClassWorkItem')); // break
// //console.log('data->', data); }
// openDialog(data, false);
// }
// })
// })
// }
// break
} }
} }