package.json

@@ -92,8 +92,6 @@
     "tinycolor2": "^1.6.0",
     "tinymce": "6.8.3",
     "tippy.js": "^6.3.7",
-    "v-viewer": "^3.0.11",
-    "viewerjs": "^1.11.7",
     "vite-plugin-electron": "^0.28.8",
     "vue": "^3.4.34",
     "vue-cropper": "1.0.3",

src/renderer/src/AixPPTist/src/api/chat.ts

@@ -4,51 +4,21 @@
 
 import ChatWs from '@/plugins/socket' // 聊天socket
 import { sessionStore } from '@/utils/store' // electron-store 状态管理
-import { useClasscourseStore } from '../store'
 import * as API_classcourse from '@/api/teaching/classcourse' // 后端api
-import { MsgEnum } from './types'
-// import msgUtils from '@/plugins/modal' // 消息工具
 
 export default () => {
   const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
-  const courseId = classcourse?.id // 课堂id
   const timgroupid = classcourse?.timgroupid // 群组id
-  const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
   if (!ChatWs.ws) ChatWs.init()
-  // 开课消息
-  const startCourse = async() => {
-    // await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'open' })
-    ChatWs.sendMsg('open', {id: courseId})
-    return Promise.resolve()
-  }
   // 下课消息
   const exitCourse = async() => {
     if(!timgroupid) throw new Error('未获取到群组ID')
-    await API_classcourse.updateClasscourse({ id: courseId, status: 'closed' })
+    await API_classcourse.updateClasscourse({ id: classcourse.id, status: 'closed' })
     return ChatWs.closedCourse(timgroupid)
   }
-  // 翻页消息
-  const slideFlapping = (msg:object) => {
-    return new Promise(async (resolve, reject) => {
-      const isWs = !!ChatWs.ws && ChatWs.ws.readyState === 1 // 是否有socket连接
-      if(!timgroupid) return reject('未获取到群组ID')
-      else if(!isWs) return reject('信异常，请重试！')
-      const {current: paging, animation: cartoonTimes} = msg || {}
-      const head = MsgEnum.HEADS.MSG_slideFlapping
-      ChatWs.sendMsg(head, msg) // 发送消息
-      API_classcourse.setPaging({ id: courseId, paging, cartoonTimes})
-      // 更新本地缓存
-      sessionStore.set('curr.classcourse.paging', paging)
-      sessionStore.set('curr.classcourse.cartoonTimes', cartoonTimes)
-      classcourseStore.classcourse.paging = paging
-      classcourseStore.classcourse.cartoonTimes = cartoonTimes
-      return resolve(true)
-    })
-  }
   return {
-    groupid: timgroupid,
-    classcourse,
     exitCourse,
-    slideFlapping,
+    classcourse,
+    groupid: timgroupid,
   }
 }

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

@@ -14,7 +14,6 @@ const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
 const screenStore = useStore.useScreenStore() // 全屏-状态管理
 const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
 const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
