From db2be260a7fd0829c6790ff609ee13ac4904ab58 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 19 Sep 2024 11:25:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=99=E6=9D=90edit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/choose-textbook/index.vue | 59 +++++++++++++++---- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 7f3c178..4e4d3df 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -6,7 +6,7 @@
- @@ -98,6 +101,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file' import useUserStore from '@/store/modules/user' import outLink from '@/utils/linkConfig' +import { sessionStore } from '@/utils/store' const { ipcRenderer } = window.electron || {} export default { @@ -115,6 +119,10 @@ export default { default: function () { return 0 } + }, + activeClassId: { // 当前上课id + type: String, + default: '' } }, emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null }, diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 859843b..ca2b197 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -20,6 +20,7 @@ :key="index" :item="item" :index="index" + :activeClassId="activeClass?.id" @on-delete="deleteTalk" @on-start-class="startClass" > @@ -192,7 +193,7 @@ import { getClassInfo, getSelfReserv } from '@/api/classManage' import { useGetHomework } from '@/hooks/useGetHomework' import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile' import ClassReserv from '@/views/classManage/classReserv.vue' -import classStart from '@/views/desktop/container/class-start.vue' // 预备上课 +import classStart from './container/class-start.vue' // 预备上课 const toolStore = useToolState() const fs = require('fs') @@ -246,7 +247,9 @@ export default { // 布置作业弹窗 setDialog: false, row: '', - isOpenHomework: false + isOpenHomework: false, + // 当前上课课程 + activeClass: null, } }, computed: { @@ -272,6 +275,9 @@ export default { }) this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime') // this.initReserv() + + // zdg: 获取缓存中的当前课程 + this.activeClass = sessionStore.get('activeClass') || null }, mounted() { this.$watch( @@ -298,15 +304,20 @@ export default { // }, methods: { startClass(item) { - console.log(item) + // console.log(item, sessionStore) if(item.fileFlag === '课件') { + // 关闭状态，打开上课相关功能(已打开，忽略) + const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null + if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作') this.openReserv() } if(item.fileFlag === 'apt') { - //TODO 打开apt - const { fileId: aptId } = item - this.$refs.calssRef.open(aptId) + //TODO 打开apt - fileId: aptId + this.$refs.calssRef.open(item.fileId) } + // 当前上课-store + sessionStore.set('activeClass', item) + this.activeClass = item }, initReserv(id) { getClassInfo(id).then((res) => { diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue index a196e7f..09be0e0 100644 --- a/src/renderer/src/views/tool/sphere.vue +++ b/src/renderer/src/views/tool/sphere.vue @@ -10,7 +10,7 @@ - +
From 5f06657b09cc71000556551840fc62aa842a66cc Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 19 Sep 2024 14:58:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/desktop/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue index 95679c4..ae33213 100644 --- a/src/renderer/src/views/desktop/index.vue +++ b/src/renderer/src/views/desktop/index.vue @@ -85,7 +85,7 @@ const menuList = [{ // path: '/prepare' // }, { - name: '教学实施', + name: '教学实践', icon: 'icon-jiaoxuefenxi', path: '/prepare' }, From 34c1c66b311ead8629a0221ffd2272816025e107 Mon Sep 17 00:00:00 2001 From: lyc Date: Thu, 19 Sep 2024 15:15:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?edit=20=E6=95=99=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/choose-textbook/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 4e4d3df..5b5cf59 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -109,6 +109,8 @@ const getSubjectContent = async () => { evaluationList.value = JSON.parse(localStorage.getItem('evaluationList')) } else{ + localStorage.removeItem('defaultExpandedKeys') + localStorage.removeItem('currentNodeId') const { rows } = await listEvaluation(params) localStorage.setItem('evaluationList', JSON.stringify(rows)) evaluationList.value = rows