From 5d6c946e0814f86b13cbf6a0a4fe2b1485a2cea8 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Mon, 16 Dec 2024 17:49:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/AixPPTist/src/api/chat.ts    | 23 +++++++++++++++++++
 src/renderer/src/AixPPTist/src/api/index.ts   | 10 +++++++-
 src/renderer/src/AixPPTist/src/api/watcher.ts |  1 +
 .../AixPPTist/src/views/Screen/BaseView.vue   | 11 +++++++++
 .../src/views/Screen/PresenterView.vue        | 10 ++++++++
 src/renderer/src/plugins/socket/index.js      |  3 ---
 src/renderer/src/utils/tool.js                |  2 +-
 .../src/views/classTask/teachClassTask.vue    |  7 +++++-
 8 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 src/renderer/src/AixPPTist/src/api/chat.ts

diff --git a/src/renderer/src/AixPPTist/src/api/chat.ts b/src/renderer/src/AixPPTist/src/api/chat.ts
new file mode 100644
index 0000000..92a5806
--- /dev/null
+++ b/src/renderer/src/AixPPTist/src/api/chat.ts
@@ -0,0 +1,23 @@
+/**
+ * 统一处理消息 发送 避免找不到
+ */
+
+import ChatWs from '@/plugins/socket' // 聊天socket
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
+
+export default () => {
+  const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
+  const timgroupid = classcourse?.timgroupid // 群组id
+  if (!ChatWs.ws) ChatWs.init()
+  // 下课消息
+  const exitCourse = async() => {
+    if(!timgroupid) throw new Error('未获取到群组ID')
+    await updateClasscourse({ id: classcourse.id, status: 'closed' })
+    return ChatWs.closedCourse(timgroupid)
+  }
+  return {
+    exitCourse,
+    classcourse,
+    groupid: timgroupid,
+  }
+}
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/api/index.ts b/src/renderer/src/AixPPTist/src/api/index.ts
index 685c367..203ba3e 100644
--- a/src/renderer/src/AixPPTist/src/api/index.ts
+++ b/src/renderer/src/AixPPTist/src/api/index.ts
@@ -258,6 +258,7 @@ export class PPTApi {
 }
 
 export class Homework{
+  static win: null  // 作业弹窗
   // 作业弹窗
   static async showHomework(id: any) {
     let result = await getClassWorkList(id)
@@ -265,7 +266,14 @@ export class Homework{
       localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
       toolStore.isTaskWin=true; // 设置打开批改窗口
     //   emit('closeActive')
-      createWindow('open-taskwin',{url:'/teachClassTask'}); 
+    // 重复打开，先关闭弹窗
+    // if (this.win) this.win?.close?.()
+    this.win = await createWindow('open-taskwin',{url:'/teachClassTask'})
+     return this.win;
+  }
+  static closeHomework() {
+    if (this.win) this.win?.close?.()
+    this.win = null
   }
 }
 export default PPTApi
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index f5d91cb..d4cea21 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -122,4 +122,5 @@ export default () => {
       window.close() // 关闭窗口
     }, 1000)
   }
+
 }
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
index ae2add1..c8ef0b3 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@@ -52,6 +52,7 @@
         <IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
         <IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
         <IconPower class="tool-btn" v-tooltip="'结束放映'" @click="exitScreening()" />
+        <IconPower class="tool-btn" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
       </div>
     </div>
   </div>