-const isPublic = sessionStore.get('curr.isPublic') // 是否公屏开课
 
 export class Classcourse {
   msgObj:ElMessageBox = null // 提示消息对象
@@ -37,22 +36,26 @@ export class Classcourse {
     // 如果课堂信息有值，则连接socket
     if (isCourse) {
       // 连接socket
+      if (!ChatWs.ws) ChatWs.init()
       ChatWs.id = classcourse.timgroupid // 群组id
-      if (!ChatWs.ws) {
-        ChatWs.init().then(_ => {
-          isPublic && ChatWs.sendMsg('open', {id: classcourse.id})
-          // isPublic && console.log('socket-开课消息-已发送')
-        })
-      }
       this.classcourse = classcourse // 课堂信息
       this.id = classcourse.id // 课堂id
       // 如果课堂信息有paging，则更新当前页码
-      const { paging, cartoonTimes } = classcourse
+      const { paging } = classcourse
       const isPaging = !!paging || paging === 0
-      // 如果课堂信息有paging，则更新动画播放状态
+      if (isPaging) {
-      const isAnim = !!cartoonTimes || cartoonTimes === 0
+        await this.sleep(200)
-      if (isPaging) slidesStore.updateSlideIndex(paging)
+        emitter.emit('useExecPlay', {key:'turnSlideToIndex', paging})
-      if (isAnim) slidesStore.updateAnimationIndex(cartoonTimes)
+        await this.sleep(1000)
+        // 如果课堂信息有paging，则更新动画播放状态
+        const isAnim = !!classcourse.cartoonTimes
+        if (isAnim) { // 动画播放
+          for (let i = 0; i < classcourse.cartoonTimes; i++) {
+            // 异步执行动画
+            emitter.emit('useExecPlay', {key:'execNext', isAsync:true})
+          }
+        }
+      }
       // 课堂信息-状态管理
       classcourseStore.setClasscourse(classcourse)
       // 待上课提示

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

@@ -124,8 +124,6 @@ export class MsgEnum {
     MSG_classlecturePagesrc : 'classlecturePagesrc',
     /** @desc: 课堂作业|活动 */
     MSG_homework : 'HOMEWORK',
-    /** @desc: 公屏 - 课堂作业|活动 */
-    MSG_pushSreen_work : 'pushSreen-work',
     /** @desc: 点赞 */
     MSG_dz : 'dz',
     /** @desc: 疑惑 */

src/renderer/src/AixPPTist/src/api/upvote.ts

@@ -1,33 +0,0 @@
-/**
- * 点赞组件-相关
- */
-export default class Upvote {
-  instance: any = null // 自身实例
-  upvoteRef: any = null // 点赞组件
-  constructor(elRef?: any) {
-    if(!!elRef) this.upvoteRef = elRef // 点赞组件
-    if (!Upvote.Instance) {
-      Upvote.Instance = this
-    }
-    return Upvote.Instance
-  }
-
-  // 初始化
-  init(elRef) {
-    if(!!elRef) this.upvoteRef = elRef // 点赞组件
-    return this
-  }
-  // 打开点赞或者疑问 1点赞 2疑问
-  trigger(type) {
-    this.upvoteRef?.value?.trigger?.(type)
-    return this
-  }
-  // 静态方法-初始化
-  static init(elRef) {
-    return new Upvote(elRef)
-  }
-  // 静态方法-打开点赞或者疑问 1点赞 2疑问
-  static trigger(type) {
-    return new Upvote().trigger(type)
-  }
-}

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

@@ -11,9 +11,8 @@ import ChatWs from '@/plugins/socket' // 聊天socket
 import Classcourse from './classcourse' // 课程相关
 import msgUtils from '@/plugins/modal' // 消息工具
 import { Homework } from './index' // api-作业相关
-// import emitter from '@/utils/mitt' //mitt 事件总线
+import emitter from '@/utils/mitt' //mitt 事件总线
 import useExecPlay from '../views/Screen/hooks/useExecPlay' // 播放控制
-import hooksUpvote from './upvote' // 点赞-工具
 
 /**
  * @description 监听器
@@ -23,7 +22,7 @@ export default () => {
   const classcourseStore = store.useClasscourseStore() // 课堂信息-状态管理
   const resource = sessionStore.get('curr.resource') // apt 资源
   const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
-  const { execNext, turnPrevSlide } = useExecPlay(false) // 不加载钩子
+  const execPlay = useExecPlay() // 播放控制
   // 监听幻灯片内容变化
   watch(() => slidesStore.slides, (newVal, oldVal) => {
     PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -99,23 +98,23 @@ export default () => {
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
           const slideIndex = content?.current || 0
           const type = content?.animation
-          if (type === 'Nextsteps') execNext(true) // 下一步-异步动画
+          // if (type === 'Nextsteps') emitter.emit('useExecPlay', 'execNext') // 下一步
-          else if (type === 'Previoustep') turnPrevSlide() // 上一步清空-动画
+          if (type === 'Nextsteps') emitter.emit('useExecPlay', {key:'execNext', isAsync:true}) // 下一步
+          else if (type === 'Previoustep') emitter.emit('useExecPlay', 'turnPrevSlide') // 上一步清空-动画
           else slidesStore.updateSlideIndex(slideIndex) // 更新幻灯片下标
           break
-        // case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置 不处理
+        case MsgEnum.HEADS.MSG_homework: // 作业|活动-布置
-        case MsgEnum.HEADS.MSG_pushSreen_work: // 打开-作业|活动
+          if (!content.classWorkId) return
-          if (!content.id) return
+          Homework.showHomework(content.classWorkId)
-          Homework.showHomework(content.id)
           break
         case MsgEnum.HEADS.MSG_closed: // 下课:
           close()
           break
         case MsgEnum.HEADS.MSG_dz: // 点赞
-          hooksUpvote.trigger(1)
+          emitter.emit('upvoteTrigger', 1)
           break
         case MsgEnum.HEADS.MSG_yh: // 疑惑
-          hooksUpvote.trigger(2)
+          emitter.emit('upvoteTrigger', 2)
           break
         case MsgEnum.HEADS.MSG_0010: // 备用
           break

src/renderer/src/AixPPTist/src/store/classcourse.ts

@@ -3,21 +3,16 @@ import type { Classcourse } from '../api/types'
 
 export interface ClasscourseState {
   classcourse: Classcourse | any, // 课堂信息
-  isEmit: boolean, // 是否加载监听事件(动画播放)
 }
 
 export const useClasscourseStore = defineStore('classcourse', {
   state: (): ClasscourseState => ({
     classcourse: null, // 课堂信息
-    isEmit: false, // 是否加载监听事件(动画播放)
   }),
 
   actions: {
     setClasscourse(classcourse: Classcourse) {
       this.classcourse = classcourse
     },
-    setIsEmit(isEmit: boolean) {
-      this.isEmit = isEmit
-    },
   },
 })

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

@@ -33,8 +33,7 @@ export interface SlidesState {
   slides: Slide[]
   slideIndex: number
   viewportSize: number
-  viewportRatio: number,
+  viewportRatio: number
-  animationIndex: number, // 不是从0开始
   workList:Object[],
   workItem:Object[],
 }
@@ -47,7 +46,6 @@ export const useSlidesStore = defineStore('slides', {
     slideIndex: 0, // 当前页面索引
     viewportSize: 1000, // 可视区域宽度基数
     viewportRatio: 0.5625, // 可视区域比例，默认16:9
-    animationIndex: 0, // 不是从0开始
     workList:[],// 活动的列表
     workItem:[],// 获取到的所有pptlist
   }),
@@ -208,9 +206,6 @@ export const useSlidesStore = defineStore('slides', {
     updateSlideIndex(index: number) {
       this.slideIndex = index
     },
-    updateAnimationIndex(index: number) {
-      this.animationIndex = index
-    },
   
     addElement(element: PPTElement | PPTElement[]) {
       const elements = Array.isArray(element) ? element : [element]

src/renderer/src/AixPPTist/src/views/Screen/BaseView.vue

@@ -30,10 +30,14 @@
       @close="timerlVisible = false" 
     />
 
-    <div class="tools-left" v-if="!classcourse">
+    <div class="tools-left">
       <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"  type="2"></upvote-vue>
+    </div>
     <div 
       class="tools-right" :class="{ 'visible': rightToolsVisible }" 
       @mouseleave="rightToolsVisible = false"
@@ -55,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref , watchEffect, onMounted, onUnmounted} from 'vue'
+import { ref , watchEffect} from 'vue'
 import { storeToRefs } from 'pinia'
 import { useSlidesStore ,useScreenStore, useClasscourseStore} from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
@@ -69,15 +73,18 @@ 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' // 点赞-子组件
 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, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
+const { classcourse } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const {
   autoPlayTimer,
@@ -98,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()
@@ -108,6 +135,7 @@ const writingBoardToolVisible = ref(false)
 const timerlVisible = ref(false)
 const slideThumbnailModelVisible = ref(false)
 const laserPen = ref(false)
+const upvoteRef = ref(null)
 const screenStore =useScreenStore()
 const contextmenus = (): ContextmenuItem[] => {
   return [
@@ -198,6 +226,25 @@ const exitCourse = async () => {
   exitScreening() // 结束放映
 }
 
+// 打开点赞或者疑问 1点赞 2疑问
+emitter.on('upvoteTrigger', (type) => {
+  upvoteRef.value?.trigger(type)
+});
+
+// 监听
+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 { key, ...params } = data || {}
+    const paramsArray = Object.values(params)
+    if (execPlay[key]) execPlay[key](...paramsArray)
+    else throw new Error('方法不存在')
+  }
+})
 </script>
 
 <style lang="scss" scoped>

src/renderer/src/AixPPTist/src/views/Screen/PresenterView.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useSlidesStore, useClasscourseStore } from '../../store'
 import type { ContextmenuItem } from '../../components/Contextmenu/types'
@@ -95,7 +95,6 @@ import ScreenSlideList from './ScreenSlideList.vue'
 import WritingBoardTool from './WritingBoardTool.vue'
 import CountdownTimer from './CountdownTimer.vue'
 import Divider from '../../components/Divider.vue'
-import emitter from '@/utils/mitt';
 import Chat from '../../api/chat' // 聊天
 
 const props = defineProps<{
@@ -103,7 +102,7 @@ const props = defineProps<{
 }>()
 
 const { slides, slideIndex, viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
-const { classcourse, isEmit } = storeToRefs(useClasscourseStore()) // 课堂信息
+const { classcourse } = storeToRefs(useClasscourseStore()) // 课堂信息
 
 const slideListWrapRef = ref<HTMLElement>()
 const thumbnailsRef = ref<HTMLElement>()
@@ -121,6 +120,7 @@ const {
   turnSlideToId,
   animationIndex,
 } = useExecPlay()
+
 const { slideWidth, slideHeight } = useSlideSize(slideListWrapRef)
 const { exitScreening } = useScreening()
 const { slidesLoadLimit } = useLoadSlides()
@@ -210,7 +210,6 @@ const contextmenus = (): ContextmenuItem[] => {
     },
   ]
 }
-
 </script>
 
 <style lang="scss" scoped>

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

@@ -5,20 +5,14 @@ import { useSlidesStore, useClasscourseStore } from '../../../store'
 import { KEYS } from '../../../configs/hotkey'
 import { ANIMATION_CLASS_PREFIX } from '../../../configs/animation'
 import message from '../../../utils/message'
-import emitter from '@/utils/mitt';
-import Chat from '../../../api/chat' // 聊天封装
-// import ChatWs from '@/plugins/socket' // 聊天socket
-// import { MsgEnum } from '../../../api/types' // 消息枚举
 
-export default (isLoader?: boolean = true) => {
+export default () => {
-  // isLoader 是否执行 onMounted, onUnmounted
-  const chatApi = Chat()
   const slidesStore = useSlidesStore()
   const classcourseStore = useClasscourseStore() // 课堂信息-状态管理
-  const { slides, slideIndex, formatedAnimations, animationIndex } = storeToRefs(slidesStore)
+  const { slides, slideIndex, formatedAnimations } = storeToRefs(slidesStore)
 
   // 当前页的元素动画执行到的位置
-  // const animationIndex = ref(0)
+  const animationIndex = ref(0)
 
   // 动画执行状态
   const inAnimation = ref(false)
@@ -76,15 +70,14 @@ export default (isLoader?: boolean = true) => {
       elRef.addEventListener('animationend', handleAnimationEnd, { once: true })
     }
   }
-  if (isLoader) { // 加载相关钩子
+  
-    onMounted(() => {
+  onMounted(() => {
-      const firstAnimations = formatedAnimations.value[0]
+    const firstAnimations = formatedAnimations.value[0]
-      if (firstAnimations && firstAnimations.animations.length) {
+    if (firstAnimations && firstAnimations.animations.length) {
-        const autoExecFirstAnimations = firstAnimations.animations.every(item => item.trigger === 'auto' || item.trigger === 'meantime')
+      const autoExecFirstAnimations = firstAnimations.animations.every(item => item.trigger === 'auto' || item.trigger === 'meantime')
-        if (autoExecFirstAnimations) runAnimation()
+      if (autoExecFirstAnimations) runAnimation()
-      }
+    }
-    })
+  })
-  }
 
   // 撤销元素动画，除了将索引前移外，还需要清除动画状态
   const revokeAnimation = () => {
@@ -148,6 +141,7 @@ export default (isLoader?: boolean = true) => {
     inAnimation.value = false
   }
   const execNext = (isAsync: boolean) => {
+    console.log('execNext', isAsync)
     if (formatedAnimations.value.length && animationIndex.value < formatedAnimations.value.length) {
       runAnimation(isAsync)
     }
@@ -183,7 +177,8 @@ export default (isLoader?: boolean = true) => {
   // 鼠标滚动翻页
   const mousewheelListener = (e: WheelEvent) => {
     // console.log('mousewheel', e)
-    e.preventDefault() // 阻止默认事件
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) e.preventDefault()
     mousewheelListenerThrottle(e)
   }
   const mousewheelListenerThrottle = throttle(function(e: WheelEvent) {
@@ -214,17 +209,12 @@ export default (isLoader?: boolean = true) => {
     }
   }
   // 向上翻页/向下翻页
-  const turning = async (e, type) => {
+  const turning = (e, type) => {
     e.preventDefault() // 阻止默认事件
+    // 课堂信息存在时，不允许翻页
+    if (!!classcourseStore.classcourse) return
     if (type === 'prev') execPrev()
     else if (type === 'next') execNext()
-    if (classcourseStore.classcourse) { // 上课中
-      const current = slideIndex.value
-      const animation = animationIndex.value
-      const animationSteps = type == 'next'?'Nextsteps':'Previoustep'
-      const msg = { current, animation, animationSteps}
-      chatApi.slideFlapping(msg)
-    }
   }
   // 快捷键翻页
   const keydownListener = (e: KeyboardEvent) => {
@@ -239,11 +229,10 @@ export default (isLoader?: boolean = true) => {
       key === KEYS.PAGEDOWN
     ) turning(e, 'next')
   }
-  if (isLoader) { // 加载相关钩子
+
-    onMounted(() => {document.addEventListener('keydown', keydownListener)})
+  onMounted(() => document.addEventListener('keydown', keydownListener))
-    onUnmounted(() => {document.removeEventListener('keydown', keydownListener)})
+  onUnmounted(() => document.removeEventListener('keydown', keydownListener))
-  }
+
-  
   // 切换到上一张/上一张幻灯片（无视元素的入场动画）
   const turnPrevSlide = () => {
     slidesStore.updateSlideIndex(slideIndex.value - 1)

src/renderer/src/AixPPTist/src/views/Screen/index.vue

@@ -2,10 +2,6 @@
   <div class="pptist-screen">
     <BaseView :changeViewMode="changeViewMode" v-if="viewMode === 'base'" />
     <PresenterView :changeViewMode="changeViewMode" v-else-if="viewMode === 'presenter'" />
-    <!-- 点赞组件 -->
-    <upvote-vue ref="upvoteRef"  type="2"></upvote-vue>
-    <!-- <div style="z-index: 999;position: absolute;top:10px">
-    </div> -->
   </div>
 </template>
 
@@ -13,11 +9,9 @@
 import { onMounted, onUnmounted, ref } from 'vue'
 import { KEYS } from '../../configs/hotkey'
 import useScreening from '../../hooks/useScreening'
-import hooksUpvote from '../../api/upvote' // 点赞-工具
 
 import BaseView from './BaseView.vue'
 import PresenterView from './PresenterView.vue'
-import upvoteVue from '@/views/tool/components/upvote.vue' // 点赞-子组件
 
 const viewMode = ref<'base' | 'presenter'>('base')
 
@@ -26,8 +20,6 @@ const changeViewMode = (mode: 'base' | 'presenter') => {
 }
 
 const { exitScreening } = useScreening()
-const upvoteRef = ref(null)
-hooksUpvote.init(upvoteRef) // 初始化点赞
 
 // 快捷键退出放映
 const keydownListener = (e: KeyboardEvent) => {

src/renderer/src/api/teaching/classcourse.js

@@ -95,11 +95,3 @@ export function getCourseTeachingMsg(id) {
   })
 }
 
-export function setPaging(data) {
-  return request({
-    url: '/education/classcourse/record/paging',
-    method: 'post',
-    data
-  })
-}
-

src/renderer/src/components/grid-pic/index.vue

@@ -1,172 +0,0 @@
-<template>
-  <draggable handle=".header-btn" :draggable="false" item-key="backgroundColor" v-model="gridPicList" class="grid-pic-wrap" :style="getGrid">
-    <template #item="{ element, index }">
-      <div class="grid-pic-item" :key="element.backgroundColor" :style="getWH(element,index)">
-        <div class="delete-btn" @click="gridPicList.splice(index,1)">X</div>
-        <div class="header-btn"></div>
-        <ViewerItem :gridPicList="gridPicList" :index="index" :images="[element.src]"></ViewerItem>
-      </div>
-    </template>
-  </draggable>
-  <el-input style="position:fixed;bottom: 20px;right: 80px;width: 1000px" v-model="inputValue" type="text" />
-  <el-button class="add-btn" @click="addPic">
-    添加
-  </el-button>
-</template>
-
-<script setup>
-  import {ref, computed} from 'vue'
-  import Draggable from 'vuedraggable'
-  import ViewerItem from "./viewer-item.vue";
-
-  const gridPicList = ref([])
-  const inputValue = ref('')
-  // 获取图片样式
-  const getWH = (item,index)=>{
-    return {
-      backgroundColor: item.backgroundColor,
-      'grid-area': 'a' + index
-    }
-  }
-
-  // 获取grid样式
-  const getGrid = computed(() => {
-    switch (gridPicList.value.length) {
-      case 1:
-        return {
-          'grid-template-areas':
-          `"a0"`
-        }
-      case 2:
-        return {
-          'grid-template-areas':
-            `"a0 a1"`
-        }
-      case 3:
-        return {
-          'grid-template-areas':
-            `"a0 a1"
-            "a0 a2"`
-        }
-      case 4:
-        return {
-          'grid-template-areas':
-            `"a0 a2"
-            "a1 a3"`
-        }
-      case 5:
-        return {
-          'grid-template-areas':
-            `"a0 a2 a4"
-            "a1 a3 a4"`
-        }
-      case 6:
-        return {
-          'grid-template-areas':
-            `"a0 a2 a4"
-            "a1 a3 a5"`
-        }
-      case 7:
-        return {
-          'grid-template-areas':
-            `"a0 a2 a4"
-            "a0 a2 a4"
-            "a0 a2 a5"
-            "a1 a3 a5"
-            "a1 a3 a6"
-            "a1 a3 a6"`
-        }
-      case 8:
-        return {
-          'grid-template-areas':
-            `"a0 a3 a6"
-            "a0 a3 a6"
-            "a1 a4 a6"
-            "a1 a4 a7"
-            "a2 a5 a7"
-            "a2 a5 a7"`
-        }
-      case 9:
-        return {
-          'grid-template-areas':
-            `"a0 a3 a6"
-            "a1 a4 a7"
-            "a2 a5 a8"`
-        }
-      default:
-        return {
-          width: '100%',
-          height: '100%'
-        }
-    }
-  })
-
-  // 添加图片
-  const addPic = () => {
-    if (gridPicList.value.length >= 9) {
-      return
-    }
-    gridPicList.value.push({
-      src: inputValue.value,
-      backgroundColor: getRandomColor()
-    })
-    inputValue.value = ''
-  }
-  // 生成随机颜色
-  function getRandomColor() {
-    let r = Math.floor(Math.random() * 256).toString(16);
-    let g = Math.floor(Math.random() * 256).toString(16);
-    let b = Math.floor(Math.random() * 256).toString(16);
-    // 如果生成的十六进制数字只有一位，前面补0
-    r = r.length === 1? '0' + r : r;
-    g = g.length === 1? '0' + g : g;
-    b = b.length === 1? '0' + b : b;
-    return `#${r}${g}${b}`;
-  }
-
-</script>
-<style scoped lang="scss">
-.grid-pic-wrap{
-  width: 100%;
-  height: 100%;
-  display: grid;
-  overflow: hidden;
-  .grid-pic-item{
-    //animation: fadeIn 0.5s ease-in-out forwards;
-    background-color: #0a84ff;
-    position: relative;
-    .delete-btn{
-      position: absolute;
-      top: 0;
-      right: 10px;
-      z-index: 999;
-      &:hover{
-        color: #fff;
-        cursor: pointer;
-      }
-    }
-    .header-btn{
-      position: absolute;
-      z-index: 998;
-      height: 30px;
-      width: 100%;
-      border-bottom: 1px dotted #ccc;
-    }
-  }
-}
-.add-btn{
-  position: fixed;
-  right: 20px;
-  bottom: 20px;
-}
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-    transform: translateY(20px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-</style>

src/renderer/src/components/grid-pic/viewer-item.vue

@@ -1,59 +0,0 @@
-<template>
-  <viewer :ref="collectRef('viewerRef'+index)" :options="optins" :images="images" class="images clearfix">
-    <template #default="scope">
-      <img v-for="src in scope.images" :key="index" :src="src" style="display: none">
-    </template>
-  </viewer>
-</template>
-<script setup>
-import {ref, watch, nextTick} from "vue";
-
-const props = defineProps({
-  images: {
-    type: Object,
-    default: () => {}
-  },
-  index: {
-    type: Number,
-    default: 0
-  },
-  gridPicList: {
-    type: Array,
-    default: () => []
-  }
-})
-const refs = ref([]);
-
-const collectRef = (key) => {
-  return (el) => {
-    refs.value[key] = el;
-  };
-};
-//viewer配置
-const optins = {
-  "inline": true,
-  "button": false,
-  "navbar": false,
-  "title": false,
-  "toolbar": false,
-  "tooltip": true,
-  "movable": true,
-  "zoomable": true,
-  "rotatable": true,
-  "scalable": true,
-  "transition": true,
-  "fullscreen": true,
-  "keyboard": true
-}
-const initViewers = () => {
-  refs.value['viewerRef'+props.index]?.rebuildViewer()
-}
-watch(props.gridPicList, (newValue, oldValue) => {
-  nextTick(()=>{
-    initViewers()
-  })
-});
-</script>
-<style scoped lang="scss">
-
-</style>

src/renderer/src/directive/scroll.js

@@ -1,26 +0,0 @@
-/**
- * 无限滚动
- */
-import { nextTick } from 'vue'
-const mountedHook = async (el, binding) => {
-  console.log(el, binding)
-  const value = binding.value
-  if (typeof value !== 'function') return console.error('v-scroll must be a function')
-  await nextTick()
-}
-export default {
-  // Hooks for Vue3
-  mounted(el, binding) {
-    mountedHook(el, binding)
-  },
-  // Hooks for Vue2
-  inserted(el, binding) {
-    mountedHook(el, binding)
-  },
-  
-  update(el, binding){
-  },
-  updated(el, binding){
-    
-  },
-}

src/renderer/src/main.js

@@ -17,14 +17,14 @@ import log from 'electron-log/renderer' // 渲染进程日志-文件记录
 import customComponent from '@/components/common' // 自定义组件
 import plugins from './plugins' // plugins插件
 import useUserStore from '@/store/modules/user'
-import VueViewer from 'v-viewer'
+
-import 'viewerjs/dist/viewer.css'
 if(process.env.NODE_ENV != 'development') { // 非开发环境，将日志打印到日志文件
   Object.assign(console, log.functions) // 渲染进程日志-控制台替换
 }
 
 const app = createApp(App)
 
+
 //专为菁优网配置的请求转发
 app.config.globalProperties.$requestGetJYW = (url,config)=>{
   config.params = config.params?config.params:{}
@@ -42,7 +42,6 @@ import Directive from '@/AixPPTist/src/plugins/directive'
 
 app.use(router)
     .use(store)
-    .use(VueViewer)
     .use(ElementPlus, { locale: zhLocale })
     .use(customComponent) // 自定义组件
     .use(plugins)

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

@@ -98,8 +98,6 @@ export class MsgEnum {
     MSG_classlecturePagesrc : 'classlecturePagesrc',
     /** @desc: 课堂作业|活动 */
     MSG_homework : 'HOMEWORK',
-    /** @desc: 公屏 - 课堂作业|活动 */
-    MSG_pushSreen_work : 'pushSreen-work',
     /** @desc: 点赞 */
     MSG_dz : 'dz',
     /** @desc: 疑惑 */

src/renderer/src/router/index.js

@@ -31,11 +31,6 @@ export const constantRoutes = [
     component: () => import('@/AixPPTist/src/App.vue'),
     hidden: true
   },
-  {
-    path: '/gridPic',
-    component: () => import('@/components/grid-pic/index.vue'),
-    hidden: true
-  },
   {
     path: '/model',
     component: Layout,

src/renderer/src/views/classManage/classReserv.vue

@@ -3,16 +3,16 @@
 <!--    <div class="class-reserv-tabs">
       <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
     </div>-->
-    <div class="class-reserv-body" v-infinite-scroll="load">
+    <div class="class-reserv-body">
       <template v-for="(item, index) in dataList" :key="index">
-        <!-- <reserv-item
+        <reserv-item
           :style="{'background-color': index%2==0?'#f5f5f5':''}"
           :item="item"
           v-if="item.bookImg"
           @open-edit="reservDialog.openDialog(item)"
           @delete-reserv="deleteReserv(item)"
           @change="(...o) => emit('change', ...o)"
-        ></reserv-item> -->
+        ></reserv-item>
         <reserv-item-apt
           v-if="!item.bookImg"
           :style="{'background-color': index%2==0?'#f5f5f5':''}"
@@ -22,14 +22,13 @@
           @change="(...o) => emit('change', ...o)"
         ></reserv-item-apt>
       </template>
-      <el-divider v-if="page.isEnd">到底了，没了</el-divider>
     </div>
     <reserv ref="reservDialog"></reserv>
   </el-container>
 </template>
 
 <script setup>
-import { ref, onMounted, computed, watch, reactive } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { getSelfReserv } from '@/api/classManage'
 import { listClasscourseNew } from '@/api/teaching/classcourse' // api接口
 import ReservItem from '@/views/classManage/reserv-item.vue'
@@ -37,7 +36,6 @@ import Reserv from '@/views/prepare/container/reserv.vue'
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
 import ReservItemApt from '@/views/classManage/reserv-item-apt.vue'
-import vScroll from '@/directive/scroll' // 指令--滚动
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
 
@@ -46,12 +44,6 @@ const reservDialog = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
-const page = reactive({
-  pageNum: 0, // 页码
-  pageSize: 10, // 每页条数
-  total: 0,  // 总条数
-  isEnd: false // 是否加载完
-})
 
 const toolStore = useToolState()
 const userStore = useUserStore()
@@ -80,42 +72,21 @@ const deleteReserv = (item) => {
 })*/
 // 获取数据
 const getData = () => {
-  const { pageNum, pageSize } = page
+  Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
-  const params = {
+    let list = res2.data || []
-    evalid: props.curNode.id,
+    let list2 = res1.rows || []
-    teacherid: userStore.id,
+    // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
-    pageNum, pageSize
+    list = list.concat(list2)
-  }
-  listClasscourseNew(params)
-  .then((res) => {
-    const list = res.rows || []
-    const total = res.total || 0
     list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
-    dataList.value.push(...list)
+    dataList.value = list
-    page.total = total // 总条数
-    page.isEnd = dataList.value.length == total // 是否结束
   })
-  // aippt+ppt 获取数据
-  // Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
-  //   let list = res2.data || []
-  //   let list2 = res1.rows || []
-  //   // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
-  //   list = list.concat(list2)
-  //   list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
-  //   dataList.value = list
-  // })
   /*getSelfReserv().then((res) => {
     const list = res.data || []
     list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
     dataList.value = list
   })*/
 }
-// 列表加载更多
+
-const load = () => {
-  if(page.isEnd) return console.log('已加载完-所有') // 结束
-  page.pageNum++
-  getData()
-}
 watch(
   () => [dataList,toolStore.isToolWin,props.curNode],
   () => {
@@ -125,14 +96,13 @@ watch(
   }
 )
 onMounted(() => {
-  // getData() // 加载数据
+  getData() // 加载数据
 })
 </script>
 
 <style scoped lang="scss">
 .class-reserv-wrap {
   height: 100%;
-  // height: 300px;
   display: flex;
   flex-direction: column;
   //padding: 15px 10px;

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

@@ -61,8 +61,7 @@
               <div>
                 <div v-if="myClassActive.filetype=='apt'">开始新的课堂，需要点击先创建课堂，才能显示手机二维码</div>
                 <div v-else>开始新的课堂，需要点击先创建课堂</div>
-                <el-button type="warning" :loading="dt.loading" @click="createClasscourse()">创建课堂</el-button>
+                <el-button type="warning" :loading="dt.loading" @click="createClasscourse">创建课堂</el-button>
-                <el-button type="success"  @click="createClasscourse(true)">公屏上课</el-button>
               </div>
              </template>
              <!-- 故障备用 -->
@@ -147,7 +146,7 @@ const open = async (id, classObj) => {
     await getAptInfo(id)
     // 获取班级列表
     getClassList()
-    // console.log('classObj', classObj)
+    console.log('classObj', classObj)
     // 继续上课
     if (!!classObj) {
       dt.ctCourse = classObj
@@ -246,8 +245,8 @@ const getClasscourseList = async type => {
     }
   }
 }
-// 创建课程  isPublic 公屏上课
+// 创建课程
-const createClasscourse = async (isPublic = false) => {
+const createClasscourse = async () => {
   const { classid } = classForm.form
   if (!classid) {
     ElMessage.warning('请选择班级')
@@ -256,8 +255,8 @@ const createClasscourse = async (isPublic = false) => {
   dt.loading = true
   const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
   const curDate = commUtil.getDateNow('yyyy-MM-dd')
-  const params = { // 公屏上课直接 status = open
+  const params = {
-    id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: isPublic?'open':'',
+    id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: '',
     teacherid: userStore.id, entpcoursefileid: id, classid,
     entpcourseid, evalid, coursetitle,
     plandate: curDate, opendate: curDate
@@ -275,7 +274,7 @@ const createClasscourse = async (isPublic = false) => {
       setTimeout(async() => {
         msgEl.close()
         const res = await Http_Classcourse.getClasscourse(teacherForm.form.classcourseid)
-        openPublicScreen(res.data, isPublic)
+        openPublicScreen(res.data)
       }, 2000);
     }, 1000);
   }
@@ -356,7 +355,7 @@ const getQrUrl = async() => {
 }
 
 // 打开公屏
-const openPublicScreen = (classcourse, isPublic) => {
+const openPublicScreen = (classcourse) => {
   console.log('打开公屏', classcourse)
   if (!dt.ctCourse) { // 新开课需要发送消息-继续上课不需要直接打开
     // 发送app端待开课消息
@@ -367,14 +366,11 @@ const openPublicScreen = (classcourse, isPublic) => {
   const resource = toRaw(myClassActive.value)
   sessionStore.set('curr.resource', resource) // 缓存当前资源信息
   sessionStore.set('curr.classcourse', classcourse) // 缓存当前当前上课
-  // 公屏开课
-  sessionStore.set('curr.isPublic', isPublic) // 缓存是否公屏开课
   createWindow('open-win', {
     url: '/pptist', // 窗口关闭时，清除缓存
     close: () => {
       sessionStore.set('curr.resource', null) // 清除缓存
       sessionStore.set('curr.classcourse', null) // 清除缓存
-      sessionStore.set('curr.isPublic', null) // 清除缓存
     }
   })
   visible.value = false // 关闭弹窗

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

@@ -10,7 +10,6 @@
           <el-dropdown-menu>
             <el-dropdown-item @click="createAIPPT">新建文枢课件</el-dropdown-item>
             <el-dropdown-item @click="aiTOPPT">AI一键生成</el-dropdown-item>
-            <el-dropdown-item @click="openGridPic">打开宫格</el-dropdown-item>
             <el-dropdown-item @click="openFilePicker">导入PPT</el-dropdown-item>
             <input type="file" ref="fileInput" style="display: none;" @change="handleFileChange" accept="application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation">
           </el-dropdown-menu>
@@ -342,14 +341,6 @@ export default {
   //   }
   // },
   methods: {
-    openGridPic() {
-      createWindow('open-win', {
-        url: '/gridPic', // 窗口关闭时，清除缓存
-        option: {
-          maximizable: true
-        }
-      })
-    },
     // 延时
     sleep(ms){return new Promise(resolve => setTimeout(resolve, ms))},
     addAiPPT(item) {
@@ -364,8 +355,8 @@ export default {
     // 开始上课
     startClass(item, classObj) {
       // 关闭状态，打开上课相关功能(已打开，忽略)
-      const iscourse = !!sessionStore.get('curr.classcourse')
+      // const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
-      if (iscourse) return ElMessage.warning('公屏已打开，请勿重复操作')
+      // if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
       // 当前上课-store
       sessionStore.set('activeClass', item)
       this.activeClass = item
@@ -376,8 +367,7 @@ export default {
         this.$refs.calssRef.open(item.fileId, classObj)
       }
       if(item.fileFlag === 'aippt') {
-        if (!!classObj) this.changeClass('continue', classObj) // 继续上课
+        this.$refs.calssRef.open(item.fileId, classObj)
-        else this.$refs.calssRef.open(item.fileId, classObj) // 新开课
       }
     },
     // 继续上课-apt
@@ -385,19 +375,7 @@ export default {
       switch(type) {
         case 'continue': { // 继续上课
           const aptFileId = row.entpcoursefileid
-          const res = await getEntpcoursefile(aptFileId)
+          this.$refs.calssRef.open(aptFileId, row)
-          if (res.code == 200) {
-            const resource = res.data
-            if (resource.filetype != 'aippt') this.$refs.calssRef.open(aptFileId, row)
-            else {
-              if (!!sessionStore.get('curr.classcourse')) return ElMessage.warning('公屏已打开，请勿重复操作')
-              const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0})
-              setTimeout(()=>{
-                msgEl.close()
-                this.openPublicScreen('class', resource, row) // 打开公屏-窗口
-              }, 2000)
-            }
-          } else ElMessage.error(res.msg||'获取课件信息失败')
           break
         }
         case 'close': { // 关闭上课
@@ -450,7 +428,16 @@ export default {
           if (row.fileFlag === 'aippt' && !!row.fileId) {
             const res = await getEntpcoursefile(row.fileId)
             if (res && res.code === 200) {
-              this.openPublicScreen('edit', res.data, row) // 打开公屏-窗口
+              sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
+              sessionStore.set('curr.smarttalk', row) // 缓存当前文件smarttalk
+              createWindow('open-win', {
+                url: '/pptist', // 窗口关闭时，清除缓存
+                close: () => {
+                  sessionStore.set('curr.resource', null) // 清除缓存
+                  sessionStore.set('curr.smarttalk', null) // 清除缓存
+                  this.asyncAllFile() // 刷新资源列表
+                }
+              })
             } else {
               ElMessage.warning(res.msg||'文件获取异常！')
             }
@@ -461,8 +448,6 @@ export default {
         }
         case 'wsApp': { // 发送app端待开课消息
           // console.log('wsApp', row)
-          window.test = sessionStore
-          if (!!sessionStore.get('curr.classcourse')) return ElMessage.warning('公屏已打开，请勿重复操作')
           const head = MsgEnum.HEADS.MSG_0000
           const data = { id: row.id }
           const type = ChatWs.TYPES.single
@@ -477,38 +462,24 @@ export default {
           msgEl.close() // 关闭提示
           const resource = res?.data||{}
           const classcourse = row
-          this.openPublicScreen('class',resource, classcourse) // 打开公屏-窗口
+          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
       }
     },
-    /**
-     * description 打开公屏
-     * @param {string} type 类型 edit 打开 class 上课
-     * @param {object} resource 资源信息
-     * @param {object} currData 当前数据 type: edit/class 备课信息 | 课堂信息
-     */
-    openPublicScreen(type, resource, currData) {
-      sessionStore.set('curr.resource', resource) // 缓存当前资源信息
-      if (type=='edit') sessionStore.set('curr.smarttalk', currData) // 缓存当前文件smarttalk
-      else sessionStore.set('curr.classcourse', currData) // 缓存当前当前上课
-      createWindow('open-win', {
-        url: '/pptist', // 窗口关闭时，清除缓存
-        close: () => {
-          sessionStore.set('curr.resource', null) // 清除缓存
-          if (type=='edit') {
-            sessionStore.set('curr.smarttalk', null) // 清除缓存
-            this.asyncAllFile() // 刷新资源列表
-          } else sessionStore.set('curr.classcourse', null) // 清除缓存
-        }
-      })
-    },
-
     closeChange() { // 上课弹窗被关闭-触发
       // console.log('关闭上课弹窗')
-      this.activeClass = null
+      // this.activeClass = null
       sessionStore.delete('activeClass')
     },
     initReserv(id) {
@@ -924,7 +895,6 @@ export default {
       return getSmarttalkPage({
         ...this.uploadData,
         orderByColumn: 'createTime',
-        fileFlag: 'aippt',
         isAsc: 'desc',
         pageSize: 500
       })

src/renderer/src/views/tool/components/upvote.vue

@@ -248,8 +248,6 @@ defineExpose({ trigger })
   position: fixed;
   // height: 90vh;
   // border: 1px solid;
-  z-index: 99;
-  pointer-events: none;
   inset: auto auto 3em 1em;
   display: flex;
   gap: 10px;