diff --git a/src/main/file.js b/src/main/file.js index 5637a23..d10cb59 100644 --- a/src/main/file.js +++ b/src/main/file.js @@ -238,7 +238,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) { //下载文件 ipcMain.on('download-file-default', (e, { url, fileName }) => { createFolder('selfFile').then(async () => { - const browserWindow = BrowserWindow.fromId(e.sender.id) + const browserWindow = BrowserWindow.getFocusedWindow() const id = await manager.download({ window: browserWindow, url: url, diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 26f5c42..de22482 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -61,11 +61,11 @@ const menus = ref([ name: '备课', path: '/prepare' }, - { + /*{ icon: 'icon-jiangke1 icon-teach', name: '授课', path: '/teach' - } + }*/ ]) // 监听当前路由 diff --git a/src/renderer/src/layout/components/Uploader.vue b/src/renderer/src/layout/components/Uploader.vue index 1dd3c9a..ce9c275 100644 --- a/src/renderer/src/layout/components/Uploader.vue +++ b/src/renderer/src/layout/components/Uploader.vue @@ -25,15 +25,6 @@
-
{{ item.raw.name }}
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index e568161..d6f641e 100644 --- a/src/renderer/src/router/index.js +++ b/src/renderer/src/router/index.js @@ -19,7 +19,7 @@ export const constantRoutes = [ path: '/resource', component: () => import('@/views/resource/index.vue'), name: 'resource', - meta: {title: '资源',keepAlive:true} + meta: {title: '资源'} }, { path: '/prepare', diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js index eb9275c..a1a1a61 100644 --- a/src/renderer/src/utils/resourceDict.js +++ b/src/renderer/src/utils/resourceDict.js @@ -20,6 +20,10 @@ export const resourceFormat = [ label: 'ppt', value: 'ppt' }, + { + label: 'pptx', + value: 'pptx' + }, { label: 'mp3', value: 'mp3' @@ -62,4 +66,4 @@ export const resourceType = [ label: '教案', value: '教案' } -] \ No newline at end of file +] diff --git a/src/renderer/src/views/classManage/basicGroup.vue b/src/renderer/src/views/classManage/basicGroup.vue index 3d7c4bc..42a70cd 100644 --- a/src/renderer/src/views/classManage/basicGroup.vue +++ b/src/renderer/src/views/classManage/basicGroup.vue @@ -110,7 +110,6 @@ import {listClassmain, listClassuser, addClassgroup, listClassgroup, delClassgroup,getClassgroup,updateClassgroup} from '@/api/classManage/index' import {ref, onMounted, reactive, defineProps, watch} from 'vue' import useUserStore from '@/store/modules/user' -import {useRoute} from 'vue-router' import {ElMessage} from "element-plus"; const userStore = useUserStore().user diff --git a/src/renderer/src/views/classManage/classInfo.vue b/src/renderer/src/views/classManage/classInfo.vue index de3d879..e05f0d9 100644 --- a/src/renderer/src/views/classManage/classInfo.vue +++ b/src/renderer/src/views/classManage/classInfo.vue @@ -9,9 +9,10 @@ {{ classInfo.className }} -