@@ -74,6 +75,7 @@ import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 import emitter from '@/utils/mitt';
+import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
@@ -103,6 +105,7 @@ const {
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
 const rightToolsVisible = ref(false)
 const writingBoardToolVisible = ref(false)
@@ -192,6 +195,14 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
+
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
+
 // 打开点赞或者疑问 1点赞 2疑问
 emitter.on('upvoteTrigger', (type) => {
   upvoteRef.value?.trigger(type)
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
index 4d2076d..aabc72a 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
@@ -12,6 +12,7 @@
       </div>
       <Divider class="divider" />
       <div class="tool-btn" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
+      <div class="tool-btn" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
     </div>
 
     <div class="content">
@@ -94,6 +95,7 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import Divider from '../../components/Divider.vue'
+import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
@@ -122,12 +124,20 @@ const { slideWidth, slideHeight } = useSlideSize(slideListWrapRef)
 const { exitScreening } = useScreening()
 const { slidesLoadLimit } = useLoadSlides()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
+const chat:any = Chat() // 聊天室
 
 const remarkFontSize = ref(16)
 const currentSlideRemark = computed(() => {
   return parseText2Paragraphs(currentSlide.value.remark || '无备注')
 })
 
+// 下课
+const exitCourse = async () => {
+  // console.log('下课', chat)
+  await chat.exitCourse() // 下课消息
+  exitScreening() // 结束放映
+}
+
 const handleMousewheelThumbnails = (e: WheelEvent) => {
   if (!thumbnailsRef.value) return
   thumbnailsRef.value.scrollBy(e.deltaY, 0)
diff --git a/src/renderer/src/plugins/socket/index.js b/src/renderer/src/plugins/socket/index.js
index 5e9870f..5d9cd6c 100644
--- a/src/renderer/src/plugins/socket/index.js
+++ b/src/renderer/src/plugins/socket/index.js
@@ -167,9 +167,6 @@ export class ChatWs {
     return new Promise((resolve, reject) => {
       this.sendMsg('closed', '下课', null, 'group', id)
       resolve()
-      // setTimeout(() => {
-      //   this.close() // 关闭链接
-      // }, 1000);
     })
   }
   // 延时 ms 毫秒
diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index 02aeae2..9673f11 100644
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@@ -225,7 +225,7 @@ export const createWindow = async (type, data) => {
         .filter(k => typeof data[k] === 'function')
         .forEach(k => events[k] = data[k])
       eventHandles(type, win, events) // 事件监听处理
-      break
+      return win
     }
     default:
       break
diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue
index 3db91ae..83b5ec9 100644
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@@ -163,8 +163,10 @@ import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
 import {sessionStore} from '@/utils/store'
 // import Chat from '@/utils/chat' // im 登录初始化
+import { Homework } from '@/AixPPTist/src/api/index'
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
 import ChatWs from '@/plugins/socket' // 聊天socket
+import { set } from 'lodash'
 if (!ChatWs.ws) ChatWs.init()
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
@@ -719,14 +721,17 @@ const msgHandle = (msg) => {
     const { head, content, ...other } = msg
     switch(head) {
       case MsgEnum.HEADS.MSG_closed: // 下课:
+          Homework.win = null
           window.close() // 关闭窗口
       break 
       case MsgEnum.HEADS.MSG_finishHomework: // 跟新作业:
+        console.log('更新作业', head, content)
         const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
         openDialog(data, false);
       break
       case MsgEnum.HEADS.MSG_slideFlapping: // 切换页面
         console.log('切换页面-关闭窗口')
+        Homework.win = null
         window.close() // 关闭窗口
       break
       // case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
@@ -769,7 +774,7 @@ onMounted(() => {
       console.log('socket监听消息')
       ChatWs.watch((msg, e) => {
         try {
-          msgHandle(JSON.parse(msg))
+          msgHandle(JSON.parse(msg)?.msg)
         } catch (error) {
           console.error('socket 解析异常 ', error, e)
           msgHandle(msg)
-- 
2.44.0.windows.1


From 0d38a1209478e55ace242a736f166db21f0b45df Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Tue, 17 Dec 2024 17:34:47 +0800
Subject: [PATCH 2/3] ppt

---
 src/renderer/src/AixPPTist/src/api/chat.ts    |  3 +-
 .../src/AixPPTist/src/api/classcourse.ts      | 29 ++++++---
 src/renderer/src/AixPPTist/src/api/watcher.ts |  7 ++-
 .../AixPPTist/src/views/Screen/BaseView.vue   | 60 +++++++++++--------
 .../src/views/Screen/PresenterView.vue        | 19 ++++--
 .../src/views/Screen/hooks/useExecPlay.ts     | 22 +++++--
 .../src/views/classManage/reserv-item-apt.vue |  6 +-
 7 files changed, 95 insertions(+), 51 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/api/chat.ts b/src/renderer/src/AixPPTist/src/api/chat.ts
index 92a5806..6cf016e 100644
--- a/src/renderer/src/AixPPTist/src/api/chat.ts
+++ b/src/renderer/src/AixPPTist/src/api/chat.ts
@@ -4,6 +4,7 @@
 
 import ChatWs from '@/plugins/socket' // 聊天socket
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
+import * as API_classcourse from '@/api/teaching/classcourse' // 后端api
 
 export default () => {
   const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
@@ -12,7 +13,7 @@ export default () => {
   // 下课消息
   const exitCourse = async() => {
     if(!timgroupid) throw new Error('未获取到群组ID')
-    await updateClasscourse({ id: classcourse.id, status: 'closed' })
+    await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'closed' })
     return ChatWs.closedCourse(timgroupid)
   }
   return {
diff --git a/src/renderer/src/AixPPTist/src/api/classcourse.ts b/src/renderer/src/AixPPTist/src/api/classcourse.ts
index e513f3c..7e7e3c3 100644
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@@ -7,13 +7,13 @@ 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 useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
+import emitter from '@/utils/mitt' //mitt 事件总线
+import { nextTick } from 'vue'
 
 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 // 提示消息对象
@@ -23,10 +23,12 @@ export class Classcourse {
   constructor() {
     this.load()
   }
+  // 延时
+  sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
   /**
    * @description 加载
    */
-  load() {
+  async load() {
     console.log('classcourse-load', classcourse)
     // 打开全屏
     const isCourse = !!classcourse
@@ -39,13 +41,22 @@ export class Classcourse {
       this.classcourse = classcourse // 课堂信息
       this.id = classcourse.id // 课堂id
       // 如果课堂信息有paging，则更新当前页码
-      const isPaging = !!classcourse.paging
-      if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
+      const { paging } = classcourse
+      const isPaging = !!paging || paging === 0
+      if (isPaging) {
+        console.log('更新当前页码', paging)
+        await this.sleep(200)
+        emitter.emit('useExecPlay', {key:'turnSlideToIndex', paging})
+        await this.sleep(1000)
         // 如果课堂信息有paging，则更新动画播放状态
-      const isAnim = !!classcourse.cartoonTimes
-      if (isAnim) { // 动画播放
-        for (let i = 0; i <= classcourse.cartoonTimes; i++) {
-          execPlay.runAnimation(true) // 异步执行动画
+        const isAnim = !!classcourse.cartoonTimes
+        if (isAnim) { // 动画播放
+          console.log('动画播放1', classcourse)
+          for (let i = 0; i < classcourse.cartoonTimes; i++) {
+            console.log('动画播放2', i)
+            // 异步执行动画
+            emitter.emit('useExecPlay', {key:'execNext', isAsync:true})
+          }
         }
       }
       // 课堂信息-状态管理
diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index d4cea21..ef9f65f 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -37,7 +37,8 @@ export default () => {
   
   // 监听幻灯片下标变化
   watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
-    PPTApi.updateWorkList()
+    if (!!Classcourse.id) return // 上课状态，不更新右侧作业列表
+    PPTApi.updateWorkList() // 更新作业列表
   })
   
   // 消息监听ws
@@ -91,7 +92,8 @@ export default () => {
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
           const slideIndex = content?.current || 0
           const type = content?.animation
-          if (type === 'Nextsteps') emitter.emit('useExecPlay', 'execNext') // 下一步
+          // if (type === 'Nextsteps') emitter.emit('useExecPlay', 'execNext') // 下一步
+          if (type === 'Nextsteps') emitter.emit('useExecPlay', {key:'execNext', isAsync:true}) // 下一步
           else if (type === 'Previoustep') emitter.emit('useExecPlay', 'turnPrevSlide') // 上一步清空-动画
           else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
           break
@@ -122,5 +124,4 @@ export default () => {
       window.close() // 关闭窗口
     }, 1000)
   }
-
 }
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
index c8ef0b3..fc4940a 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue
@@ -52,7 +52,7 @@
         <IconOffScreenOne class="tool-btn" v-tooltip="'退出全屏'" v-if="fullscreenState" @click="manualExitFullscreen()" />
         <IconFullScreenOne class="tool-btn" v-tooltip="'进入全屏'" v-else @click="enterFullscreen()" />
         <IconPower class="tool-btn" v-tooltip="'结束放映'" @click="exitScreening()" />
-        <IconPower class="tool-btn" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
+        <IconPower class="tool-btn close" v-if="chat.groupid" v-tooltip="'结束课堂'" @click="exitCourse()" />
       </div>
     </div>
   </div>
@@ -61,7 +61,7 @@
 <script lang="ts" setup>
 import { ref , watchEffect} from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore ,useScreenStore} from '../../store'
+import { useSlidesStore ,useScreenStore, useClasscourseStore} from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import useScreening from '../../hooks/useScreening'
@@ -76,12 +76,15 @@ import CountdownTimer from './CountdownTimer.vue'
 import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 import emitter from '@/utils/mitt';
 import Chat from '../../api/chat' // 聊天
+// import * as emits from './hooks/emitter'
+// emits.init() // 初始化事件
 
 const props = defineProps<{
   changeViewMode: (mode: 'base' | 'presenter') => void
 }>()
 
 const { slides, slideIndex } = storeToRefs(useSlidesStore())
+const { classcourse } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const {
   autoPlayTimer,
@@ -102,6 +105,26 @@ const {
   execNext,
   animationIndex,
 } = useExecPlay()
+// zdg: 使用方法才生效
+const execPlay = {
+  autoPlayTimer,
+  autoPlay,
+  closeAutoPlay,
+  autoPlayInterval,
+  setAutoPlayInterval,
+  loopPlay,
+  setLoopPlay,
+  mousewheelListener,
+  touchStartListener,
+  touchEndListener,
+  turnPrevSlide,
+  turnNextSlide,
+  turnSlideToIndex,
+  turnSlideToId,
+  execPrev,
+  execNext,
+  animationIndex,
+}
 const { slideWidth, slideHeight } = useSlideSize()
 const { exitScreening } = useScreening()
 const { fullscreenState, manualExitFullscreen } = useFullscreen()
@@ -207,39 +230,21 @@ const exitCourse = async () => {
 emitter.on('upvoteTrigger', (type) => {
   upvoteRef.value?.trigger(type)
 });
-// zdg: 使用方法才生效
-const execPlay = {
-  autoPlayTimer,
-  autoPlay,
-  closeAutoPlay,
-  autoPlayInterval,
-  setAutoPlayInterval,
-  loopPlay,
-  setLoopPlay,
-  mousewheelListener,
-  touchStartListener,
-  touchEndListener,
-  turnPrevSlide,
-  turnNextSlide,
-  turnSlideToIndex,
-  turnSlideToId,
-  execPrev,
-  execNext,
-  animationIndex,
-}
+
+// 监听
 emitter.on('useExecPlay', (data: string|any) => {
+  console.log('useExecPlay', data)
   if (!data) throw new Error('参数错误')
   if (typeof data === 'string') { // 字符串
     if (execPlay[data]) execPlay[data]()
     else throw new Error('方法不存在')
   } else { // 对象
-    const { method, ...params } = data || {}
-    if (execPlay[method]) execPlay[method](...params)
+    const { key, ...params } = data || {}
+    const paramsArray = Object.values(params)
+    if (execPlay[key]) execPlay[key](...paramsArray)
     else throw new Error('方法不存在')
   }
 })
-
-
 </script>
 
 <style lang="scss" scoped>
@@ -320,6 +325,9 @@ emitter.on('useExecPlay', (data: string|any) => {
     & + .tool-btn {
       margin-left: 15px;
     }
+    &.close{
+      color: #d14424;
+    }
   }
   .page-number {
     font-size: 13px;
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
index aabc72a..bca776e 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
+++ b/src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue
@@ -12,7 +12,7 @@
       </div>
       <Divider class="divider" />
       <div class="tool-btn" @click="exitScreening()"><IconPower class="tool-icon" /><span>结束放映</span></div>
-      <div class="tool-btn" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
+      <div class="tool-btn close" @click="exitCourse()" v-if="chat.groupid"><IconPower class="tool-icon" /><span>结束课堂</span></div>
     </div>
 
     <div class="content">
@@ -56,7 +56,7 @@
           :class="{ 'active': index === slideIndex }"
           v-for="(slide, index) in slides" 
           :key="slide.id"
-          @click="turnSlideToIndex(index)"
+          @click="turnSlideTo(index, $event)"
         >
           <ThumbnailSlide :slide="slide" :size="120 / viewportRatio" :visible="index < slidesLoadLimit" />
         </div>
@@ -80,7 +80,7 @@
 <script lang="ts" setup>
 import { computed, nextTick, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../store'
+import { useSlidesStore, useClasscourseStore } from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
 import { enterFullscreen } from '../../utils/fullscreen'
 import { parseText2Paragraphs } from '../../utils/textParser'
@@ -102,6 +102,7 @@ const props = defineProps<{
 }>()
 
 const { slides, slideIndex, viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
+const { classcourse } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const slideListWrapRef = ref<HTMLElement>()
 const thumbnailsRef = ref<HTMLElement>()
@@ -131,6 +132,13 @@ const currentSlideRemark = computed(() => {
   return parseText2Paragraphs(currentSlide.value.remark || '无备注')
 })
 
+// 切换到指定的幻灯片
+const turnSlideTo = (index: number, e: PointerEvent) => {
+  // 课堂信息存在时，不允许翻页
+  console.log('课堂信息', classcourse, index)
+  if (!!classcourse.value) return
+  turnSlideToIndex(index)
+}
 // 下课
 const exitCourse = async () => {
   // console.log('下课', chat)
@@ -218,7 +226,7 @@ const contextmenus = (): ContextmenuItem[] => {
   background-color: #fff;
   border-right: solid 1px #eee;
   font-size: 12px;
-  margin: 20px 0;
+  padding: 20px 0;
 
   .tool-btn {
     display: flex;
@@ -234,6 +242,9 @@ const contextmenus = (): ContextmenuItem[] => {
     &:hover, &.active {
       color: $themeColor;
     }
+    &.close{
+      color: #d14424;
+    }
   }
 
   .divider {
diff --git a/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts b/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
index 4b0016c..b0b6777 100644
--- a/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
+++ b/src/renderer/src/AixPPTist/src/views/Screen/hooks/useExecPlay.ts
@@ -1,13 +1,14 @@
 import { onMounted, onUnmounted, ref } from 'vue'
 import { throttle } from 'lodash'
 import { storeToRefs } from 'pinia'
-import { useSlidesStore } from '../../../store'
+import { useSlidesStore, useClasscourseStore } from '../../../store'
 import { KEYS } from '../../../configs/hotkey'
 import { ANIMATION_CLASS_PREFIX } from '../../../configs/animation'
 import message from '../../../utils/message'
 
 export default () => {
   const slidesStore = useSlidesStore()
+  const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
   const { slides, slideIndex, formatedAnimations } = storeToRefs(slidesStore)
 
   // 当前页的元素动画执行到的位置
@@ -121,9 +122,9 @@ export default () => {
   // 遇到元素动画时，优先执行动画播放，无动画则执行翻页
   // 向上播放遇到动画时，仅撤销到动画执行前的状态，不需要反向播放动画
   // 撤回到上一页时，若该页从未播放过（意味着不存在动画状态），需要将动画索引置为最小值（初始状态），否则置为最大值（最终状态）
-  const execPrev = () => {
+  const execPrev = (isAsync: boolean) => {
     if (formatedAnimations.value.length && animationIndex.value > 0) {
-      revokeAnimation()
+      revokeAnimation(isAsync)
     }
     else if (slideIndex.value > 0) {
       slidesStore.updateSlideIndex(slideIndex.value - 1)
@@ -139,9 +140,10 @@ export default () => {
     }
     inAnimation.value = false
   }
-  const execNext = () => {
+  const execNext = (isAsync: boolean) => {
+    console.log('execNext', isAsync)
     if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
-      runAnimation()
+      runAnimation(isAsync)
     }
     else if (slideIndex.value < slides.value.length - 1) {
       slidesStore.updateSlideIndex(slideIndex.value + 1)
@@ -173,7 +175,13 @@ export default () => {
   }
 
   // 鼠标滚动翻页
-  const mousewheelListener = throttle(function(e: WheelEvent) {
+  const mousewheelListener = (e: WheelEvent) => {
+    // console.log('mousewheel', e)
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) e.preventDefault()
+    mousewheelListenerThrottle(e)
+  }
+  const mousewheelListenerThrottle = throttle(function(e: WheelEvent) {
     if (e.deltaY < 0) turning(e, 'prev')
     else if (e.deltaY > 0) turning(e, 'next')
   }, 500, { leading: true, trailing: false })
@@ -203,6 +211,8 @@ export default () => {
   // 向上翻页/向下翻页
   const turning = (e, type) => {
     e.preventDefault() // 阻止默认事件
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) return
     if (type === 'prev') execPrev()
     else if (type === 'next') execNext()
   }
diff --git a/src/renderer/src/views/classManage/reserv-item-apt.vue b/src/renderer/src/views/classManage/reserv-item-apt.vue
index 67fb1ec..320509b 100644
--- a/src/renderer/src/views/classManage/reserv-item-apt.vue
+++ b/src/renderer/src/views/classManage/reserv-item-apt.vue
@@ -23,7 +23,8 @@
     </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>-->
-      <el-tag>APT</el-tag>
+      <!-- <el-tag>APT</el-tag> -->
+      <el-tag>AIPPT</el-tag>
     </div>
     <div style="min-width: 150px;"><span> 浏览：25955 点赞：26605</span></div>
   </div>
@@ -85,6 +86,7 @@ const chatSend = () => {
 <style scoped lang="scss">
 .class-reserv-item {
   display: flex;
+  align-items: center;
   background-color: white;
   border-radius: 10px;
   padding: 5px;
@@ -110,7 +112,7 @@ const chatSend = () => {
     }
   }
   .class-reserv-item-tool {
-    margin-left: 15px;
+    margin: 0 7px;
     display: flex;
     align-items: center;
   }
-- 
2.44.0.windows.1


From abce344d42d2b15efb581f0d6d58754ae85e5b44 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Tue, 17 Dec 2024 17:35:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ppt=20=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/AixPPTist/src/api/classcourse.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/api/classcourse.ts b/src/renderer/src/AixPPTist/src/api/classcourse.ts
index 7e7e3c3..b41091e 100644
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@@ -44,16 +44,13 @@ export class Classcourse {
       const { paging } = classcourse
       const isPaging = !!paging || paging === 0
       if (isPaging) {
-        console.log('更新当前页码', paging)
         await this.sleep(200)
         emitter.emit('useExecPlay', {key:'turnSlideToIndex', paging})
         await this.sleep(1000)
         // 如果课堂信息有paging，则更新动画播放状态
         const isAnim = !!classcourse.cartoonTimes
         if (isAnim) { // 动画播放
-          console.log('动画播放1', classcourse)
           for (let i = 0; i < classcourse.cartoonTimes; i++) {
-            console.log('动画播放2', i)
             // 异步执行动画
             emitter.emit('useExecPlay', {key:'execNext', isAsync:true})
           }
-- 
2.44.0.windows.1