zhuhao_dev #75

Merged
zhuhao merged 9 commits from zhuhao_dev into main 2024-07-26 15:39:45 +08:00
3 changed files with 22 additions and 19 deletions
Showing only changes of commit 9f9a611f89 - Show all commits

View File

@ -238,7 +238,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
//下载文件 //下载文件
ipcMain.on('download-file-default', (e, { url, fileName }) => { ipcMain.on('download-file-default', (e, { url, fileName }) => {
createFolder('selfFile').then(async () => { createFolder('selfFile').then(async () => {
const browserWindow = BrowserWindow.fromId(e.sender.id) const browserWindow = BrowserWindow.getFocusedWindow()
const id = await manager.download({ const id = await manager.download({
window: browserWindow, window: browserWindow,
url: url, url: url,

View File

@ -20,6 +20,10 @@ export const resourceFormat = [
label: 'ppt', label: 'ppt',
value: 'ppt' value: 'ppt'
}, },
{
label: 'pptx',
value: 'pptx'
},
{ {
label: 'mp3', label: 'mp3',
value: 'mp3' value: 'mp3'
@ -62,4 +66,4 @@ export const resourceType = [
label: '教案', label: '教案',
value: '教案' value: '教案'
} }
] ]

View File

@ -14,6 +14,7 @@
</div> </div>
<el-button type="primary" class="to-class-btn"> <el-button type="primary" class="to-class-btn">
<i class="iconfont icon-lingdang"></i>上课</el-button> <i class="iconfont icon-lingdang"></i>上课</el-button>
<div class="top-zoom-style"></div>
</div> </div>
<div class="prepare-body-header"> <div class="prepare-body-header">
@ -123,20 +124,7 @@ export default {
}, },
activated() { activated() {
if (this.uploadData.textbookId !== null) { if (this.uploadData.textbookId !== null) {
this.isLoading = true this.asyncAllFile()
getSmarttalkPage({
...this.uploadData,
orderByColumn: 'uploadTime',
isAsc: 'desc',
pageSize: 500
})
.then(async (res) => {
this.currentFileList = [...res.rows]
this.isLoading = false
})
.catch(() => {
this.isLoading = false
})
} }
}, },
methods: { methods: {
@ -331,8 +319,16 @@ export default {
height: 150px; height: 150px;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: linear-gradient(#97c4ed, #7aa8e5); position: relative;
padding-right: 20px; 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{ .textbook-img{
height: 120px; height: 120px;
background-color: #ffffff; background-color: #ffffff;
@ -340,11 +336,13 @@ export default {
border-radius: 6px; border-radius: 6px;
overflow: hidden; overflow: hidden;
margin-right: 20px; margin-right: 20px;
z-index: 1;
} }
.top-item{ .top-item{
width: 230px; width: 230px;
position: relative;
flex-wrap: wrap; flex-wrap: wrap;
z-index: 1;
.btn{ .btn{
width: 102px; width: 102px;
background: none; background: none;
@ -368,6 +366,7 @@ export default {
height: 80px; height: 80px;
margin-left: 25px; margin-left: 25px;
font-size: 18px; font-size: 18px;
z-index: 1;
.icon-lingdang{ .icon-lingdang{
margin-right: 5px; margin-right: 5px;
color: #ffffff; color: #ffffff;