diff --git a/.env.production b/.env.production
index 0919367..c3b1489 100644
--- a/.env.production
+++ b/.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 = 'false'
diff --git a/src/renderer/src/AixPPTist/src/App.vue b/src/renderer/src/AixPPTist/src/App.vue
index 7621b9f..c06919f 100644
--- a/src/renderer/src/AixPPTist/src/App.vue
+++ b/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()
diff --git a/src/renderer/src/AixPPTist/src/api/classcourse.ts b/src/renderer/src/AixPPTist/src/api/classcourse.ts
index e78a19d..30e65e8 100644
--- a/src/renderer/src/AixPPTist/src/api/classcourse.ts
+++ b/src/renderer/src/AixPPTist/src/api/classcourse.ts
@@ -8,12 +8,15 @@ import * as useStore from '../store' // pptist-状态管理
import ChatWs from '@/plugins/socket' // 聊天socket
import msgUtils from '@/plugins/modal' // 消息工具
+const slidesStore = useStore.useSlidesStore() // 幻灯片-状态管理
const screenStore = useStore.useScreenStore() // 全屏-状态管理
const classcourseStore = useStore.useClasscourseStore() // 课堂信息-状态管理
const classcourse = sessionStore.get('curr.classcourse') // 课堂信息
export class Classcourse {
msgObj:ElMessageBox = null // 提示消息对象
+ classcourse:any = null // 课堂信息
+ id: number|string = null // 课堂id
constructor() {
this.load()
@@ -22,6 +25,7 @@ export class Classcourse {
* @description 加载
*/
load() {
+ console.log('classcourse-load', classcourse)
// 打开全屏
screenStore.setScreening(!!classcourse)
// 如果课堂信息有值,则连接socket
@@ -29,14 +33,19 @@ export class 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||classcourse.paging==0
+ if (isPaging) slidesStore.updateSlideIndex(classcourse.paging)
+ // 课堂信息-状态管理
classcourseStore.setClasscourse(classcourse)
// 待上课提示
if (!classcourse.status) {
this.msgObj = {
type: 'success',
title: '系统提示',
- message: '公屏课堂已准备完毕,请等待老师开启课堂!',
+ message: '公屏课堂已准备完毕,等待老师开启课堂...',
center: true,
showClose: false,
showCancelButton: false,
diff --git a/src/renderer/src/AixPPTist/src/api/types.ts b/src/renderer/src/AixPPTist/src/api/types.ts
index 26881e9..e762748 100644
--- a/src/renderer/src/AixPPTist/src/api/types.ts
+++ b/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,
diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index ff14229..aee4d48 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -10,85 +10,106 @@ 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 事件总线
+
/**
* @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') // 备课资源
+
+ // 监听幻灯片内容变化
+ 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
+ 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)
\ No newline at end of file
diff --git a/src/renderer/src/AixPPTist/src/hooks/useScreening.ts b/src/renderer/src/AixPPTist/src/hooks/useScreening.ts
index e8cc32a..979b8c4 100644
--- a/src/renderer/src/AixPPTist/src/hooks/useScreening.ts
+++ b/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()
}
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
index 9ad6322..26c852e 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue
@@ -19,7 +19,8 @@
import { ref, reactive, onMounted, computed } from 'vue';
import { sessionStore } from '@/utils/store'
import { getSmarttalkPage } from '@/api/file'
-import { getFileSuffix, urlToBase64 } from '@/utils/ruoyi.js'
+import * as commUtils from '@/utils/comm.js'
+import { getFileSuffix } from '@/utils/ruoyi.js'
const emit = defineEmits(['insertMaterial', 'close'])
@@ -62,12 +63,15 @@ const fileUrl = computed(() => (item) =>{
// 插入
const onInsert = async (item) =>{
+ const res = await fetch(item.fileFullPath)
+ const bolb = await res.blob()
+ const file = commUtils.blobToFile(bolb, item.fileShowName)
+
if(videoSuffix.indexOf(getFileSuffix(item.fileShowName)) != -1){
- emit('insertMaterial',{ type: 'video', data: item.fileFullPath })
+ emit('insertMaterial',{ type: 'video', file })
}
else{
- const base64 = await urlToBase64(item.fileFullPath)
- emit('insertMaterial',{ type: 'img', data: base64 })
+ emit('insertMaterial',{ type: 'img', file })
}
}
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
index 909f7fe..ad51dd9 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -132,7 +132,7 @@
- { createImageElement(url); imgVisible = false }" />
+
@@ -165,6 +165,7 @@ import { PPTApi } from '../../../api'
import TextCreateImg from '@/components/ai-kolors/index.vue'
import { toPng } from 'html-to-image' // 引入html-to-image库
+
const mainStore = useMainStore()
const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
const { canUndo, canRedo } = storeToRefs(useSnapshotStore())
@@ -280,21 +281,31 @@ const toggleNotesPanel = () => {
// 插入素材
interface MaterialParams {
type: string,
- data: string
+ file: any
}
const insertMaterial = (item: MaterialParams) =>{
- const { type, data } = item
- if(type == 'video'){
- createVideoElement(data)
- }
- else{
- createImageElement(data)
- }
- materiaVisible.value = false
+ const { type, file } = item
+ PPTApi.toRousrceUrl(file).then(data=>{
+ if(type == 'video'){
+ createVideoElement(data)
+ }
+ else{
+ createImageElement(data)
+ }
+ materiaVisible.value = false
+ })
+
}
// 文生图
const imgVisible = ref(false)
+const insertImg = async (file: any) =>{
+ PPTApi.toRousrceUrl(file).then(data=>{
+ createImageElement(data)
+ imgVisible.value = false
+ })
+}
+