Merge pull request 'edit 模板' (#112 ) from lyc-dev into main

Merge pull request '作业管理：作业名称为空保存判断' (#111 ) from baigl into main
Reviewed-on: #111
2024-12-11 15:07:56 +08:00 · 2024-12-11 14:55:07 +08:00 · 2024-12-11 14:51:07 +08:00 · 2024-12-11 13:51:14 +08:00 · 2024-12-11 13:50:50 +08:00 · 2024-12-11 13:50:25 +08:00
27 changed files with 976 additions and 527 deletions
--- a/.env.development
+++ b/.env.development
@ -17,8 +17,8 @@ VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'

 # websocket 地址
-# VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
-VITE_APP_WS_URL = 'ws://192.168.2.16:7865'
+VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
+# VITE_APP_WS_URL = 'ws://192.168.2.16:7865'

 # 是否显示开发工具
 VITE_SHOW_DEV_TOOLS = 'true'
--- a/src/renderer/src/AixPPTist/src/App.vue
+++ b/src/renderer/src/AixPPTist/src/App.vue
@ -12,6 +12,7 @@


 <script lang="ts" setup>
+import 'animate.css'
 import { ref, onMounted, watch, onBeforeMount } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useScreenStore, useMainStore, useSnapshotStore, useSlidesStore } from './store'
@ -28,7 +29,6 @@ import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关ap
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import './api/watcher' // 监听
-import './api/classcourse' // 课程相关

 const loading = ref(true)
 const _isPC = isPC()
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@ -2,21 +2,51 @@
 * @author zdg
 * @description 上课相关内容
 */
-import type { Classcourse } from './types'
+// import type { Classcourse } from './types'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
-import { ChatWs } from '@/plugins/socket' // 聊天socket
+import ChatWs from '@/plugins/socket' // 聊天socket
+import msgUtils from '@/plugins/modal' // 消息工具
+
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
-const classcourse: Classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+const classcourse = sessionStore.get('curr.classcourse') // 课堂信息

+export class Classcourse {
+  msgObj:ElMessageBox = null // 提示消息对象
+
+  constructor() {
+    this.load()
+  }
+  /**
+   * @description 加载
+   */
+  load() {
+    // 打开全屏
+    screenStore.setScreening(!!classcourse)
    // 如果课堂信息有值，则连接socket
    if (!!classcourse) {
      // 连接socket
-  const ws = new ChatWs()
-  console.log('ws- ',ws)
-  // ChatWs.connect(classcourse.id)
+      if (!ChatWs.ws) ChatWs.init()
+      ChatWs.id = classcourse.timgroupid // 群组id
+      console.log('ws- ', classcourse)
      classcourseStore.setClasscourse(classcourse)
+      // 待上课提示
+      if (!classcourse.status) {
+        this.msgObj = {
+          type: 'success',
+          title: '系统提示',
+          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          center: true,
+          showClose: false,
+          showCancelButton: false,
+          showConfirmButton: false,
+          beforeClose: () => {}
        }
-// 打开全屏
-screenStore.setScreening(!!classcourse)
+        msgUtils.ElMessageBox(this.msgObj)
+      }
+    }
+  }
+}
+
+export default new Classcourse()
--- a/src/renderer/src/AixPPTist/src/api/index.ts
+++ b/src/renderer/src/AixPPTist/src/api/index.ts
@ -3,22 +3,22 @@
 * @author zdg
 * @date 2024-11-26
 */
-import { toRaw } from 'vue'
+import { toRaw, nextTick } from 'vue'
 import type { Result } from './types' // 接口类型
 import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import * as API_smarttalk from '@/api/file' // 相关api
+import * as Api_server from '@/api/apiService' // 相关api
+import * as CreateHomework from '@/views/tool/createHomework' // 统计相关
 import * as useStore from '../store' // pptist-状态管理
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import useUserStore from '@/store/modules/user' // 外部-用户信息
-import * as Api_server from '@/api/apiService' // 相关api
-import * as commUtils from '@/utils/comm.js'
-const slidesStore = useStore.useSlidesStore()
-const userStore = useUserStore()
-
-import { getClassWorkList,getStudentClassWorkData } from '@/views/tool/createHomework'
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
+// import * as commUtils from '@/utils/comm.js'
 import { createWindow } from '@/utils/tool'
 import { useToolState } from '@/store/modules/tool'
+const slidesStore = useStore.useSlidesStore()
+const userStore = useUserStore()
 const toolStore = useToolState()
 /** 工具类 */
 export class Utils {
@ -147,6 +147,8 @@ export class PPTApi {
  // 更新幻灯片
  static updateSlide(data: object): Promise<Boolean> {
    return new Promise(async (resolve, reject) => {
+      const thumUrl = await this.getSlideThumUrl()
+      data.base64Code = thumUrl // 更新缩略图
      const res: Result = await API_entpcoursefile.updateEntpcoursefileNew(data)
      console.log(data,'data');
      console.log(res,'dresata');
@ -191,30 +193,40 @@ export class PPTApi {
      else msgUtils.msgError(res.msg || '更新失败');return false
    })
  }
+  // thumbnail-slide thumbnail
+  static getSlideThumUrl(): Promise<Boolean> {
+    return nextTick().then(async() => {
+      const slideIndex = slidesStore.slideIndex
+      const elements = document.querySelectorAll('.thumbnail-slide')
+      if (elements.length && slideIndex >= 0) {
+        const element = elements[slideIndex]
+        return await toPng(element)
+      }
+      return null
+    })
+  }

  // 图片|音频|视频 转换为在线地址
-  static  toRousrceUrl =async (o:any) => {
+  static  toRousrceUrl =async (file: File|any) => {
    const formData = new FormData()
-      formData.append('file', o)
+    formData.append('file', file)
    const res = await Api_server.Other.uploadFile(formData)
    if (res && res.code == 200){
      const url = res?.url
      url &&(o.src = url)
      return url
    }
-   
  }
 }

 export class Homework{
  // 作业弹窗
  static async showHomework(id: any) {
-    let result = await getClassWorkList(id)
-      result = await getStudentClassWorkData()
-      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
-      toolStore.isTaskWin=true; // 设置打开批改窗口
-    //   emit('closeActive')
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
+    let result = await CreateHomework.getClassWorkList(id)
+      result = await CreateHomework.getStudentClassWorkData()
+      localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
+      toolStore.isTaskWin=true; // 设置打开批改窗口
+      createWindow('open-taskwin',{url:'/teachClassTask'}); 
  }
 }
 export default PPTApi
--- a/src/renderer/src/AixPPTist/src/api/types.ts
+++ b/src/renderer/src/AixPPTist/src/api/types.ts
@ -19,6 +19,147 @@ export interface Classcourse {
  entpcoursefileid?: number|string, // 课程文件id
  classid?: number|string, // 班级id
  entpcourseid?: number|string, // 章节中间表id
+  timgroupid?: number|string, // ws 群组id
  plandate?: string, // 计划时间
  opendate?: string, // 开课时间
 }
+
+/**
+ * @description 消息枚举
+ * @author zdg
+ * @date 2021-07-05 14:07:01
+ */
+
+export class MsgEnum {
+  /**
+   * @description: 消息类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | SYSTEM | 系统消息 | system |
+   *  | TEACHER | 老师消息 | teacher |
+   *  | STUDENT | 学生消息 | student |
+   *  | NOTICE  | 通知消息 | notice  |
+   */
+  static TYPES = {
+    /** @desc: 系统消息 */
+    SYSTEM: 'system',
+    /** @desc: 老师消息 */
+    TEACHER: 'teacher',
+    /** @desc: 学生消息 */
+    STUDENT: 'student',
+    /** @desc: 通知消息 */
+    NOTICE: 'notice'
+  }
+    /**
+   * @description: 消息头-类型
+   * 
+   *  |  名称   | 含义   | 值（enum）    |
+   *  |  ----  | ----  | ----  |
+   *  | --- | 以下为旧定义-消息头 | --- |
+   *  | MSG_closed | 结束课程(下课) | closed |
+   *  | MSG_onlineStatus | 在线状态 | onlineStatus |
+   *  | MSG_pushQuizOfClassWorkdata2Public | 老师端：把选中的学生习题作业，推到大屏 | pushQuizOfClassWorkdata2Public |
+   *  | MSG_pushClassWorkdata2Public | 老师端：把选中的学生作业，推到大屏 | pushClassWorkdata2Public |
+   *  | MSG_shareStudentPresentdata2All | 把某个学生的展示成果数据推给全班所有学生 | shareStudentPresentdata2All |
+   *  | MSG_pushStudentPresentdata2Public | 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public |
+   *  | MSG_pushClassWorkPresentList2Public | 老师端：课堂展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public |
+   *  | MSG_activePageType | 课标研读-分页切换 | activePageType |
+   *  | MSG_slideFlapping | 幻灯片-切换 | slideFlapping |
+   *  | MSG_anmationclick | 幻灯片-动画切换 | anmationclick |
+   *  | MSG_classcourseopen | 群组创建成功 | classcourseopen |
+   *  | MSG_classquizfeedback | 学生的测练结果反馈 | classquizfeedback |
+   *  | MSG_classtaskfeedback | 老师端：接收到学生反馈消息-课堂测练中的其他任务 | classtaskfeedback |
+   *  | MSG_studentfeedback | 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 | studentfeedback |
+   *  | MSG_studentfeedbackcancel | 老师端：学生反馈的消息取消，如取消学会了，取消困惑 | studentfeedbackcancel |
+   *  | MSG_classshowdata | 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata |
+   *  | MSG_classWorkOfPresentDataUpdate | 学生在公屏上展示并完善后，保存后，老师端要更新 | classWorkOfPresentDataUpdate |
+   *  | MSG_classlecturePagesrc | 课堂讲授活动，选择不同的内容 | classlecturePagesrc |
+   *  | --- | 以下为新定义-消息头 | --- |
+   *  | MSG_0001 | 点赞 | 0x0001 |
+   *  | MSG_0002 | xx | 0x0002 |
+   *  | MSG_0003 | xx | 0x0003 |
+   */
+  static HEADS = {
+    // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
+    /** @desc: 结束课程(下课) */
+    MSG_closed : 'closed',
+    /** @desc: 在线状态 */
+    MSG_onlineStatus : 'onlineStatus',
+    /** @desc: 老师端：把选中的学生习题作业，推到大屏 */
+    MSG_pushQuizOfClassWorkdata2Public : 'pushQuizOfClassWorkdata2Public',
+    /** @desc: 老师端：把选中的学生作业，推到大屏 */
+    MSG_pushClassWorkdata2Public : 'pushClassWorkdata2Public',
+    /** @desc: 把某个学生的展示成果数据推给全班所有学生 */
+    MSG_shareStudentPresentdata2All : 'shareStudentPresentdata2All',
+    /** @desc: 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 */
+    MSG_pushStudentPresentdata2Public : 'pushStudentPresentdata2Public',
+    /** @desc: 老师端：课堂展示活动，任务列表，推到大屏 */
+    MSG_pushClassWorkPresentList2Public : 'pushClassWorkPresentList2Public',
+    /** @desc: 课标研读-分页切换 */
+    MSG_activePageType : 'activePageType',
+    /** @desc: 幻灯片-切换 */
+    MSG_slideFlapping : 'slideFlapping',
+    /** @desc: 幻灯片-动画切换 */
+    MSG_anmationclick : 'anmationclick',
+    /** @desc: 群组创建成功 */
+    MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生的测练结果反馈 */
+    MSG_classquizfeedback : 'classquizfeedback',
+    /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
+    MSG_classtaskfeedback : 'classtaskfeedback',
+    /** @desc: 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 */
+    MSG_studentfeedback : 'studentfeedback',
+    /** @desc: 老师端：学生反馈的消息取消，如取消学会了，取消困惑 */
+    MSG_studentfeedbackcancel : 'studentfeedbackcancel',
+    /** @desc: 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 */
+    MSG_classshowdata : 'classshowdata',
+    /** @desc: 学生在公屏上展示并完善后，保存后，老师端要更新 */
+    MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
+    /** @desc: 课堂讲授活动，选择不同的内容 */
+    MSG_classlecturePagesrc : 'classlecturePagesrc',
+    // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
+    /** @desc: 点赞 */
+    MSG_0001: 0x0001,
+    /** @desc: 疑惑 */
+    MSG_0002: 0x0002,
+    MSG_0003: 0x0003,
+    MSG_0004: 0x0004,
+    MSG_0005: 0x0005,
+    MSG_0006: 0x0006,
+    MSG_0007: 0x0007,
+    MSG_0008: 0x0008,
+    MSG_0009: 0x0009,
+    MSG_0010: 0x000a,
+    MSG_0011: 0x000b,
+    MSG_0012: 0x000c,
+    MSG_0013: 0x000d,
+    MSG_0014: 0x000e,
+    MSG_0015: 0x000f,
+    /** @desc: 作业推送 */
+    MSG_0016: 0x0010,
+    MSG_0017: 0x0011,
+    MSG_0018: 0x0012,
+    MSG_0019: 0x0013,
+    MSG_0020: 0x0014,
+    MSG_0021: 0x0015,
+    MSG_0022: 0x0016,
+    MSG_0023: 0x0017,
+    MSG_0024: 0x0018,
+    MSG_0025: 0x0019,
+    MSG_0026: 0x001a,
+    MSG_0027: 0x001b,
+    MSG_0028: 0x001c,
+    MSG_0029: 0x001d,
+    MSG_0030: 0x001e,
+    MSG_0031: 0x001f,
+    MSG_0032: 0x0020,
+    MSG_0033: 0x0021,
+    MSG_0034: 0x0022,
+    MSG_0035: 0x0023,
+  }
+}
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@ -6,13 +6,17 @@ import { watch } from 'vue'
 import { PPTApi } from './index'
 import * as store from '../store'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import { MsgEnum } from './types' // 消息枚举
+import ChatWs from '@/plugins/socket' // 聊天socket
+import Classcourse from './classcourse' // 课程相关
+import msgUtils from '@/plugins/modal' // 消息工具
 const slidesStore = store.useSlidesStore()
+const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
 const resource = sessionStore.get('curr.resource') // apt 资源
 const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
 /**
 * @description 监听器
 */
-
 // 监听幻灯片内容变化
 watch(() => slidesStore.slides, (newVal, oldVal) => {
  PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@ -24,6 +28,20 @@ watch(() => slidesStore.title, (newVal, oldVal) => {
  updatePPT({title: newVal})
 })

+// 消息监听ws
+console.log('监听器已开启', ChatWs)
+if (ChatWs.ws) {
+  ChatWs.watch((msg, e) => {
+    try {
+      handleMessage(JSON.parse(msg))
+    } catch (error) {
+      console.error('socket 解析异常 ', error, e)
+      handleMessage(msg)
+    }
+  })
+}
+
+// 更新ppt内容
 const updatePPT = async (data) => {
  if (!resource) return
  data.id = resource.id
@ -37,3 +55,40 @@ const updatePPT = async (data) => {
    sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
  }
 }
+
+// ws消息处理
+const handleMessage = (msg) => {
+  if (typeof msg === 'object'){
+    const { head, content, ...other } = msg
+    switch (head) {
+      case MsgEnum.HEADS.MSG_open: // 开课
+        // 课堂信息不一致
+        if (Classcourse.id !== content.id) {
+          msgUtils.alertError('老师开课信息异常，请重新进入公屏！')
+          .then(() => { // 点击确定按钮，关闭窗口
+            window.close()
+          })
+        } else { // 正常更新数据
+          classcourseStore.classcourse.status = 'open'
+          // 更新课堂信息-关闭警告框
+          Classcourse?.msgObj?.onVanish()
+        }
+        break
+      case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
+        const slideIndex = content.current
+        slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+        break
+      case MsgEnum.HEADS.MSG_closed: // 下课:
+        window.close() // 关闭窗口
+        break
+      default:
+        break
+    }
+  }
+}
+// console.log('监听器已开启', Classcourse)
+// setTimeout(() => {
+//   console.log('关闭弹窗')
+//   // Classcourse.msgObj?.close()
+//   Classcourse?.msgObj?.onVanish()
+// }, 10 * 1000)
--- a/src/renderer/src/AixPPTist/src/hooks/useImport.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useImport.ts
@ -33,32 +33,6 @@ const { theme } = storeToRefs(useSlidesStore())

 const { addSlidesFromData } = useAddSlidesOrElements()
 const { isEmptySlide } = useSlideHandler()
-export default () => {
-
-  const exporting = ref(false)
-
-  // 导入pptist文件
-  const importSpecificFile = (files: FileList, cover = false) => {
-    const file = files[0]
-
-    const reader = new FileReader()
-    reader.addEventListener('load', () => {
-      try {
-        const slides = JSON.parse(decrypt(reader.result as string))
-        if (cover) {
-          slidesStore.updateSlideIndex(0)
-          slidesStore.setSlides(slides)
-        }
-        else if (isEmptySlide.value) slidesStore.setSlides(slides)
-        else addSlidesFromData(slides)
-      }
-      catch {
-        message.error('无法正确读取 / 解析该文件')
-      }
-    })
-    reader.readAsText(file)
-  }
-
 const parseLineElement = (el: Shape) => {
  let start: [number, number] = [0, 0]
  let end: [number, number] = [0, 0]
@ -101,6 +75,33 @@ export default () => {

  return data
 }
+export default () => {
+
+  const exporting = ref(false)
+
+  // 导入pptist文件
+  const importSpecificFile = (files: FileList, cover = false) => {
+    const file = files[0]
+
+    const reader = new FileReader()
+    reader.addEventListener('load', () => {
+      try {
+        const slides = JSON.parse(decrypt(reader.result as string))
+        if (cover) {
+          slidesStore.updateSlideIndex(0)
+          slidesStore.setSlides(slides)
+        }
+        else if (isEmptySlide.value) slidesStore.setSlides(slides)
+        else addSlidesFromData(slides)
+      }
+      catch {
+        message.error('无法正确读取 / 解析该文件')
+      }
+    })
+    reader.readAsText(file)
+  }
+
+ 

  // 导入PPTX文件
  const importPPTXFile = (files: FileList) => {
@ -493,6 +494,7 @@ export default () => {
    importPPTXFile,
    PPTXFileToJson,
    exporting,
+    parseLineElement
  }
 }

@ -664,6 +666,7 @@ export const PPTXFileToJson = (data: File|ArrayBuffer) => {
          }
          else if (el.type === 'shape') {
            if (el.shapType === 'line' || /Connector/.test(el.shapType)) {
+              // 从返回对象中解构出 xx 函数并调用
              const lineElement = parseLineElement(el)
              slide.elements.push(lineElement)
            }
--- a/src/renderer/src/AixPPTist/src/store/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/store/classcourse.ts
@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import type { Classcourse } from '../api/types'

 export interface ClasscourseState {
-  classcourse: Classcourse
+  classcourse: Classcourse | any, // 课堂信息
 }

 export const useClasscourseStore = defineStore('classcourse', {
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@ -30,7 +30,7 @@ let params = {
  levelSecondId: null,
  fileSource: '个人',
  fileRoot: '备课',
-  orderByColumn: 'uploadTime',
+  orderByColumn: 'createTime',
  isAsc: 'desc',
  pageSize: 500
 }
--- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementAnimationPanel.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementAnimationPanel.vue
@ -245,7 +245,6 @@ const runAnimation = (elId: string, effect: string, duration: number) => {
    const animationName = `${ANIMATION_CLASS_PREFIX}${effect}`
    document.documentElement.style.setProperty('--animate-duration', `${duration}ms`)
    elRef.classList.add(`${ANIMATION_CLASS_PREFIX}animated`, animationName)
-
    const handleAnimationEnd = () => {
      document.documentElement.style.removeProperty('--animate-duration')
      elRef.classList.remove(`${ANIMATION_CLASS_PREFIX}animated`, animationName)
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@ -34,7 +34,10 @@
      <IconLeftTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execPrev()" />
      <IconRightTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execNext()" />
    </div>
-
+    <!-- 点赞组件 -->
+    <div style="z-index: 999;position: absolute;top:10px">
+      <upvote-vue ref="upvoteRef" :test='true' type="2"></upvote-vue>
+    </div>
    <div 
      class="tools-right" :class="{ 'visible': rightToolsVisible }" 
      @mouseleave="rightToolsVisible = false"
@ -69,7 +72,7 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import SlideThumbnails from './SlideThumbnails.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
-
+import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 const props = defineProps<{
  changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
--- a/src/renderer/src/api/apiService.js
+++ b/src/renderer/src/api/apiService.js
@ -56,4 +56,5 @@ export class Other {
  static baseUrl = "/common/upload"
  //  测试
  static uploadFile = data => ApiService.publicHttp(this.baseUrl, data, 'post', null, 'file')
+  
 }
--- a/src/renderer/src/components/file-image/index.vue
+++ b/src/renderer/src/components/file-image/index.vue
@ -35,7 +35,7 @@ const getFileTypeIcon = () => {
    txt: 'icon-txt',
    rar: 'icon-rar',
    apt: 'icon-A',
-    aippt: 'icon-A',
+    aippt: 'icon-a-ziyuan91',
    aiyuyin: 'icon-yuyin', // 语音生成
    aivideo: 'icon-dianying', // 视频生成
    airobot: 'icon-jiqirenfushi', // 数字人生成
--- a/src/renderer/src/layout/components/Aside.vue
+++ b/src/renderer/src/layout/components/Aside.vue
@ -93,6 +93,12 @@ const headerMenus = [
    icon: 'icon-jiaoxueshijian',
    path: '/prepare'
  },
+  {
+    name: '教学活动',
+    id: 5,
+    icon: 'icon-zuoyepigai',
+    path: '/classTask'
+  },
  {
    name: '资源中心',
    id: 3,
--- a/src/renderer/src/plugins/imChat/msgEnum.js
+++ b/src/renderer/src/plugins/imChat/msgEnum.js
@ -56,6 +56,8 @@ export class MsgEnum {
   */
  static HEADS = {
    // === 旧定义-消息头(兼容以前) ===
+    /** @desc: 开课 */
+    MSG_open : 'open',
    /** @desc: 结束课程(下课) */
    MSG_closed : 'closed',
    /** @desc: 在线状态 */
@ -93,6 +95,8 @@ export class MsgEnum {
    /** @desc: 课堂讲授活动，选择不同的内容 */
    MSG_classlecturePagesrc : 'classlecturePagesrc',
    // === 新定义-消息头 ===
+    /** @desc: 课程创建-待开课 */
+    MSG_0000: 0x0000,
    /** @desc: 点赞 */
    MSG_0001: 0x0001,
    /** @desc: 疑惑 */
--- a/src/renderer/src/plugins/modal.js
+++ b/src/renderer/src/plugins/modal.js
@ -5,51 +5,51 @@ let loadingInstance;
 export default {
  // 消息提示
  msg(content) {
-    ElMessage.info(content)
+    return ElMessage.info(content)
  },
  // 错误消息
  msgError(content) {
-    ElMessage.error(content)
+    return ElMessage.error(content)
  },
  // 成功消息
  msgSuccess(content) {
-    ElMessage.success(content)
+    return ElMessage.success(content)
  },
  // 警告消息
  msgWarning(content) {
-    ElMessage.warning(content)
+    return ElMessage.warning(content)
  },
  // 弹出提示
-  alert(content) {
-    ElMessageBox.alert(content, "系统提示")
+  alert(content, option = {}) {
+    return ElMessageBox.alert(content, "系统提示", option)
  },
  // 错误提示
-  alertError(content) {
-    ElMessageBox.alert(content, "系统提示", { type: 'error' })
+  alertError(content, option = {}) {
+    return ElMessageBox.alert(content, "系统提示", { type: 'error', ...option })
  },
  // 成功提示
-  alertSuccess(content) {
-    ElMessageBox.alert(content, "系统提示", { type: 'success' })
+  alertSuccess(content, option = {}) {
+    return ElMessageBox.alert(content, "系统提示", { type: 'success', ...option })
  },
  // 警告提示
-  alertWarning(content) {
-    ElMessageBox.alert(content, "系统提示", { type: 'warning' })
+  alertWarning(content, option = {}) {
+    return ElMessageBox.alert(content, "系统提示", { type: 'warning', ...option })
  },
  // 通知提示
  notify(content) {
-    ElNotification.info(content)
+    return ElNotification.info(content)
  },
  // 错误通知
  notifyError(content) {
-    ElNotification.error(content);
+    return ElNotification.error(content);
  },
  // 成功通知
  notifySuccess(content) {
-    ElNotification.success(content)
+    return ElNotification.success(content)
  },
  // 警告通知
  notifyWarning(content) {
-    ElNotification.warning(content)
+    return ElNotification.warning(content)
  },
  // 确认窗体
  confirm(content) {
@ -78,5 +78,8 @@ export default {
  // 关闭遮罩层
  closeLoading() {
    loadingInstance.close();
-  }
+  },
+  // messageBox: opt => ElMessageBox(opt),
+  // 其他实例放出去，方便调用
+  ElMessage, ElMessageBox, ElNotification, ElLoading
 }
--- a/src/renderer/src/plugins/socket/index.js
+++ b/src/renderer/src/plugins/socket/index.js
@ -8,6 +8,7 @@ import useUserStore from '@/store/modules/user' // 用户信息
 export class ChatWs {
  instance = null; // 实例
  id = null; // 群聊id || 单聊id-用户id(userId)
+  url = null; // ws地址
  closed = false; // 关闭状态
  onmessage = null; // 自定义处理
  errCount = 5; // 重连次数 (ms) 暂时不使用
@ -19,12 +20,16 @@ export class ChatWs {
    beat: 'heart_beat', // 心跳
  }
  static base = 'wss://file.ysaix.com:7868'
-  constructor() {
+
+  // 构造函数 是否自动连接
+  constructor(bool = true) {
    if (!ChatWs.instance) {
+      if (bool) { // 是否自动连接
        const userStore = useUserStore() // 用户信息
        const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
-      const url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
-      this.init(url);
+        this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        // this.init(url);
+      }
      ChatWs.instance = this;
    }
    return ChatWs.instance;
@ -32,11 +37,11 @@ export class ChatWs {

  // 初始化
  init(url) {
-    this.url = url;
+    !!url && (this.url = url);
    this.ws = null;
    const _this = this
    this.heartCheck = {
-      timeout: 1000 * 10, // 60s
+      timeout: 1000 * 60, // 60s
      timeoutObj: null,
      serverTimeoutObj: null,
      reset() {
@ -78,10 +83,9 @@ export class ChatWs {
      // 拿到任何消息都说明当前连接是正常的
      const isBeat = e.data == 'pong'
      isBeat && self.heartCheck.reset().start();
-      const exts = ['sessionId', 'pong'] // 不处理的消息头
      const isEmpty = !e.data
-      const isExts = exts.some(item => e.data.includes(item))
-      if (isEmpty && isExts) return;
+      const isExts = e.data.includes('sessionId') || e.data == ('pong')
+      if (isEmpty || isExts) return;
      // 自定义处理
      self.onmessage && self.onmessage(e.data, e);
    };
@ -118,12 +122,12 @@ export class ChatWs {
    this.ws.send(msg)
  }
  // 发送消息-带消息头(key)
-  sendMsg(head, content, option = {}) {
-    if (!head) throw new Error("head is not null")
-    if (!content) throw new Error("content is not null")
+  sendMsg(head, content, option = {}, ...arg) {
+    if (!head && head!==0) throw new Error("head is not null")
+    if (!content && content!==0) throw new Error("content is not null")
    let msg = { head, content, ...option }
    // 发送消息
-    this.send(this.getMsgObj(msg))
+    this.send(this.getMsgObj(msg, ...arg))
  }
  // 发送心跳
  sendMsgBeat() {
@ -137,7 +141,7 @@ export class ChatWs {
   * @param {*} id 群聊id || 单聊id-用户id(userId)
   */
  getMsgObj(msg, chatType = 'group', id) {
-    if (typeof msg === "object") msg = JSON.stringify(msg)
+    // if (typeof msg === "object") msg = JSON.stringify(msg)
    const res = {msg, chatType}
    // if (!id) throw new Error(`${type=='group'?'群ID':'用户ID'} is not null`)
    if (chatType == 'group') res.groupId = id || this.id || ''
@ -160,5 +164,6 @@ export class ChatWs {
 }
 // 连接socket
 export const connect = () => new ChatWs()
+export const getInstance = () => new ChatWs(false)
 // 默认实例
 export default new ChatWs()
--- a/src/renderer/src/views/classManage/reserv-item-apt.vue
+++ b/src/renderer/src/views/classManage/reserv-item-apt.vue
@ -7,15 +7,20 @@
      <span>{{item.caption}}</span>
    </div>
    <div class="class-reserv-item-tool" style="width: 200px;max-width: 300px">
-      <el-tag v-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
-      <el-tag v-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
-      <el-button v-if="item.status === 'open'" :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
+      <el-tag v-if="item.status === ''" style="margin-right: 5px" type="warning">待开课</el-tag>
+      <el-tag v-else-if="item.status === 'closed'" style="margin-right: 5px" type="success">已结束</el-tag>
+      <el-tag v-else-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <template v-if="!item.status">
+        <el-button size="small" type="primary" :icon="ChatDotRound" @click="chatSend()">上课(APP)</el-button>
+      </template>
+      <template v-else-if="item.status === 'open'">
+        <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
        >继续上课</el-button
        >
        <!--<el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
-      <el-button v-if="item.status === 'open'" :loading="loading" size="small" type="info" @click="endClassR(item)"
-      >下课{{ loading?'中...':'' }}</el-button
-      >
+        <el-button :loading="loading" size="small" type="info" @click="endClassR(item)"
+        >下课{{ loading?'中...':'' }}</el-button>
+      </template>
    </div>
    <div class="class-reserv-item-tool" style="width: 50px;">
 <!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
@ -25,10 +30,12 @@
  </div>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
 import { useToolState } from '@/store/modules/tool'
 import { deleteSmartReserv } from '@/api/classManage'
 import { ElMessage } from 'element-plus'
+import { ChatDotRound } from '@element-plus/icons-vue'
+
 const emit = defineEmits(['openEdit', 'deleteReserv', 'change'])
 const props = defineProps({
  item: {
@ -39,6 +46,7 @@ const props = defineProps({
 const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
 const toolStore = useToolState() // 获取状态管理-tool
 const loading = ref(false)  // 下课中的loading
+const msg = reactive({ id: null, time: null }) // 发送消息的对象
 const openEdit = () => {
  emit('openEdit', props.item)
 }
@ -61,6 +69,18 @@ const startClassR = (item) => {
 const endClassR = (item) => {
  emit('change', 'close', item, { type: 2, loading })
 }
+// 发送上课消息
+const chatSend = () => {
+  const time = Date.now()
+  if(msg.id) { // 同一个人30秒内不能重复发送
+    const isEq = msg.id == props.item.id && (time - msg.time) < 30 * 1000
+    if(isEq) return ElMessage.warning('请勿重复发送(30秒内)!')
+  } else { // 记录发送信息
+    msg.id = props.item.id
+    msg.time = time
+  }
+  emit('change', 'wsApp', props.item)
+}

 </script>
 <style scoped lang="scss">
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@ -703,6 +703,7 @@ const handleClassWorkSave = async () => {
        entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
      };

+      if(cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!'});

      // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
      if(classWorkForm.id != '' ) {// 编辑状态 有id
@ -741,6 +742,7 @@ const handleClassWorkSave = async () => {
        }
      }
      else if(classWorkForm.worktype === "常规作业"){
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
        fileLoading.value = true
        cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
        cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
@ -832,7 +834,12 @@ const editWork = async (cform) =>{
    }
  }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
    // 不做校验
-
+    // 不做校验
+    if(classWorkForm.worktype == '课堂展示'){
+      // 
+    }else{
+      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+    }
  }else {
    if (classWorkForm.chooseWorkLists.length == 0) {
      // 框架梳理
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@ -489,6 +489,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
        entpcourseworklist: '', // 选择的 习题训练 list  需要转字符串
      };

+      if(cform.uniquekey.trim() == '') return ElMessage({ type: 'warning', message: '作业名称不能为空!'});

      // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
      if(isShow.value === false){
@ -530,6 +531,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
        }
      }
      else if(classWorkForm.worktype === "常规作业"){
+        if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
        fileLoading.value = true
        cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
        cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
@ -634,7 +636,11 @@ const editWork = async (cform) =>{
    }
  }else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
    // 不做校验
-
+    if(classWorkForm.worktype == '课堂展示'){
+      // 
+    }else{
+      if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
+    }
  }else {
    if (classWorkForm.chooseWorkLists.length == 0) {
      // 框架梳理
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@ -1,246 +1,180 @@
 <template>
-  <div class="page-resource flex mb-4">
-    <!-- 左侧 教材 目录 -->
-    <!-- <ChooseTextbook @change-book="getData" @node-click="getData" /> -->
-
-    <div class="page-right">
-      <div class="button-container">
-        <el-button type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
-        <!-- <el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button> -->
-        <el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理</el-button>
-        <el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
-        <el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
-<!--        <el-button type="success" @click="openPPTist">打开PPTist</el-button>-->
-        <el-button type="info" @click="onchange('/model/examination')">考试分析</el-button>
-        <el-button type="primary" v-menus="dt.menus">测试</el-button>
-        <el-button type="success" @click="onchange('/model/aiKolors')">文生图片</el-button>
-      </div>
-    </div>
-  </div>
-  <el-row class="container">
+  <el-row class="model-wrap">
    <!-- 左侧 选择教材 目录 -->
    <ChooseTextbook @change-book="changeBook" @node-click="changeBook" />
-    <!-- 中间 展示内容 -->
-    <el-col :span="10">
-      <div class="c-item mb-4 mx-4">
-        <div class="flex justify-between pb-2">
-          <h3>教师资源</h3>
-          <span class="c-btns">
-            <template v-for="item in resourBtns">
-              <el-button :size="item.size" text :icon="item.icon" @click="handleAll(item.prop)">{{ item.name }}</el-button>
-            </template>
-          </span>
+    <!-- 右侧 展示内容 -->
+    <div class="right-content">
+      <div class="content-header-wrap">
+        <div v-for="(item,index) in tags" :key="index" :style="{'background-color':item.bgcolor}" @click="onchange(item)">
+          <el-icon class="item-icon"><Flag /></el-icon>
+          <div class="content-header-title">{{item.name}}</div>
+          <div class="content-header-body">
+            <div class="content-header-num">6</div>
+            <div class="content-header-text">分析结果</div>
+          </div>
+        </div>
+      </div>
+      <div class="content-body-wrap">
+        <div class="content-body-left">
+          <div class="content-body-left-title">
+            文枢课件
+            <el-button class="add-btn" size="small" type="primary" @click="createAIPPT">新建</el-button>
+          </div>
+          <div class="content-body-left-body">
+            <kj-list-item
+              v-for="(item, index) in currentFileList"
+              :key="index"
+              :ref="collectRef('kjItemRef'+item.id)"
+              :item="item"
+              :show-tool="false"
+              :index="index"
+              :curNode="currentNode"
+              @on-delete="deleteTalk"
+              @change="changeClass"
+            >
+            </kj-list-item>
+<!--            <div class="content-body-left-item" v-for="item in 5">
+              <div class="content-body-left-item-img">
+                <FileImage :size="50" :file-name="'aaa.aippt'" />
+              </div>
+              <div class="content-body-left-item-text">
+                <div class="content-body-left-item-title">沁园春*长沙</div>
+                <div class="content-body-left-item-info">21页  访问 100 引用 50  点赞 20  更新时间 2022-01-01 15:20</div>
+              </div>
+              <div></div>
+            </div>-->
+          </div>
+        </div>
+        <div class="content-body-right">
+          <div class="content-body-right-title">模型辅助工具</div>
+          <div class="content-body-right-body">
+            <div class="content-body-right-item" v-for="(item,index) in tools" :key="index" @click="gotoRoute(item)">
+              <div class="content-body-right-item-img">
+                <FileImage :fileName="item.img"/>
+              </div>
+              <div class="content-body-right-item-text">{{item.name}}</div>
+            </div>
+          </div>
+        </div>
      </div>
-        <c-table ref="resourRef" v-bind="sourceOpt" t-class="rounded">
-          <template #title="{row,value}">
-            <el-link :underline="false" @click="handleAll('open', row)">
-              <svg class="icon svg-icon" aria-hidden="true">
-                <use :xlink:href="`#icon-${getIcon(row)}`"></use>
-              </svg>
-              <b class="ml-1">{{ value }}</b>
-            </el-link>
-          </template>
-        </c-table>
    </div>
-    </el-col>
  </el-row>
 </template>

 <script setup>
-import { onMounted, ref, watch, reactive } from 'vue'
+import { onMounted, reactive, ref, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
-import { Plus, Refresh, Upload, Files, UploadFilled } from '@element-plus/icons-vue'
 import useUserStore from '@/store/modules/user' // 用户信息
-import msgUtils from '@/plugins/modal' // 消息工具
-import { createWindow } from '@/utils/tool' // 相关工具
-import * as API_smarttalk from '@/api/file' // 文件相关api
-import * as API_entpcourse from '@/api/education/entpcourse' // 相关api
-import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
-import { dataSetJson } from '@/utils/comm' // 数据集id文生图
-import { sessionStore } from '@/utils/store' // 学科名字文生图
 // 组件引入
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
-import { menusEvent } from '@/plugins/vue3-menus' // 右键菜单
+import KjListItem from '@/views/prepare/container/kj-list-item.vue'
+import FileImage from '@/components/file-image/index.vue'
+import {creatAPT, getSmarttalkPage} from '@/api/file'
+import {Flag, Position} from '@element-plus/icons-vue'
+import {asyncLocalFile, parseCataByNode} from "@/utils/talkFile";
+import { dataSetJson } from '@/utils/comm' // 数据集id文生图
+import { sessionStore } from '@/utils/store'
+import {listEntpcourse} from "@/api/teaching/classwork";
+import {addEntpcoursefileReturnId, getEntpcoursefile} from "@/api/education/entpcoursefile";
+import {createWindow, ipcMsgSend} from "@/utils/tool";
+import {ElMessage} from "element-plus"; // 学科名字文生图
 const router = useRouter()
-const userStore = useUserStore() // 用户信息
+const userStore = useUserStore().user // 用户信息
+const currentNode = ref({})
+const refs = ref([]);

-const courseObj = reactive({
-  // 课程相关参数: 教材id,单元id,章节id,课程名称
-  textbookId: '',
-  levelFirstId: '',
-  levelSecondId: '',
-  coursetitle: '',
-  node: null, // 选择的课程节点
-  entp: null, // 当前课程
-})
-const dt = reactive({
-  curRow: null, // 当前行数据
-  menus: [ // 右键菜单
-    { label: '打开', click: (_, args) => handleAll('open', args) },
-    { label: '删除', click: (_, args) => handleAll('delete', args) },
-  ],
-})
-// ref定义
-const resourRef = ref() // 资源ref
-// 资源按钮配置
-const resourBtns = [
-  {  name: '刷新', prop: 'refresh', size: 'small', icon: Refresh },
-  {  name: '资源库', prop:'resource', size:'small', icon: Files },
-  {  name: '上传', prop:'upload', size:'small', icon: UploadFilled },
-  {  name: '添加', prop:'add', size:'small', icon: Plus },
-]
-// 资源相关配置-cTable
-const sourceOpt = reactive({
-  data: [], // 数据
-  option: [ // 列配置
-    { label: '名称', prop: 'title', align: 'left' },
-    { label: '类型', prop: 'filetype', width: 80, },
-    { label: '时间', prop: 'timestamp', width: 160, sortable: true },
-  ],
-  noPage: true,   // 不显示分页
-  isMain: false,  // 主界面
-  highlightCurrentRow: true,  // 高亮当前行
-  rowClick: (r, c, e) => {    // 行点击事件-处理高亮(再次点击取消选中)
-    if (dt.curRow == r) {     // 重复点击-取消选中
-      resourRef.value.$refs.table.setCurrentRow()
-      dt.curRow = null
-    } else dt.curRow = r
-  },
-  rowContextmenu: (r, c, e) => { // 行—右键菜单事件
-    dt.menus.forEach(item => {
-      if(item.label == '打开') item.icon = getIcon(r, 'svg')
-      else if(item.label == '删除') item.icon = getIcon('icon-shanchu', 'class')
-    })
-    menusEvent(e, dt.menus, r)
-  },
-})
+const collectRef = (key) => {
+  return (el) => {
+    refs.value[key] = el;
+  };
+};

+const tags = reactive([{
+  name: '课标分析',
+  path: '/model/curriculum',
+  bgcolor: 'rgb(241,65,108)'
+},{
+  name: '教材分析',
+  path: '/model/teaching',
+  bgcolor: 'rgb(114,57,234)'
+},{
+  name: '考试分析',
+  path: '/model/examination',
+  bgcolor: 'rgb(251,132,4)'
+},{
+  name: '素材设计',
+  path: '/model/aiKolors',
+  bgcolor: 'rgb(25,123,237)'
+},{
+  name: '作业设计',
+  path: '/model/newClassTaskAssign',
+  bgcolor: 'rgb(23,198,83)'
+},{
+  name: '框架设计',
+  path: '/model/design',
+  bgcolor: 'rgb(34,35,43)'
+}])
+
+const tools = reactive([{
+  name: '数字人生成',
+  path: '',
+  img: 'airobot'
+},{
+  name: '语音生成',
+  path: '',
+  img: 'aiyuyin'
+},{
+  name: '文生图片',
+  path: '/model/aiKolors',
+  img: 'aiimg'
+},{
+  name: '文生连环画',
+  path: '',
+  img: 'aidraw'
+},{
+  name: '视频生成',
+  path: '',
+  img: 'aivideo'
+}])
+
+const uploadData = ref({
+    textbookId: null,
+    levelFirstId: null,
+    levelSecondId: null,
+    fileSource: '个人',
+    fileRoot: '备课'
+})
+const currentFileList = ref([])
 // 页面加载
 onMounted(() => {
 })

-// 相关方法-methods
-// 教材选中
-const changeBook = async(data) => {
-  // console.log(data)
-  const { textBook, node } = data
-  let textbookId = textBook.curBookId
-  let levelSecondId = node.id
-  let levelFirstId
-  if (node.parentNode) {
-    levelFirstId = node.parentNode.id
+const gotoRoute = (item) => {
+  if (item.path) {
+    if (item.path === '/model/aiKolors') {
+      gotoAiKolors(item.path)
    }else {
-    levelFirstId = node.id
-    levelSecondId = ''
+      router.push(item.path)
+    }
+  }
 }

-  courseObj.textbookId = textbookId  // 版本
-  courseObj.levelFirstId = levelFirstId  // 单元
-  courseObj.levelSecondId = levelSecondId // 章节
-  courseObj.coursetitle = node.itemtitle  // (单元/章节) 名称
-  courseObj.node = node; // 保存当前节点
-
-  // 头部 教材分析打开外部链接需要当前章节ID
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId }))
-  // 获取当前章节对应的课程信息
-  const params = { evalid: node.id, edituserid: userStore.id, pageSize: 1 }
-  const res = await HTTP_SERVER_API('getCourseList', params)
-  courseObj.entp = res?.rows?.[0] || null
-  sessionStore.set('curr.entp', courseObj.entp) // 缓存当前课程信息
-  // 更新-资源列表
-  getResourceList()
-}
-
-const openPPTist = () => {
-  createWindow('open-win', { url: '/pptist' })
-}
-
-const onchange = (path) => {
-  if (path == '/model/newClassTaskAssign') {
-    // 作业管理
-    router.push({ path, query: { courseObj: JSON.stringify(courseObj) } })
-  } else if (path == '/model/aiKolors') {
-    // ai生图
-    let subjectdata = sessionStore.get('subject.curNode')
-    let datasubject = `课标-${subjectdata.edustage}-${subjectdata.edusubject}`
-    console.log(subjectdata)
-    router.push({
-      path,
-      query: {
-        datasetId: dataSetJson[datasubject],
-        coursetitle: courseObj.coursetitle,
-        levelFirstId: subjectdata.parentid,
-        levelSecondId: subjectdata.id,
-        textbookId: subjectdata.rootid,
-      }
-    });
-  } else {
-    router.push(path)
-  }
-}
-// 获取资源列表
-const getResourceList = async () => {
-  const entpcourseidarray = courseObj?.entp?.id
-  if (!entpcourseidarray) return msgUtils.msgWarning('请选择章节?')
-  const params = {
-    pageSize: 100, parentid: 0, entpcourseidarray,
-    orderByColumn: 'timestamp', isAsc: 'desc',
-  }
-  const res = await HTTP_SERVER_API('getCourseFileList', params)
-  if (res?.code == 200) {
-    sourceOpt.data = res?.rows || []
-  } else {
-    msgUtils.msgWarning('获取资源列表, 请重试')
-  }
-}
-// 统一HTTP处理
-const HTTP_SERVER_API = (type, params = {}) => {
-  switch (type) {
-    case 'addSmarttalk': { // 获取课程
-      const def = {
-        fileId: '', // 文件id - Entpcoursefile 对应id
-        fileFlag: 'aptist',
-        fileShowName: courseObj.coursetitle + '.aptist',
-        textbookId: courseObj.textbookId,
-        levelFirstId: courseObj.levelFirstId,
-        levelSecondId: courseObj.levelSecondId,
-        fileSource: '个人',
-        fileRoot: '备课'
-      }
-      return API_smarttalk.creatAPT({...def, ...params})
-    }
-    case 'addEntpcourse': { // 添加课程
-      const node = courseObj.node || {}
-      if (!node) return msgUtils.msgWarning('请选择章节?')
-      const def = { // 默认参数
-        entpid: userStore.user.deptId, // 部门id
-        level: 1, // 层级
-        parentid: 0, // 父级id
-        dictid: 0, // 字典id
-        evalid: node.id, // 章节id
-        evalparentid: node.parentid, // 单元id(父级id)
-        edusubject: node.edusubject, // 学科
-        edudegree: node.edudegree, // 年级
-        edustage: node.edustage, // 阶段
-        coursetype: '课标学科', // 课程类型
-        coursetitle: node.itemtitle, // 课程名称
-        coursedesc: '', // 课程描述
-        status: '', // 状态
-        dflag: 0, // 状态
-        edituserid: userStore.id, // 编辑人id
-        createblankfile: 'no', // 创建空白文件
-      }
-      courseObj.entp = def
-      return API_entpcourse.addEntpcourse(def)
-    }
-    case 'addEntpcoursefile': { // 添加课程文件
-      const enpt = courseObj.entp
-      const def = {
+const createAIPPT = () => {
+  console.log(userStore)
+  listEntpcourse({
+    evalid: currentNode.value.id,
+    edituserid: userStore.userId,
+    pageSize: 500
+  }).then((response) => {
+    if (response.rows.length <= 0) return
+    let resCourse = response.rows[0]
+    // 添加
+    let form = {
      parentid: 0,
-        entpid: userStore.user.deptId,
-        entpcourseid: enpt.id,
+      entpid: userStore.deptId,
+      entpcourseid: resCourse.id,
      ppttype: 'file',
-        title: enpt.coursetitle,
+      title: resCourse.coursetitle,
      fileurl: '',
      filetype: 'aippt',
      datacontent: '',
@ -249,141 +183,280 @@ const HTTP_SERVER_API = (type, params = {}) => {
      fileidx: 0,
      dflag: 0,
      status: '',
-        edituserid: userStore.id
+      edituserid: userStore.userId
    }
-      // return Promise.resolve(1)
-      return API_entpcoursefile.addEntpcoursefileReturnId({...def,...params})
-    }
-    case 'getCourseList': { // 获取课程列表
-      return API_entpcourse.listEntpcourse(params)
-    }
-    case 'getCourseFileList':{ // 获取课程文件列表
-      return API_entpcoursefile.listEntpcoursefileNew(params)
-    }
-  }
-}
-// 事件回调
-const handleAll = async(type, row) =>{
-  // console.log(type)
-  switch (type) {
-    case 'refresh':   // 刷新
-      getResourceList()
-      break;
-    case 'resource':  // 资源库
-      break;
-    case 'upload':    // 上传
-      break;
-    case 'add':{      // 添加PPT-list - 课程文件
-      const enpt = courseObj.entp // 获取课程信息
-      if (!enpt) { // 如果没有，就新增课程
-        const resid = await HTTP_SERVER_API('addEntpcourse')
-        courseObj.entp.id = resid
-      }
-      // 生成ppt课件-父级
-      const p_params = {parentContent: '{"width":1000,"ratio":0.5625}'}
-      const id = await HTTP_SERVER_API('addEntpcoursefile', p_params)
-      if (!!id??null) { // 生成第一个幻灯片
-        const params = {
-          parentid: id,
+    addEntpcoursefileReturnId(form).then((slideid) => {
+      // 添加
+      var form = {
+        parentid: slideid,
+        entpid: resCourse.entpid,
+        entpcourseid: resCourse.id,
        title: '第一页',
        filetype: 'slide',
-          datacontent: '{"elements":[],"background":{"type":"solid","color":"#fff"}}' // json内容
+        datacontent: '{"elements":[],"background":{"type":"solid","color":"#fff"}}',
+        edituserid: userStore.userId
      }
-        // 生成ppt课件-子级(slide)
-        await HTTP_SERVER_API('addEntpcoursefile', params)
-        // 生成备课资源-Smarttalk
-        await HTTP_SERVER_API('addSmarttalk',{fileId: id})
-        // 刷新资源列表
-        await getResourceList()
+      addEntpcoursefileReturnId(form).then((res) => {
+        creatAPT({
+          ...uploadData.value,
+          fileId: slideid,
+          fileFlag: 'aippt',
+          fileShowName: currentNode.value.itemtitle + '.aippt'
+        }).then(async (res) => {
+          currentFileList.value.unshift(res.resData)
+          await nextTick();
+          refs.value['kjItemRef'+res.resData.id].openFileWin(res.resData);
+        })
+      })
+    })
+  })
+}
+
+const deleteTalk = (item) => {
+  let index = currentFileList.value.indexOf(item)
+  currentFileList.value.splice(index, 1)
+}
+
+// 教材选中
+const changeBook = async(data) => {
+  console.log(data)
+  let cata = parseCataByNode(data.node)
+  currentNode.value = data.node
+  uploadData.value.levelFirstId = cata[0]
+  uploadData.value.levelSecondId = cata[1]
+  uploadData.value.levelThirdId = cata[2]
+  uploadData.value.textbookId = data.textBook.curBookId
+  getSmarttalkPage({
+    ...uploadData.value,
+    orderByColumn: 'createTime',
+    fileFlags: "'aippt'",
+    isAsc: 'desc',
+    pageSize: 500
+  }).then((res) => {
+    currentFileList.value = [...res.rows]
+  })
+}
+const onchange = (item) => {
+  let path = item.path
+  if (path == '/model/newClassTaskAssign') {
+    uploadData.value.coursetitle = currentNode.value.itemtitle  // (单元/章节) 名称
+    uploadData.value.node = currentNode.value; // 保存当前节点
+    // 作业管理
+    router.push({ path, query: { courseObj: JSON.stringify(uploadData.value) } })
+  } else if (path == '/model/aiKolors') {
+    gotoAiKolors(path)
  } else {
-        msgUtils.msgWarning('添加失败!')
+    router.push(path)
  }
-      break;
 }
-    case 'open': {    // 打开资源-pptist
-      if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!')
-      sessionStore.set('curr.resource', row) // 缓存当前资源信息
+
+const gotoAiKolors = (path)=> {
+  // ai生图
+  let subjectdata = sessionStore.get('subject.curNode')
+  let datasubject = `课标-${subjectdata.edustage}-${subjectdata.edusubject}`
+  console.log(subjectdata)
+  router.push({
+    path,
+    query: {
+      datasetId: dataSetJson[datasubject],
+      coursetitle: currentNode.value.itemtitle,
+      levelFirstId: subjectdata.parentid,
+      levelSecondId: subjectdata.id,
+      textbookId: subjectdata.rootid,
+    }
+  });
+}
+
+const changeClass = async (type, row, other) => {
+  switch(type) {
+    case 'click': { // 点击-打开课件-aippt
+      if (row.fileFlag === 'aippt' && !!row.fileId) {
+        const res = await getEntpcoursefile(row.fileId)
+        if (res && res.code === 200) {
+          sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
+          sessionStore.set('curr.smarttalk', row) // 缓存当前文件smarttalk
          createWindow('open-win', {
            url: '/pptist', // 窗口关闭时，清除缓存
            close: () => {
              sessionStore.set('curr.resource', null) // 清除缓存
-          getResourceList() // 刷新资源列表
+              sessionStore.set('curr.smarttalk', null) // 清除缓存
+              getSmarttalkPage({
+                ...uploadData.value,
+                orderByColumn: 'createTime',
+                fileFlags: "'aippt'",
+                isAsc: 'desc',
+                pageSize: 500
+              }).then((res) => {
+                currentFileList.value = [...res.rows]
+              })
            }
          })
+        } else {
+          ElMessage.warning(res.msg||'文件获取异常！')
+        }
+        return
+      }
+      ElMessage.warning('该功能暂未开放！')
      break
    }
-    case 'delete':{ // 删除资源
-      if (!(row && row.id)) return msgUtils.msgWarning('请选择要删除的资源!')
-      await msgUtils.confirm(`是否确认删除【${row.title}】课程课件？`)
-      await API_entpcoursefile.delEntpcoursefileNew(row.id)
-      msgUtils.msgSuccess('删除成功!')
-      // 刷新资源列表
-      await getResourceList()
-      break;
+    default:
+      break
  }
 }
-}
-// icons 处理 type 代表传递svg
-const getIcon = (o, type) => {
-  let icon = typeof o == 'string' ? o : o?.filetype
-  if (['aippt'].includes(o?.filetype)) icon = 'pptx'
-  if (!!type) { // 其他格式icon
-    switch(type) {
-      case 'svg': // 返回svg格式
-        return `<svg class="icon svg-icon" aria-hidden="true">
-          <use xlink:href="#icon-${icon}"></use>
-          </svg>`
-      case 'class': // class
-        return `<span class="icon iconfont ${icon}"></span>`
-      case 'unicode': // unicode
-        return `<span class="icon iconfont">${icon}</span>`
-      default: // 返回icon-class
-        return `icon-${icon}`
-    }
-  }
-  return icon
-}
-
 </script>
-
 <style lang="scss" scoped>
-.page-resource {
-  // height: 100%;
-  // padding: 10px 15px 0;
-
-  .page-right {
-    min-width: 0;
+.model-wrap{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  .right-content{
+    flex: 1;
+    margin-left: 20px;
    display: flex;
    flex-direction: column;
-    flex: 1;
-    // margin-left: 20px;
    height: 100%;
-    background: #ffffff;
-    border-radius: 10px;
-    box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
-  }
-
-  .button-container {
+    .content-header-wrap{
      display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    margin: 1rem;
-    justify-content: flex-start;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      width: 100%;
+      //height: 215px;
+      &>div{
+        &:hover{
+          cursor: pointer;
+        }
+        width: calc(100%/6 - 10px);
+        aspect-ratio: 0.718 / 1;
+        border-radius: 10px;
+        color: white;
+        text-align: left;
+        background-color: #999999;
+        position: relative;
+        .item-icon{
+          position: absolute;
+          top: 10px;
+          left: 20px;
+          font-size: calc(1.8vw);
+        }
+        .content-header-title{
+          position: absolute;
+          bottom: 50%;
+          width: 100%;
+          font-size: calc(1.8vw);
+          padding-left: 20px;
+        }
+        .content-header-body{
+          position: absolute;
+          bottom: 0;
+          background-color: rgba(0, 0, 0, 0.27);
+          width: 100%;
+          height: 25%;
+          padding-left: 20px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          font-size: calc(1vw);
+          border-radius: 0 0 10px 10px;
+          .content-header-num{
+          }
+          .content-header-text{
+          }
+        }
+      }
+    }
+    .content-body-wrap{
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      margin-top: 20px;
+      flex: 1;
+      overflow: auto;
+      height: 100%;
+      border-radius: 10px;
+      .content-body-left{
+        width: calc(50% - 7px);
+        background-color: white;
+        border-radius: 10px;
+        display: flex;
+        flex-direction: column;
+        .content-body-left-title{
+          text-align: left;
+          padding: 10px;
+          font-weight: bold;
+          position: relative;
+          height: 40px;
+          .add-btn{
+            position: absolute;
+            right: 10px;
+          }
+        }
+        .content-body-left-body{
+          flex: 1;
+          overflow: auto;
+          .content-body-left-item{
+            display: flex;
+            flex-direction: row;
+            border-bottom: 1px solid rgba(153, 153, 153, 0.29);
+            padding: 10px 0;
+            .content-body-left-item-img{
+              padding: 0 10px;
+            }
+            .content-body-left-item-text{
+              text-align: left;
+              .content-body-left-item-title{
+                font-weight: bold;
+                font-size: 16px;
+              }
+              .content-body-left-item-info{
+                font-size: 14px;
+              }
+            }
+          }
+        }
+      }
+      .content-body-right{
+        width: calc(50% - 8px);
+        background-color: white;
+        border-radius: 10px;
+        .content-body-right-title{
+          text-align: left;
+          padding: 10px;
+          font-weight: bold;
+        }
+        .content-body-right-body{
+          display: flex;
+          .content-body-right-item{
+            &:hover{
+              cursor: pointer;
+            }
+            height: 80px;
+            width: 100px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            .content-body-right-item-img{
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              width: 50px;
+              height: 50px;
+              border-radius: 25px;
+              border: 1px solid rgba(153, 153, 153, 0.18);
+              img{
+                border-radius: 25px;
+                width: 25px;
+              }
+            }
+            .content-body-right-item-text{
+              font-size: 14px;
+            }
+          }

-    .el-button {
-      flex: 1 1 15%;
-      max-width: 15%;
-      min-width: 15%;
-      box-sizing: border-box;
        }
      }
    }
-.container{
-  height: calc(100% - 32px - 3rem);
-  .c-item{
-    .c-btns{
-      .el-button{margin: 0;}
-    }
  }
 }
 </style>
--- a/src/renderer/src/views/prepare/container/class-start.vue
+++ b/src/renderer/src/views/prepare/container/class-start.vue
@ -87,7 +87,8 @@ import { onMounted, reactive, ref, watchEffect, watch, nextTick, toRaw } from 'v
 import { Refresh } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'  // ui框架: 消息提示
 import vueQr from 'vue-qr/src/packages/vue-qr.vue'      // 插件: 二维码
-import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+// import imChat from '@/views/tool/components/imChat.vue' // im-chat-子组件
+import ChatWs from '@/plugins/socket' // 聊天socket
 import MsgEnum from '@/plugins/imChat/msgEnum'          // 消息头-相关定义(nuem)
 import * as commUtil from '@/utils/comm'                // 工具类-通用
 import { toLinkWeb, createWindow, getStaticUrl, sessionStore } from '@/utils/tool'  // 工具类-主进程相关
@ -151,9 +152,11 @@ const open = async (id, classObj) => {
      teacherForm.form.classcourseid = classObj.id
    }
    // 初始化im-chat
-    // nextTick(async() => {
+    nextTick(async() => {
      // chat = await imChatRef.value?.initImChat()
-    // })
+      // 连接socket
+      if (!ChatWs.ws) ChatWs.init()
+    })
  }
 }
 // 关闭弹窗
@ -267,10 +270,10 @@ const createClasscourse = async () => {
    setTimeout(() => {
      msgEl.close()
      msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async() => {
        msgEl.close()
-        const classcourse = {...params, id: teacherForm.form.classcourseid}
-        openPublicScreen(classcourse)
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        openPublicScreen(res.data)
      }, 2000);
    }, 1000);
  }
@ -303,9 +306,10 @@ const classTeachingStart = async () => {
    // 新版-pptList 打开公屏
    if (myClassActive.value.filetype == 'aptist') {
      const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-      setTimeout(() => {
+      setTimeout(async () => {
        msgEl.close()
-        openPublicScreen({id})
+        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        openPublicScreen(res.data)
      }, 2000);
    }else {
      const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
@ -350,6 +354,10 @@ const getQrUrl = async() => {
 // 打开公屏
 const openPublicScreen = (classcourse) => {
  console.log('打开公屏', classcourse)
+  // 发送app端待开课消息
+  const data = { id: classcourse.id }
+  ChatWs.sendMsg(MsgEnum.HEADS.MSG_0000, data, {}, ChatWs.TYPES.single, userStore.id)
+  // 缓存当前资源信息
  const resource = toRaw(myClassActive.value)
  sessionStore.set('curr.resource', resource) // 缓存当前资源信息
  sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
@ -367,25 +375,25 @@ const openPublicScreen = (classcourse) => {

 // ================== 监听 =======================
 // im-chat: 聊天事件 {type, data}
-const chatChange = (type, data, ...args) => {
-  if (type == 'msg') {   // im-chat 消息监听
-    console.log('msg:===== ',data, args)
-    // const msgId = (args||[])[0].message_msg_id
-    const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
-    switch(head) {
-      case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
-        const { classcourseid:id } = teacherForm.form
-        const { classcourseid: imId, status } = data
-        if (imId == id && status == 'open') {
-          classTeachingStart() // 开始跳转
-        }
-        break}
-      default:
-        console.log('未知消息:', data)
-        break
-    }
-  }
-}
+// const chatChange = (type, data, ...args) => {
+//   if (type == 'msg') {   // im-chat 消息监听
+//     console.log('msg:===== ',data, args)
+//     // const msgId = (args||[])[0].message_msg_id
+//     const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
+//     switch(head) {
+//       case MsgEnum.HEADS.MSG_classcourseopen:{ // 开课, 跳转公屏
+//         const { classcourseid:id } = teacherForm.form
+//         const { classcourseid: imId, status } = data
+//         if (imId == id && status == 'open') {
+//           classTeachingStart() // 开始跳转
+//         }
+//         break}
+//       default:
+//         console.log('未知消息:', data)
+//         break
+//     }
+//   }
+// }

 // 监听-班级id
 watch(() => classForm.form.classid, (val)=> {
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@ -61,7 +61,7 @@
          ">{{formatDate(item.createTime, 'yyyy-MM-dd hh:mm:ss')}}</div>
      </div>
    </div>
-    <div class="prepare-body-main-item-btn">
+    <div class="prepare-body-main-item-btn" v-if="showTool">
      <!-- <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button> -->
      <el-button type="primary" @click="clickStartClass(item)">上课</el-button>
    </div>
@ -145,6 +145,10 @@ export default {
    activeClassId: { // 当前上课id
      type: String,
      default: ''
+    },
+    showTool: { //是否显示上课工具
+      type: Boolean,
+      default: true
    }
  },
  expose: ['openFileWin'],
@ -414,6 +418,11 @@ export default {
    width: 100% !important;
  }
 }
+.prepare-popper{
+  width: 80px !important;
+  min-width: 80px !important;
+  padding: 5px !important;
+}
 </style>
 <style scoped lang="scss">
 .prepare-body-main-item {
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -104,10 +104,10 @@
              </file-list-item>
            </el-checkbox-group>
          </el-tab-pane>
-          <el-tab-pane label="作业" name="作业">
+          <el-tab-pane label="教学活动" name="教学活动">
           <div class="prepare-body-header">
              <div>
-                <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
+                <label style="font-size: 15px">共{{ currentWorkList.length }}个教学活动</label>&nbsp;
                <!-- <el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button> -->
                <el-button size="small" @click="goNewClassTask()">作业设计</el-button>
              </div>
@ -202,17 +202,14 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import TreeLog from '@/views/prepare/components/treeLog.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
-import Chat from '@/utils/chat'
 import * as commUtils from "@/utils/comm";
 import * as Api_server from "@/api/apiService";
 import msgUtils from "@/plugins/modal";
-import * as API_entpcoursefile from "@/api/education/entpcoursefile"; // im 登录初始化
-if (!Chat.imChat) Chat.init()
+import * as API_entpcoursefile from "@/api/education/entpcoursefile";
+import ChatWs from '@/plugins/socket' // 聊天socket
+if (!ChatWs.ws) ChatWs.init()
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
-// import ChatWs from '@/plugins/socket'
-// console.log('xxxx',ChatWs)
-// ChatWs.watch((data,e) => console.log('ws', data, e))

 const toolStore = useToolState()
 const fs = require('fs')
@ -252,7 +249,7 @@ export default {
      activeAptTab: "教学课件",
      uploadData: {
        textbookId: null,
-        levelFirstId: 39103,
+        levelFirstId: null,
        levelSecondId: null,
        fileSource: '个人',
        fileRoot: '备课'
@ -344,6 +341,8 @@ export default {
  //   }
  // },
  methods: {
+    // 延时
+    sleep(ms){return new Promise(resolve => setTimeout(resolve, ms))},
    addAiPPT(item) {
      this.currentFileList.unshift(item.resData)
      KjListItem.methods.openFileWin(item.resData);
@ -446,6 +445,33 @@ export default {
          ElMessage.warning('该功能暂未开放！')
          break
        }
+        case 'wsApp': { // 发送app端待开课消息
+          // console.log('wsApp', row)
+          const head = MsgEnum.HEADS.MSG_0000
+          const data = { id: row.id }
+          const type = ChatWs.TYPES.single
+          const userId = this.userStore.userId
+          ElMessage.success('APP端待开课消息-发送成功！')
+          await this.sleep(1000) // 等待1s
+          // 打开公屏
+          const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
+          const res = await getEntpcoursefile(row.entpcoursefileid)
+          await this.sleep(2000) // 等待2s
+          ChatWs.sendMsg(head, data, null, type, userId)
+          msgEl.close() // 关闭提示
+          const resource = res?.data||{}
+          const classcourse = row
+          sessionStore.set('curr.resource', resource) // 缓存当前资源信息
+          sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
+          createWindow('open-win', {
+            url: '/pptist', // 窗口关闭时，清除缓存
+            close: () => {
+              sessionStore.set('curr.resource', null) // 清除缓存
+              sessionStore.set('curr.classcourse', null) // 清除缓存
+            }
+          })
+          break
+        }
        default:
          break
      }
@ -524,7 +550,7 @@ export default {
      if (!!o.src) { // 如果有src就转换
        const isBase64 = /^data:image\/(\w+);base64,/.test(o.src)
        const isBlobUrl = /^blob:/.test(o.src)
-        console.log('isBase64', o, isBase64)
+        // console.log('isBase64', o, isBase64)
        if (isBase64) {
          const bolb = commUtils.base64ToBlob(o.src)
          const fileName = Date.now() + '.png'
@ -539,11 +565,29 @@ export default {
            url &&(o.src = url)
          }
        } else if (isBlobUrl) { // 视频和音频
+          const res = await fetch(o.src)
+          const blob = await res.blob()
+          const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+          const file = commUtils.blobToFile(blob, fileName)
+          // o.src = fileName
+          // console.log('file', file)
+          const formData = new FormData()
+          formData.append('file', file)
+          const ress = await Api_server.Other.uploadFile(formData)
+          if (ress && ress.code == 200){
+            const url = ress?.url
+            url &&(o.src = url)
+          }
+        }
+      }

-        }
-      }
      if (o?.background?.image) await this.toRousrceUrl(o.background.image)
-      if (o?.elements) o.elements.forEach(async o => {await this.toRousrceUrl(o)})
+      // if (o?.elements) o.elements.forEach(async o => {await this.toRousrceUrl(o)})
+       if(o?.elements){
+          for (let element of o.elements) {
+              await this.toRousrceUrl(element);
+          }
+       }
    },
    async createAIPPTByFile(file) {
      this.pgDialog.visible = true
@ -559,6 +603,8 @@ export default {
        // 设置进度条
        this.pgDialog.pg.percentage = Math.floor(completed / total * 100)
      }
+      console.log('结束', slides)
+      return
      this.pgDialog.pg.percentage = 0
      this.pgDialog.visible = false
      listEntpcourse({
@ -595,6 +641,8 @@ export default {
          }).then(async (res) => {

            const resSlides = slides.map(({id, ...slide}) => JSON.stringify(slide))
+            console.log(resSlides)
+            return
            let params = {
              parentid: slideid,
              entpid: resCourse.entpid,
@ -849,7 +897,7 @@ export default {
      this.isLoading = true
      return getSmarttalkPage({
        ...this.uploadData,
-        orderByColumn: 'uploadTime',
+        orderByColumn: 'createTime',
        isAsc: 'desc',
        pageSize: 500
      })
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@ -53,7 +53,7 @@ export default defineStore('resource', {
      fileFlags: resourceType[0].value,
      fileRoot: '资源',
      fileName: '',
-      orderByColumn: 'uploadTime',
+      orderByColumn: 'createTime',
      isAsc: 'desc',
      ...structQuery
    },
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@ -330,11 +330,27 @@ const toRousrceUrl = async(o) => {
        url &&(o.src = url)
      }
    } else if (isBlobUrl) { // 视频和音频
-
+      const res = await fetch(o.src)
+      const blob = await res.blob()
+      const fileName = o.type=='video'? Date.now() + '.mp4':Date.now() + '.mp3'
+      const file = commUtils.blobToFile(blob, fileName)
+      // o.src = fileName
+      // console.log('file', file)
+      const formData = new FormData()
+      formData.append('file', file)
+      const ress = await Api_server.Other.uploadFile(formData)
+      if (ress && ress.code == 200){
+        const url = ress?.url
+        url &&(o.src = url)
+      }
    }
  }
  if (o?.background?.image) await toRousrceUrl(o.background.image)
-  if (o?.elements) o.elements.forEach(async o => {await toRousrceUrl(o)})
+  if(o?.elements){
+          for (let element of o.elements) {
+              await this.toRousrceUrl(element);
+          } 
+       }
 }
 // ======== zdg end ============

--- a/src/renderer/src/views/tool/components/homework.vue
+++ b/src/renderer/src/views/tool/components/homework.vue
@ -203,7 +203,7 @@ const openFileLink = async (item) =>{
 // 获取资源数据
 const getResource = () => {
  let querySearch = toRaw(toolStore.curSubjectNode).querySearch
-  querySearch.orderByColumn = 'uploadTime'
+  querySearch.orderByColumn = 'createTime'
  querySearch.isAsc = 'desc'
  querySearch.pageSize = 500
Author	SHA1	Message	Date
lyc	c1325db9e7	Merge pull request 'edit 模板' (#112 ) from lyc-dev into main	2024-12-11 15:07:56 +08:00
baigl	44b341f7ac	Merge pull request '作业管理：作业名称为空保存判断' (#111 ) from baigl into main Reviewed-on: #111	2024-12-11 14:55:07 +08:00
白了个白	c8dd19382e	作业管理：作业名称为空保存判断	2024-12-11 14:51:07 +08:00
zhangxuelin	f2faa882a8	Merge pull request 'zxl' (#110 ) from zxl into main Reviewed-on: #110	2024-12-11 13:51:14 +08:00
zhangxuelin	e4afb26e4e	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl	2024-12-11 13:50:50 +08:00
zhangxuelin	d60d8822a6	修改动画不能展示问题	2024-12-11 13:50:25 +08:00
朱浩	90137bc3a2	Merge remote-tracking branch 'origin/main'	2024-12-11 13:37:07 +08:00
朱浩	82c61a3fa7	大模型首页	2024-12-11 13:36:49 +08:00
朱浩	48d631a17c	大模型首页	2024-12-11 11:11:47 +08:00
zhangxuelin	1835f76e56	Merge pull request 'pptist点赞组件' (#109 ) from zxl into main Reviewed-on: #109	2024-12-11 11:02:44 +08:00
zhangxuelin	432c1ff71d	pptist点赞组件	2024-12-11 11:02:22 +08:00
朱浩	7f595c09a9	大模型首页	2024-12-11 10:33:18 +08:00
朱浩	c8e10d4fe1	Merge remote-tracking branch 'origin/main' # Conflicts: # src/renderer/src/components/file-image/index.vue # src/renderer/src/views/model/index.vue	2024-12-11 10:31:29 +08:00
朱浩	f916660156	大模型首页	2024-12-11 10:28:55 +08:00
zhengdegang	e0107814ea	Merge pull request 'zdg_dev' (#108 ) from zdg_dev into main Reviewed-on: #108	2024-12-11 10:07:58 +08:00
zdg	bb0aa82e82	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev	2024-12-11 10:06:30 +08:00
zdg	8ed13a3146	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev # Conflicts: # src/renderer/src/AixPPTist/src/api/index.ts # src/renderer/src/views/prepare/index.vue	2024-12-11 10:06:23 +08:00
zhangxuelin	82b70558c2	Merge pull request 'zxl' (#107 ) from zxl into main Reviewed-on: #107	2024-12-11 09:59:16 +08:00
zhangxuelin	bace41e12e	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl	2024-12-11 09:58:08 +08:00
zhangxuelin	04e204928d	添加ppt 视频url替换	2024-12-11 09:57:39 +08:00
zdg	9e5609fbdd	ppt上课	2024-12-11 09:44:52 +08:00
lyc	50aff2f158	Merge pull request 'add icon' (#106 ) from lyc-dev into main	2024-12-11 09:41:16 +08:00
zdg	4f68ae27b3	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev	2024-12-10 10:09:00 +08:00
zdg	38c041465e	ppt上课	2024-12-10 10:08:53 +08:00