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/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/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 9287e78..a485a49 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -14,6 +14,7 @@ 上课 +
@@ -123,20 +124,7 @@ export default { }, activated() { if (this.uploadData.textbookId !== null) { - this.isLoading = true - getSmarttalkPage({ - ...this.uploadData, - orderByColumn: 'uploadTime', - isAsc: 'desc', - pageSize: 500 - }) - .then(async (res) => { - this.currentFileList = [...res.rows] - this.isLoading = false - }) - .catch(() => { - this.isLoading = false - }) + this.asyncAllFile() } }, methods: { @@ -331,8 +319,16 @@ export default { height: 150px; align-items: center; justify-content: center; - background: linear-gradient(#97c4ed, #7aa8e5); - padding-right: 20px; + position: relative; + background: linear-gradient(#b0d1ef, #3e7bcb); + .top-zoom-style{ + position: absolute; + width: 90%; + height: 30px; + background: linear-gradient(#b0d1ef, #5283c4); + bottom: 0; + clip-path: polygon(3% 0%, 97% 0%, 100% 100%, 0% 100%); + } .textbook-img{ height: 120px; background-color: #ffffff; @@ -340,11 +336,13 @@ export default { border-radius: 6px; overflow: hidden; margin-right: 20px; + z-index: 1; } .top-item{ width: 230px; - + position: relative; flex-wrap: wrap; + z-index: 1; .btn{ width: 102px; background: none; @@ -368,6 +366,7 @@ export default { height: 80px; margin-left: 25px; font-size: 18px; + z-index: 1; .icon-lingdang{ margin-right: 5px; color: #ffffff;