Merge branch 'main' into lyc-dev

Reviewed-on: #134

.env.production

@@ -19,7 +19,7 @@ VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
 
 # websocket 地址
-VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
+VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
 
 # 是否显示开发工具
-VITE_SHOW_DEV_TOOLS = 'true'
+VITE_SHOW_DEV_TOOLS = 'false'

src/renderer/src/AixPPTist/src/App.vue

@@ -28,8 +28,9 @@ import msgUtils from '@/plugins/modal' // 消息工具
 import * as API_entpcoursefile from '@/api/education/entpcoursefile' // 相关api
 import { PPTApi } from './api'
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
-import './api/watcher' // 监听
-
+// import './api/watcher' // 监听
+import watcher from './api/watcher' // 监听
+watcher() // 监听启动
 const loading = ref(true)
 const _isPC = isPC()
 

src/renderer/src/AixPPTist/src/api/classcourse.ts

@@ -7,13 +7,19 @@ import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import * as useStore from '../store' // pptist-状态管理
 import ChatWs from '@/plugins/socket' // 聊天socket
 import msgUtils from '@/plugins/modal' // 消息工具
+import * as Fullscreen  from '../utils/fullscreen' // 全屏
+import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
 
+const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
 const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+const execPlay = useExecPlay() // 播放控制
 
 export class Classcourse {
   msgObj:ElMessageBox = null // 提示消息对象
+  classcourse:any = null // 课堂信息
+  id: number|string = null // 课堂id
 
   constructor() {
     this.load()
@@ -22,21 +28,36 @@ export class Classcourse {
    * @description 加载
    */
   load() {
+    console.log('classcourse-load', classcourse)
     // 打开全屏
-    screenStore.setScreening(!!classcourse)
+    const isCourse = !!classcourse
+    if (isCourse) Fullscreen.enterFullscreen()
+    screenStore.setScreening(isCourse)
     // 如果课堂信息有值，则连接socket
     if (!!classcourse) {
       // 连接socket
       if (!ChatWs.ws) ChatWs.init()
       ChatWs.id = classcourse.timgroupid // 群组id
-      console.log('ws- ', classcourse)
+      this.classcourse = classcourse // 课堂信息
+      this.id = classcourse.id // 课堂id
+      // 如果课堂信息有paging，则更新当前页码
+      const isPaging = !!classcourse.paging
+      if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
+        // 如果课堂信息有paging，则更新动画播放状态
+      const isAnim = !!classcourse.cartoonTimes
+      if (isAnim) { // 动画播放
+        for (let i = 0; i <= classcourse.cartoonTimes; i++) {
+          execPlay.runAnimation(true) // 异步执行动画
+        }
+      }
+      // 课堂信息-状态管理
       classcourseStore.setClasscourse(classcourse)
       // 待上课提示
       if (!classcourse.status) {
         this.msgObj = {
           type: 'success',
           title: '系统提示',
-          message: '公屏课堂已准备完毕，请等待老师开启课堂！',
+          message: '公屏课堂已准备完毕，等待老师开启课堂...',
           center: true,
           showClose: false,
           showCancelButton: false,

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

@@ -55,26 +55,28 @@ export class PPTApi {
   // 变量
   static isUpdate = true // 是否更新数据
 
-  // 获取所有幻灯片列表
-  static getSlideList(parentid: (Number | String)): Promise<Boolean> {
+  // 获取所有幻灯片列表 isUpdate为true不更新
+  static getSlideList(parentid: (Number | String),isUpdate?:Boolean): Promise<Boolean> {
     return new Promise(async (resolve, reject) => {
       const params: object = { parentid, orderByColumn: 'fileidx', isAsc: 'asc', pageSize: 9999 }
       const res: Result = await API_entpcoursefile.listEntpcoursefileNew(params)
-      if (res.code === 200) {        
-        const slides = (res.rows || []).map(o => {
-          if (!!o.datacontent) {
-            const json = JSON.parse(o.datacontent)
-            !!json && (json.id = o.id)
-            return json
-          }
-          // 如果没有数据，默认空白页
-          return {id: o.id,elements:[],background:{type:"solid",color:"#fff"}}
-        })
+      if (res.code === 200) { 
+        if(!isUpdate){
+          const slides = (res.rows || []).map(o => {
+            if (!!o.datacontent) {
+              const json = JSON.parse(o.datacontent)
+              !!json && (json.id = o.id)
+              return json
+            }
+            // 如果没有数据，默认空白页
+            return {id: o.id,elements:[],background:{type:"solid",color:"#fff"}}
+          })
+          // slidesStore.updateSlideIndex(0) // 下标0 为第一页
+          slidesStore.setSlides(slides) // 写入数据
+        } 
         // 活动列表处理
         const workList = (res.rows || []).map(o => o.activityContent)
-        const workItem = [...res.rows]
-        // slidesStore.updateSlideIndex(0) // 下标0 为第一页
-        slidesStore.setSlides(slides) // 写入数据
+        const workItem = res.rows ? [...res.rows] : []
         // 写入作业列表数据
         slidesStore.setWorkList(workList)
         // 获取所有的pptlist的数据
@@ -111,7 +113,6 @@ export class PPTApi {
         data.id = rid
         slidesStore.updateSlide(data)
         // msgUtils.msgSuccess('新增成功')
-        PPTApi.getSlideList(resource.id)
         this.isUpdate = false // 新增后会触发监听，不再更新数据
         resolve(true)
       } else msgUtils.msgError('新增失败');resolve(false)
@@ -134,7 +135,9 @@ export class PPTApi {
     const isAdd = !/^\d+$/.test(currentSlide.id) // 是否新增
     if (isAdd) { // 新增的幻灯片(id 为非数字，说明是新增的幻灯片)
       const bool = await this.addSlide(currentSlide)
-      bool && this.batchUpdateSlides(newData, true) // 批量更新-排序
+      bool && await this.batchUpdateSlides(newData, true) // 批量更新-排序
+      const resource = sessionStore.get('curr.resource')||{}
+      await PPTApi.getSlideList(resource.id)
     } else { // 防抖-更新
       if (!this.isUpdate) return this.isUpdate = true // 下次更新数据
       const params = {

src/renderer/src/AixPPTist/src/api/types.ts

@@ -106,6 +106,8 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
+    /** @desc: 学生提交作业 */
+    MSG_finishHomework : 'finishHomework',
     /** @desc: 学生的测练结果反馈 */
     MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
@@ -120,6 +122,12 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,

src/renderer/src/AixPPTist/src/api/watcher.ts

@@ -10,85 +10,111 @@ 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') // 备课资源
+import { Homework } from './index' // api-作业相关
+import emitter from '@/utils/mitt' //mitt 事件总线
+import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
+
 /**
  * @description 监听器
  */
-// 监听幻灯片内容变化
-watch(() => slidesStore.slides, (newVal, oldVal) => {
-  PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
-},{ deep: true })
-
-// 监听标题变化
-watch(() => slidesStore.title, (newVal, oldVal) => {
-  if (oldVal == '未命名演示文稿') return // 初始加载，不需要更新数据
-  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)
-    }
+export default () => {
+  const slidesStore = store.useSlidesStore()
+  const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
+  const resource = sessionStore.get('curr.resource') // apt 资源
+  const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
+  const execPlay = useExecPlay() // 播放控制
+  
+  // 监听幻灯片内容变化
+  watch(() => slidesStore.slides, (newVal, oldVal) => {
+    PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
+  },{ deep: true })
+  
+  // 监听标题变化
+  watch(() => slidesStore.title, (newVal, oldVal) => {
+    if (oldVal == '未命名演示文稿') return // 初始加载，不需要更新数据
+    updatePPT({title: newVal})
   })
-}
-
-// 更新ppt内容
-const updatePPT = async (data) => {
-  if (!resource) return
-  data.id = resource.id
-  await PPTApi.updateSlide(data) // 更新ppt内容
-  sessionStore.set('curr.resource.title', data.title)
-  // 更新smarttalk内容
-  if (!!smarttalk && !!data.title) {
-    const {id, fileFlag} = smarttalk
-    const params = { id, fileShowName: `${data.title}.${fileFlag}` }
-    await PPTApi.updateSmarttalk(params) // 更新ppt内容
-    sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
+  
+  // 消息监听ws
+  // console.log('监听器已开启', ChatWs)
+  if (!!ChatWs.ws) {
+    ChatWs.watch((data, e) => {
+      try {
+        handleMessage(JSON.parse(data)?.msg)
+      } catch (error) {
+        console.error('socket 解析异常 ', error, e)
+        handleMessage(data)
+      }
+    })
   }
-}
-
-// 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
+  
+  // 更新ppt内容
+  const updatePPT = async (data) => {
+    if (!resource) return
+    data.id = resource.id
+    await PPTApi.updateSlide(data) // 更新ppt内容
+    sessionStore.set('curr.resource.title', data.title)
+    // 更新smarttalk内容
+    if (!!smarttalk && !!data.title) {
+      const {id, fileFlag} = smarttalk
+      const params = { id, fileShowName: `${data.title}.${fileFlag}` }
+      await PPTApi.updateSmarttalk(params) // 更新ppt内容
+      sessionStore.set('curr.smarttalk.fileShowName', params.fileShowName)
     }
   }
+  
+  // ws消息处理
+  const handleMessage = (msg) => {
+    console.log('ws消息处理', 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(() => { // 点击确定按钮，关闭窗口
+              close()
+            })
+          } else { // 正常更新数据
+            classcourseStore.classcourse.status = 'open'
+            sessionStore.set('curr.classcourse.status', 'open')
+            // 更新课堂信息-关闭警告框
+            Classcourse?.msgObj?.onVanish()
+          }
+          break
+        case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
+          const slideIndex = content?.current || 0
+          const type = content?.animation
+          if (type === 'Nextsteps') execPlay.execNext() // 下一步
+          else if (type === 'Previoustep') execPlay.execPrev() // 上一步
+          else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
+          break
+        case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
+          if (!content.classWorkId) return
+          Homework.showHomework(content.classWorkId)
+          break
+        case MsgEnum.HEADS.MSG_closed: // 下课:
+          close()
+          break
+        case MsgEnum.HEADS.MSG_dz: // 点赞
+          emitter.emit('upvoteTrigger', 1)
+          break
+        case MsgEnum.HEADS.MSG_yh: // 疑惑
+          emitter.emit('upvoteTrigger', 2)
+          break
+        case MsgEnum.HEADS.MSG_0010: // 备用
+          break
+        default:
+          break
+      }
+    }
+  }
+  // 关闭窗口
+  const close = () => {
+    ChatWs?.close() // 关闭ws
+    setTimeout(() => {
+      window.close() // 关闭窗口
+    }, 1000)
+  }
 }
-// console.log('监听器已开启', Classcourse)
-// setTimeout(() => {
-//   console.log('关闭弹窗')
-//   // Classcourse.msgObj?.close()
-//   Classcourse?.msgObj?.onVanish()
-// }, 10 * 1000)

src/renderer/src/AixPPTist/src/hooks/useScreening.ts

@@ -1,5 +1,6 @@
 import { useScreenStore, useSlidesStore, useClasscourseStore } from '../store'
 import { enterFullscreen, exitFullscreen, isFullscreen } from '../utils/fullscreen'
+import ChatWs from '@/plugins/socket' // 聊天socket
 
 export default () => {
   const screenStore = useScreenStore()
@@ -23,7 +24,10 @@ export default () => {
     const classcourse = classcourseStore.classcourse
     if (!!classcourse) { //DOTO 有课堂，执行退相关操作
       console.log('退出放映状态')
-      window.close()
+      ChatWs?.close() // 关闭ws
+      setTimeout(() => {
+        window.close() // 关闭窗口
+      }, 1000)
     } else screenStore.setScreening(false)
     if (isFullscreen()) exitFullscreen()
   }

src/renderer/src/AixPPTist/src/store/slides.ts

@@ -145,21 +145,16 @@ export const useSlidesStore = defineStore('slides', {
     setWorkItem(list: Object[]) {
       this.workItem = list
     },
-    addWorkItem(data: any) {
-      const id = data?.id
-      if (!id) return
-      this.workItem.splice(this.slideIndex + 1, 0, data)
-      this.slideIndex += 1
-    },
   
     addSlide(slide: Slide | Slide[]) {
       const slides = Array.isArray(slide) ? slide : [slide]
       for (const slide of slides) {
         if (slide.sectionTag) delete slide.sectionTag
       }
+      // const addIndex = this.slideIndex + 1
       this.slides.splice(this.slideIndex, 0, ...slides)
+      // this.slideIndex = addIndex
     },
-  
     updateSlide(props: Partial<Slide>, slideId?: string) {
       const slideIndex = slideId ? this.slides.findIndex(item => item.id === slideId) : this.slideIndex
       this.slides[slideIndex] = { ...this.slides[slideIndex], ...props }

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

@@ -168,6 +168,10 @@ const type = ref<WorkType[]>([
         label: '常规作业',
         value: 'primary'
     },
+    {
+        label: '框架梳理',
+        value: 'primary'
+    }
 ])
 
 const objItem = ref<any>({})
@@ -302,9 +306,9 @@ const getData = async (data: WorkItem) => {
     dialogVisible.value = false
 }
 const upDateData = async () => {
-    // await PPTApi.updateSlide(paramData.value)
     loadingActive.value = true
-    await updateEntpcoursefileNew(paramData.value)
+    await PPTApi.updateSlide(paramData.value)
+    // await updateEntpcoursefileNew(paramData.value)
     const resource = sessionStore.get('curr.resource')
     await PPTApi.getSlideList(resource.id)
     const res = await homeworklist({ ids: paramData.value.activityContent, pageSize: 100 })

src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts

@@ -19,10 +19,10 @@ export default () => {
   // 最小已播放页面索引
   const playedSlidesMinIndex = ref(slideIndex.value)
 
-  // 执行元素动画
-  const runAnimation = () => {
+  // 执行元素动画 isAsync 为 true 时，异步执行，否则同步执行
+  const runAnimation = (isAsync: boolean) => {
     // 正在执行动画时，禁止其他新的动画开始
-    if (inAnimation.value) return
+    if (inAnimation.value && !isAsync) return
 
     const { animations, autoNext } = formatedAnimations.value[animationIndex.value]
     animationIndex.value += 1
@@ -69,7 +69,7 @@ export default () => {
       elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
     }
   }
-
+  
   onMounted(() => {
     const firstAnimations = formatedAnimations.value[0]
     if (firstAnimations && firstAnimations.animations.length) {
@@ -174,6 +174,7 @@ export default () => {
 
   // 鼠标滚动翻页
   const mousewheelListener = throttle(function(e: WheelEvent) {
+    e.preventDefault() // 阻止默认事件
     if (e.deltaY < 0) execPrev()
     else if (e.deltaY > 0) execNext()
   }, 500, { leading: true, trailing: false })
@@ -182,20 +183,20 @@ export default () => {
   const touchInfo = ref<{ x: number; y: number; } | null>(null)
 
   const touchStartListener = (e: TouchEvent) => {
+    e.preventDefault() // 阻止默认事件
     touchInfo.value = {
-      x: e.changedTouches[0].pageX,
-      y: e.changedTouches[0].pageY,
+      // x: e.changedTouches[0].pageX,
+      // y: e.changedTouches[0].pageY,
+      x: e.changedTouches[0].clientX,
+      y: e.changedTouches[0].clientY,
     }
   }
   const touchEndListener = (e: TouchEvent) => {
     if (!touchInfo.value) return
-
-    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].pageX)
-    const offsetY = e.changedTouches[0].pageY - touchInfo.value.y
-
+    const offsetX = Math.abs(touchInfo.value.x - e.changedTouches[0].clientX)
+    const offsetY = e.changedTouches[0].clientY - touchInfo.value.y
     if ( Math.abs(offsetY) > offsetX && Math.abs(offsetY) > 50 ) {
       touchInfo.value = null
-
       if (offsetY > 0) execPrev()
       else execNext()
     }
@@ -203,6 +204,7 @@ export default () => {
 
   // 快捷键翻页
   const keydownListener = (e: KeyboardEvent) => {
+    e.preventDefault() // 阻止默认事件
     const key = e.key.toUpperCase()
 
     if (key === KEYS.UP || key === KEYS.LEFT || key === KEYS.PAGEUP) execPrev()

src/renderer/src/api/file/index.js

@@ -71,3 +71,11 @@ export const addFileToKj = (id) => {
     method: 'get'
   })
 }
+
+export const getModelInfo = (params) => {
+  return request({
+    url: '/education/llmModel/getModelInfo',
+    method: 'post',
+    params
+  })
+}

src/renderer/src/layout/components/Aside.vue

@@ -5,13 +5,13 @@
         <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
           <template #reference>
             <div class="user-info">
-              <el-image class="user-img" :src="dev_api + userStore.user.avatar"  />
+              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' ? defaultUserImg : dev_api + userStore.user.avatar"  />
               <span>{{ userStore.user.nickName }}</span>
             </div>
           </template>
           <div class="head-aside">
             <ul >
-              <li v-if="!isStadium" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
+              <li v-if="isStadium() !== true" :class="computedregistertype==1 || computedregistertype==3?'auth-li':'auth-li pointer-events'" @click="onUserTo('/schoolCertification')"  >
                 <i class="iconfont icon-renzheng-" :style="computedregistertype==4?'color:green;':''"></i>
                 <span class="mlr-5"  v-if="computedregistertype!=4">学校认证</span>
                 <span class="mlr-5" v-else>{{ userStore.DeptInfo.register.schoolName }}</span>
@@ -19,8 +19,8 @@
               </li>
               <li v-if="computedregistertype!=4" :class="computedregistertype==1 || computedregistertype==2 ? '':'pointer-events'" @click="onUserTo('/joinSchool')">加入学校</li>
               <li @click="onUserTo('/profile')">个人中心</li>
-              <li v-if="!isStadium" @click="onUserTo('/schoolManagement')">学校管理</li>
-              <li v-if="!isStadium" @click="onUserTo('/class')">班级中心</li>
+              <li v-if="isStadium() !== true" @click="onUserTo('/schoolManagement')">学校管理</li>
+              <li v-if="isStadium() !== true" @click="onUserTo('/class')">班级中心</li>
               <li @click="logout">退出登录</li>
             </ul>
           </div>
@@ -59,6 +59,7 @@ import { ElMessageBox, ElMessage } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 import { sessionStore } from '@/utils/store'
 import pkc from "../../../../../package.json"
+import defaultUserImg from '@/assets/images/img-avatar.png'
 
 
 const { ipcRenderer } = window.electron || {}

src/renderer/src/plugins/imChat/msgEnum.js

@@ -80,10 +80,10 @@ export class MsgEnum {
     MSG_anmationclick : 'anmationclick',
     /** @desc: 群组创建成功 */
     MSG_classcourseopen : 'classcourseopen',
-    /** @desc: 学生的测练结果反馈 */
-    MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 学生提交作业 */
     MSG_finishHomework : 'finishHomework',
+    /** @desc: 学生的测练结果反馈 */
+    MSG_classquizfeedback : 'classquizfeedback',
     /** @desc: 老师端：接收到学生反馈消息-课堂测练中的其他任务 */
     MSG_classtaskfeedback : 'classtaskfeedback',
     /** @desc: 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 */
@@ -96,6 +96,12 @@ export class MsgEnum {
     MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',
     /** @desc: 课堂讲授活动，选择不同的内容 */
     MSG_classlecturePagesrc : 'classlecturePagesrc',
+    /** @desc: 课堂作业|活动 */
+    MSG_homework : 'HOMEWORK',
+    /** @desc: 点赞 */
+    MSG_dz : 'dz',
+    /** @desc: 疑惑 */
+    MSG_yh : 'yh',
     // === 新定义-消息头 ===
     /** @desc: 课程创建-待开课 */
     MSG_0000: 0x0000,
@@ -140,4 +146,4 @@ export class MsgEnum {
   }
 }
 
-export { MsgEnum as default }
+export default MsgEnum;

src/renderer/src/plugins/socket/index.js

@@ -28,6 +28,7 @@ export class ChatWs {
         const userStore = useUserStore() // 用户信息
         const wsBase = import.meta.env.VITE_APP_WS_URL; // ws地址
         this.url = `${wsBase||ChatWs.base}/ws/websocket/${userStore.id}`;
+        this.closed = false; // 关闭状态 防止重连失败
         // this.init(url);
       }
       ChatWs.instance = this;
@@ -38,6 +39,7 @@ export class ChatWs {
   // 初始化
   init(url) {
     !!url && (this.url = url);
+    this.closed = false; // 关闭状态 防止重连失败
     this.ws = null;
     const _this = this
     this.heartCheck = {
@@ -64,43 +66,46 @@ export class ChatWs {
         }, this.timeout);
       },
     };
-    this.reconnect();
+    return this.reconnect();
   }
   // 重连
   reconnect() {
-    const self = this;
-    if (!!this.ws) { // 关闭之前的链接
-      this.ws.close()
-      this.ws = null
-    }
-    this.ws = new WebSocket(this.url);
-    this.ws.onopen = function () {
-      console.log("websocket-连接成功")
-      self.heartCheck.reset().start();
-    };
-    this.ws.onmessage = function (e) {
-      // console.log("websocket-收到消息", e)
-      // 拿到任何消息都说明当前连接是正常的
-      const isBeat = e.data == 'pong'
-      isBeat && self.heartCheck.reset().start();
-      const isEmpty = !e.data
-      const isExts = e.data.includes('sessionId') || e.data == ('pong')
-      if (isEmpty || isExts) return;
-      // 自定义处理
-      self.onmessage && self.onmessage(e.data, e);
-    };
-    this.ws.onerror = function (e) {
-      console.log("websocket-连接异常", e)
-      self.connectSocket() // 重连
-    };
-    this.ws.onclose = function (e) {
-      console.log("websocket-连接断开", e)
-      self.connectSocket() // 重连
-    };
+    return new Promise((resolve, reject) => {
+      const self = this;
+      if (!!this.ws) { // 关闭之前的链接
+        this.ws.close()
+        this.ws = null
+      }
+      this.ws = new WebSocket(this.url);
+      this.ws.onopen = function () {
+        console.log("websocket-连接成功")
+        self.heartCheck.reset().start();
+        resolve()
+      };
+      this.ws.onmessage = function (e) {
+        // console.log("websocket-收到消息", e)
+        // 拿到任何消息都说明当前连接是正常的
+        const isBeat = e.data == 'pong'
+        isBeat && self.heartCheck.reset().start();
+        const isEmpty = !e.data
+        const isExts = e.data.includes('sessionId') || e.data == ('pong')
+        if (isEmpty || isExts) return;
+        // 自定义处理
+        self.onmessage && self.onmessage(e.data, e);
+      };
+      this.ws.onerror = function (e) {
+        console.log("websocket-连接异常", e)
+        self.connectSocket() // 重连
+      };
+      this.ws.onclose = function (e) {
+        console.log("websocket-连接断开", e)
+        self.connectSocket() // 重连
+      };
+    })
   }
   connectSocket() {
     this.heartCheck.reset() // 重置心跳
-    if (self.closed) return; // 关闭状态不重连
+    if (this.closed) return this.ws = null; // 关闭状态不重连
     // if(self.errCount <= 0) return; // 超过重连次数
     // self.errCount--; // 重连次数减1
     if (this.errTime) {
@@ -157,6 +162,16 @@ export class ChatWs {
     this.closed = true;
     this.ws.close();
   }
+  // 下课
+  closedCourse(id) {
+    return new Promise((resolve, reject) => {
+      this.sendMsg('closed', '下课', null, 'group', id)
+      resolve()
+      // setTimeout(() => {
+      //   this.close() // 关闭链接
+      // }, 1000);
+    })
+  }
   // 延时 ms 毫秒
   sleep(ms){
     return new Promise(resolve => setTimeout(resolve, ms))

src/renderer/src/views/classManage/reserv-item-apt.vue

@@ -15,8 +15,7 @@
       </template>
       <template v-else-if="item.status === 'open'">
         <el-button :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
-        >继续上课</el-button
-        >
+        >继续上课</el-button>
         <!--<el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
         <el-button :loading="loading" size="small" type="info" @click="endClassR(item)"
         >下课{{ loading?'中...':'' }}</el-button>

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

@@ -714,6 +714,7 @@ const closeDialog = () => {
 
 // im监听消息回调
 const msgHandle = (msg) => {
+  console.log('socket消息回调', msg)
   if (typeof msg === 'object'){
     const { head, content, ...other } = msg
     switch(head) {

src/renderer/src/views/model/index.vue

@@ -9,7 +9,7 @@
           <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-num">{{item.num}}</div>
             <div class="content-header-text">分析结果</div>
           </div>
         </div>
@@ -83,7 +83,7 @@ import useUserStore from '@/store/modules/user' // 用户信息
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 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 {creatAPT, getSmarttalkPage, getModelInfo} from '@/api/file'
 import {ArrowDown, Flag, Position} from '@element-plus/icons-vue'
 import {asyncLocalFile, parseCataByNode} from "@/utils/talkFile";
 import { dataSetJson } from '@/utils/comm' // 数据集id文生图
@@ -165,9 +165,6 @@ const uploadData = ref({
     fileRoot: '备课'
 })
 const currentFileList = ref([])
-// 页面加载
-onMounted(() => {
-})
 
 const gotoRoute = (item) => {
   if (item.path) {
@@ -392,6 +389,35 @@ const changeBook = async(data) => {
   uploadData.value.levelSecondId = cata[1]
   uploadData.value.levelThirdId = cata[2]
   uploadData.value.textbookId = data.textBook.curBookId
+  getModelInfo({cataid: currentNode.value.id}).then(res=>{
+    console.log(res)
+    if (res&&res.data) {
+      tags.filter(item=>{
+        switch (item.name) {
+          case '课标分析':
+            item.num = res.data.kbs
+            break;
+          case '教材分析':
+            item.num = res.data.jcs
+            break;
+          case '考试分析':
+            item.num = res.data.kss
+            break;
+          case '素材设计':
+            item.num = res.data.scs
+            break;
+          case '作业设计':
+            item.num = res.data.zys
+            break;
+          case '框架设计':
+            item.num = res.data.kjs
+            break;
+          default:
+            break;
+        }
+      })
+    }
+  })
   getSmarttalkPage({
     ...uploadData.value,
     orderByColumn: 'createTime',
@@ -469,6 +495,11 @@ const changeClass = async (type, row, other) => {
       break
   }
 }
+
+// 页面加载
+onMounted(() => {
+})
+
 </script>
 <style lang="scss" scoped>
 .model-wrap{

src/renderer/src/views/prepare/container/class-start.vue

@@ -146,6 +146,7 @@ const open = async (id, classObj) => {
     await getAptInfo(id)
     // 获取班级列表
     getClassList()
+    console.log('classObj', classObj)
     // 继续上课
     if (!!classObj) {
       dt.ctCourse = classObj
@@ -304,11 +305,11 @@ const classTeachingStart = async () => {
   const { classcourseid:id } = teacherForm.form
   if (id) { // 开始上课
     // 新版-pptList 打开公屏
-    if (myClassActive.value.filetype == 'aptist') {
+    if (myClassActive.value.filetype == 'aippt') {
       const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
       setTimeout(async () => {
         msgEl.close()
-        const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
+        const res = await Http_Classcourse.getClasscourse(id)
         openPublicScreen(res.data)
       }, 2000);
     }else {
@@ -316,6 +317,8 @@ const classTeachingStart = async () => {
       toLinkWeb(url)        // 跳转web-公屏
       visible.value = false // 关闭弹窗
     }
+  } else {
+    ElMessage.warning('请先创建课程')
   }
 }
 // 获取二维码地址
@@ -354,9 +357,11 @@ 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)
+  if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
+    // 发送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) // 缓存当前资源信息

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -196,7 +196,7 @@ export default {
       }
     },*/
     clickStartClass(item) {
-      const isApt = item.fileFlag === 'apt'
+      const isApt = ['apt','aippt'].includes(item.fileFlag)
       this.getOpenCourse(isApt).then(res => {
         console.log(res)
         if(!res){

src/renderer/src/views/prepare/index.vue

@@ -380,7 +380,7 @@ export default {
         }
         case 'close': { // 关闭上课
           const head = MsgEnum.HEADS.MSG_closed // closed
-          const msgT = MsgEnum.TYPES.TEACHER    // teacher
+          // const msgT = MsgEnum.TYPES.TEACHER    // teacher
           const isApt = !row.bookImg // bookImg ppt 否则Apt
           row.ex3 == 'undefined' && (row.ex3 = null)
           const timgroupid = isApt ? row.timgroupid : row.ex3 // ex3 ppt 否则Apt
@@ -392,12 +392,13 @@ export default {
           }
           // 发送-下课消息
           if (!!timgroupid) {
-            const msg = { msgKey: head, actor: msgT, classcourseid: row.id }
-            Chat.sendMsg(timgroupid, msg)
+            // const msg = { msgKey: head, actor: msgT, classcourseid: row.id }
+            // Chat.sendMsg(timgroupid, msg)
+            await ChatWs.closedCourse(timgroupid)
           }
           if (isApt) { // Apt
             // 接口-修改状态
-            await updateClasscourse({ id: row.id, status: head, timgroupid: '' })
+            await updateClasscourse({ id: row.id, status: head })
           } else {  // PPT
             const toolStore = useToolState()
             // 窗口已打开，直接关闭
@@ -410,15 +411,15 @@ export default {
           }
           // 解散群
           setTimeout(async() => {
-            if (!!timgroupid) await Chat.dismissGroup(timgroupid)
+            // if (!!timgroupid) await Chat.dismissGroup(timgroupid)
             if (other.type == 1) { // 弹窗-下课
               other.instance.confirmButtonLoading = false
               other.instance.confirmButtonText = '下课'
               other.done()
-            } else {
+            } else { // 列表-下课
               other.loading.value = false
               row.status = isApt ? head : '已结束'
-            }   
+            }
             ElMessage({ type: 'success', message: `下课成功！` })
           }, 1000)
           break
@@ -1130,6 +1131,7 @@ export default {
       position: absolute;
       right: 10px;
       top: 4px;
+      z-index: 10;
     }
     .prepare-center-jxkj{
       height: 100%;

src/renderer/src/views/profile/cropperImage.vue

@@ -11,7 +11,7 @@
           <!-- 裁剪+效果 -->
           <div class="box">
             <div class="box_1">
-              <img :src="dev_api + filePath" ref="image" />
+              <img :src="filePath" ref="image" />
             </div>
 
             <!--裁剪完的图片-->
@@ -164,7 +164,7 @@ export default {
     // 页面刷新自动执行
     onMounted(() => {
       if (props.filePath) {
-        dataFile.image.src = dev_api.value + props.filePath;
+        dataFile.image.src = props.filePath;
         copper();
       }
     });

src/renderer/src/views/profile/index.vue

@@ -4,7 +4,7 @@
       <userAvatar />
       <div class="info">
         <div class="info-name">{{ state.user.nickName }}</div>
-        <div class="infomation">
+        <div class="infomation" v-if="isStadium() !== true" >
           <selectClass v-if="!isSubject"/>
         </div>
       </div>
@@ -35,7 +35,7 @@ import { getUserProfile } from '@/api/system/user'
 import pkc from "../../../../../package.json"
 //选择学校和班级
 import selectClass from './components/selectClass.vue'
-
+import useUserStore from '@/store/modules/user'
 
 const version = ref(pkc.version)
 const activeTab = ref('userinfo')
@@ -46,6 +46,12 @@ const state = reactive({
   postGroup: {}
 })
 
+const isStadium = () => {
+  let user = useUserStore().user
+  let roles = user.roles
+  return  roles.some(item => item.roleKey === 'stadium')
+}
+
 const isSubject = ref(false)
 async function getUser() {
   getUserProfile().then((response) => {

src/renderer/src/views/profile/userAvatar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="user-info-head" @click="editCropper()">
-    <img :src="dev_api + options.img" title="点击上传头像" class="img-circle img-lg" />
+    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
     <el-dialog
       v-model="open"
       append-to-body
@@ -23,6 +23,7 @@ import { uploadAvatar } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 import CropperImage from './cropperImage.vue'
+import defaultUserImg from '@/assets/images/img-avatar.png'
 
 const userStore = useUserStore()
 
@@ -32,7 +33,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
 //图片裁剪数据
 const options = reactive({
-  img: userStore.user.avatar, // 裁剪图片的地址
+  img: userStore.user.avatar ==='/img/avatar-default.jpg' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 400, // 默认生成截图框宽度
   autoCropHeight: 400, // 默认生成截图框高度
@@ -40,7 +41,6 @@ const options = reactive({
   outputType: 'png', // 默认生成截图为PNG格式
   previews: {} //预览数据
 })
-
 const cropper = ref(null)
 
 /** 编辑头像 */
@@ -69,7 +69,7 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar
+  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' ? defaultUserImg : dev_api.value + userStore.user.avatar
   options.visible = false
 }
 const cancle = () => {

src/renderer/src/views/profile/userInfo.vue

@@ -8,7 +8,7 @@
     </el-form-item>
     <el-form-item label="所属学校" prop="identity">
         <div style="display: flex;">
-          <div>{{ userStore.DeptInfo.register.schoolName }}</div>
+          <div>{{ userStore.DeptInfo.register ? userStore.DeptInfo.register.schoolName : '' }}</div>
           <div>
             <el-button type="primary" link>更改学校</el-button>
           </div>

src/renderer/src/views/teachingDesign/container/right.vue

@@ -432,8 +432,8 @@ const toRousrceUrl = async(o) => {
   if (o?.background?.image) await toRousrceUrl(o.background.image)
   if(o?.elements){
           for (let element of o.elements) {
-              await this.toRousrceUrl(element);
-          } 
+              await toRousrceUrl(element);
+          }
        }
 }
 // ======== zdg end ============