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

baigl #126

Merged
baigl merged 2 commits from baigl into main 2024-12-12 16:45:30 +08:00
Conversation 0 Commits 2 Files Changed 2 +35 -36
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ea2a8ebfda - Show all commits

5
src/renderer/src/AixPPTist/src/api/index.ts
View File

@ -73,7 +73,6 @@ export class PPTApi {
// 活动列表处理
const workList = (res.rows || []).map(o => o.activityContent)
const workItem = [...res.rows]
// 加入活动后刷新ppt数据内容，不跟换为第一页
// slidesStore.updateSlideIndex(0) // 下标0 为第一页
slidesStore.setSlides(slides) // 写入数据
// 写入作业列表数据
@ -110,11 +109,9 @@ export class PPTApi {
const rid = await API_entpcoursefile.addEntpcoursefileReturnId(params)
if (!!rid) {
data.id = rid
params.id = rid
params.activityContent = null
slidesStore.addWorkItem(params)
slidesStore.updateSlide(data)
// msgUtils.msgSuccess('新增成功')
PPTApi.getSlideList(resource.id)
this.isUpdate = false // 新增后会触发监听，不再更新数据
resolve(true)
} else msgUtils.msgError('新增失败');resolve(false)

4
src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
View File

@ -305,10 +305,10 @@ const upDateData = async () => {
// await PPTApi.updateSlide(paramData.value)
loadingActive.value = true
await updateEntpcoursefileNew(paramData.value)
const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
await formatClassWorkFile(res.rows)
const resource = sessionStore.get('curr.resource')
await PPTApi.getSlideList(resource.id)
const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })
await formatClassWorkFile(res.rows)
}
// 判断是否做操作
const objectsAreEqual = (obj1: Record<string, any>, obj2: Record<string, any>) => {

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

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