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

Reviewed-on: #125

src/renderer/src/AixPPTist/src/api/index.ts

@@ -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)

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

@@ -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>) => {

src/renderer/src/views/classTask/teachClassTask.vue

@@ -714,37 +714,39 @@ const closeDialog = () => {
 
 // im监听消息回调
 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() // 关闭窗口
-     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
   }
 }