From 55100215661a2917e41a8f548e059353785881fe Mon Sep 17 00:00:00 2001 From: zdg Date: Tue, 24 Dec 2024 16:06:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E8=AF=BE=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=B8=8D=E9=80=89=E7=8F=AD=E7=BA=A7=E5=BC=80=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .../src/AixPPTist/src/hooks/useScreening.ts | 4 ++++ .../views/prepare/container/class-start.vue | 18 +++++++++--------- src/renderer/src/views/prepare/index.vue | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.env.development b/.env.development index 422cd04..b20e6ac 100644 --- a/.env.development +++ b/.env.development @@ -17,6 +17,7 @@ VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktx VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/' # websocket 地址 +# VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868' VITE_APP_WS_URL = 'wss://file.ysaix.com:7868' # VITE_APP_WS_URL = 'ws://192.168.2.16:7865' diff --git a/src/renderer/src/AixPPTist/src/hooks/useScreening.ts b/src/renderer/src/AixPPTist/src/hooks/useScreening.ts index 979b8c4..4a35762 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 { sessionStore } from '@/utils/store' // electron-store 状态管理 import ChatWs from '@/plugins/socket' // 聊天socket export default () => { @@ -25,6 +26,9 @@ export default () => { if (!!classcourse) { //DOTO 有课堂，执行退相关操作 console.log('退出放映状态') ChatWs?.close() // 关闭ws + sessionStore.delete('curr.classcourse') // 清除课堂信息 + sessionStore.delete('curr.resource') // 清除课件信息 + sessionStore.delete('curr.isPublic') // 清除公屏状态 setTimeout(() => { window.close() // 关闭窗口 }, 1000) diff --git a/src/renderer/src/views/prepare/container/class-start.vue b/src/renderer/src/views/prepare/container/class-start.vue index 3edc5d7..fbac0c8 100644 --- a/src/renderer/src/views/prepare/container/class-start.vue +++ b/src/renderer/src/views/prepare/container/class-start.vue @@ -25,9 +25,9 @@ @@ -249,10 +249,10 @@ const getClasscourseList = async type => { // 创建课程 isPublic 公屏上课 const createClasscourse = async (isPublic = false) => { const { classid } = classForm.form - if (!classid) { - ElMessage.warning('请选择班级') - return - } + // if (!classid) { + // ElMessage.warning('请选择班级') + // return + // } dt.loading = true const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象 const curDate = commUtil.getDateNow('yyyy-MM-dd') @@ -372,9 +372,9 @@ const openPublicScreen = (classcourse, isPublic) => { createWindow('open-win', { url: '/pptist', // 窗口关闭时，清除缓存 close: () => { - sessionStore.set('curr.resource', null) // 清除缓存 - sessionStore.set('curr.classcourse', null) // 清除缓存 - sessionStore.set('curr.isPublic', null) // 清除缓存 + sessionStore.delete('curr.resource') // 清除缓存 + sessionStore.delete('curr.classcourse') // 清除缓存 + sessionStore.delete('curr.isPublic') // 清除缓存 } }) visible.value = false // 关闭弹窗 diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 7ee3ab0..0403c15 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -497,11 +497,11 @@ export default { createWindow('open-win', { url: '/pptist', // 窗口关闭时，清除缓存 close: () => { - sessionStore.set('curr.resource', null) // 清除缓存 + sessionStore.delete('curr.resource') // 清除缓存 if (type=='edit') { - sessionStore.set('curr.smarttalk', null) // 清除缓存 + sessionStore.delete('curr.smarttalk') // 清除缓存 this.asyncAllFile() // 刷新资源列表 - } else sessionStore.set('curr.classcourse', null) // 清除缓存 + } else sessionStore.delete('curr.classcourse') // 清除缓存 } }) }, From 4b2d13db8e49afdcf34be0dca2635a8312732e05 Mon Sep 17 00:00:00 2001 From: lyc Date: Tue, 24 Dec 2024 17:31:56 +0800 Subject: [PATCH 2/3] edit --- src/renderer/src/views/prepare/container/ai-pptistV2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/prepare/container/ai-pptistV2.vue b/src/renderer/src/views/prepare/container/ai-pptistV2.vue index f199101..56db4e3 100644 --- a/src/renderer/src/views/prepare/container/ai-pptistV2.vue +++ b/src/renderer/src/views/prepare/container/ai-pptistV2.vue @@ -10,7 +10,7 @@
{{ outputText }}
- {{ outputText ? '重新生产' : '生成大纲' }} + {{ outputText ? '重新生成' : '生成大纲' }} 下一步 From 171dc72ee75ba72d2115376ff0611eaf540f889d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Wed, 25 Dec 2024 10:33:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9]=20-?= =?UTF-8?q?=20=E6=9B=BF=E6=8D=A2=E8=87=AA=E5=8A=A8=E6=89=B9=E6=94=B9?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/api/classTask/index.js | 9 +++++++++ .../classTask/container/classTask/item-dialog-score.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/api/classTask/index.js b/src/renderer/src/api/classTask/index.js index bf03614..845469b 100644 --- a/src/renderer/src/api/classTask/index.js +++ b/src/renderer/src/api/classTask/index.js @@ -80,6 +80,15 @@ export function updateClassworkdata(data) { }) } +// 批阅后, 待所有学生都批改完成后自动结束当前作业为[已完成] +export function updateClassWorkDataAutoFinish(data) { + return request({ + url: '/education/classworkdata/updAutoFinish', + method: 'put', + data: data + }) +} + // 修改classwork export function updateClasswork(data) { return request({ diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index 79a062e..6a19908 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -435,7 +435,7 @@ import useUserStore from '@/store/modules/user' import { ref, reactive } from 'vue' // import { Plus } from '@element-plus/icons-vue' import { ElMessageBox, ElMessage } from 'element-plus' -import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask' +import { updateClassworkeval, getClassworkdata, updateClassWorkDataAutoFinish } from '@/api/classTask' import { getTimeDate } from '@/utils/date' import ReFilePreview from '@/components/refile-preview/index.vue' import { quizStrToList } from '@/utils/comm'; @@ -890,7 +890,7 @@ const onSubmit = () => { updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm; }; // 更新作业批改状态 - updateClassworkdata(formd).then(res => { + updateClassWorkDataAutoFinish(formd).then(res => { }) // 更新题目批改