lyc-dev #55

Merged
lyc merged 3 commits from lyc-dev into main 2024-07-23 14:08:24 +08:00
3 changed files with 42 additions and 24 deletions
Showing only changes of commit d91f08d398 - Show all commits

View File

@ -41,7 +41,7 @@ function createMainWindow() {
width: 1200,
height: 700,
show: false,
frame: false,
frame: false,// 无边框
autoHideMenuBar: true,
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
@ -68,15 +68,15 @@ function createMainWindow() {
}
// 作业窗口相关-开发中
let workWindow
function createWork(data) {
if (workWindow) return
workWindow = new BrowserWindow({
let openWindow
function createOpenWin(data) {
if (openWindow) return
openWindow = new BrowserWindow({
width: 650,
height: 500,
show: false,
frame: true,
maximizable: true,
autoHideMenuBar: true,
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
@ -85,13 +85,8 @@ function createWork(data) {
}
})
workWindow.webContents.session.cookies.set(
{
url: 'https://file.ysaix.com:7868',
name: 'Admin-Token',
value: data
},
function (error) {
openWindow.webContents.session.cookies.set({...data.cookieData},
(error)=> {
if (error) {
console.error('Set cookie failed:', error)
} else {
@ -99,15 +94,13 @@ function createWork(data) {
}
}
)
workWindow.loadURL(
'https://file.ysaix.com:7868/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE'
)
openWindow.loadURL(data.fullPath)
workWindow.once('ready-to-show', () => {
workWindow.show()
openWindow.once('ready-to-show', () => {
openWindow.show()
})
workWindow.on('closed', () => {
workWindow = null
openWindow.on('closed', () => {
openWindow = null
})
}
@ -165,7 +158,7 @@ app.on('ready', () => {
//打开作业窗口
ipcMain.on('openWork', (e, data) => {
createWork(data)
createOpenWin(data)
})
createLoginWindow()

View File

@ -0,0 +1,9 @@
// 作业
export const homeWorkConfig = {
// host 设置token 等
host: 'https://file.ysaix.com:7868',
name: 'Admin-Token',
// 完整路径
fullPath: 'https://file.ysaix.com:7868/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE'
}

View File

@ -37,7 +37,7 @@
</el-popover>
</div>
<div style="display: flex">
<el-button>布置作业</el-button>
<el-button @click="handleHomeWork">布置作业</el-button>
<el-button @click="isDialogOpen = true">上传资料</el-button>
<el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
</div>
@ -73,7 +73,10 @@ import { toTimeText } from '@/utils/date'
import { ElMessage } from 'element-plus'
import { isHaveLocalFile, parseCataByNode, creatPPT } from '@/utils/talkFile'
import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
import useUserStore from '@/store/modules/user'
import { homeWorkConfig } from '@/utils/config'
const { ipcRenderer } = window.electron || {}
export default {
name: 'Prepare',
components: { ChooseTextbook, Refresh, uploadDialog, FileListItem, FileOperBatch, MoveFile },
@ -98,7 +101,8 @@ export default {
fileRoot: '备课'
},
//
curBookImg: ''
curBookImg: '',
userStore: ''
}
},
computed: {
@ -114,6 +118,7 @@ export default {
this.callback(param)
})
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
this.userStore = useUserStore()
},
mounted() {
// const destination = '0901(A)-PPT.pptx'
@ -279,7 +284,18 @@ export default {
console.log(res)
this.isLoading = false
})
}
},
//
handleHomeWork(){
ipcRenderer.send('openWork',{
fullPath: homeWorkConfig.fullPath,
cookieData: {
url: homeWorkConfig.host,
name: homeWorkConfig.name,
value: this.userStore.token
}
})
},
}
}
</script>