Merge pull request 'zhuhao_dev' (#75) from zhuhao_dev into main

Reviewed-on: #75
This commit is contained in:
朱浩 2024-07-26 15:39:44 +08:00
commit 7d4f9bdbf9
6 changed files with 32 additions and 20 deletions

View File

@ -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,

View File

@ -61,11 +61,11 @@ const menus = ref([
name: '备课',
path: '/prepare'
},
{
/*{
icon: 'icon-jiangke1 icon-teach',
name: '授课',
path: '/teach'
}
}*/
])
//

View File

@ -25,15 +25,6 @@
<div class="prepare-uploader-progress" :style="{ width: item.percentage + '%' }"></div>
<div class="prepare-body-main-item-icon">
<FileImage :size="50" :file-name="item.raw.name" />
<!-- <svg
class="icon"
aria-hidden="true"
font-size="50px"
color="red"
style="margin: auto"
>
<use xlink:href="#icon-ppt"></use>
</svg>-->
</div>
<div class="prepare-body-main-item-info">
<div class="prepare-item-info-title">{{ item.raw.name }}</div>

View File

@ -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',

View File

@ -20,6 +20,10 @@ export const resourceFormat = [
label: 'ppt',
value: 'ppt'
},
{
label: 'pptx',
value: 'pptx'
},
{
label: 'mp3',
value: 'mp3'

View File

@ -14,6 +14,7 @@
</div>
<el-button type="primary" class="to-class-btn" @click="openLesson">
<i class="iconfont icon-lingdang"></i>上课</el-button>
<div class="top-zoom-style"></div>
</div>
<div class="prepare-body-header">
@ -121,6 +122,11 @@ export default {
},
mounted() {
},
activated() {
if (this.uploadData.textbookId !== null) {
this.asyncAllFile()
}
},
methods: {
createFile() {
creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
@ -321,8 +327,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;
@ -330,11 +344,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;
@ -358,6 +374,7 @@ export default {
height: 80px;
margin-left: 25px;
font-size: 18px;
z-index: 1;
.icon-lingdang{
margin-right: 5px;
color: #ffffff;