zdg_dev #146

Merged
zhengdegang merged 5 commits from zdg_dev into main 2024-12-17 17:36:35 +08:00
8 changed files with 61 additions and 6 deletions
Showing only changes of commit 5d6c946e08 - Show all commits

View File

@ -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,
}
}

View File

@ -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

View File

@ -122,4 +122,5 @@ export default () => {
window.close() // 关闭窗口
}, 1000)
}
}

View File

@ -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)

View File

@ -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)

View File

@ -167,9 +167,6 @@ export class ChatWs {
return new Promise((resolve, reject) => {
this.sendMsg('closed', '下课', null, 'group', id)
resolve()
// setTimeout(() => {
// this.close() // 关闭链接
// }, 1000);
})
}
// 延时 ms 毫秒

View File

@ -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

View File

@ -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)