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

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,8 +714,9 @@ const closeDialog = () => {
 
 // im监听消息回调
 const msgHandle = (msg) => {
-  const { type, data } = msg
+  if (typeof msg === 'object'){
-  switch(type) {
+    const { head, content, ...other } = msg
+    switch(head) {
       case MsgEnum.HEADS.MSG_closed: // 下课:
           window.close() // 关闭窗口
       break 
@@ -747,6 +748,7 @@ const msgHandle = (msg) => {
       //   break
     }
   }
+}
 
 const reloadTimer = ref(0); // 开启定时查询，作业id是否刷新了，刷新了就重新获取
 const cutid = ref(0); // 当前初始化的作业id