src/main/index.js

@@ -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 openWindow
+let workWindow
-function createOpenWin(data) {
+function createWork(data) {
-  if (openWindow) return
+  if (workWindow) return
-  openWindow = new BrowserWindow({
+  workWindow = new BrowserWindow({
     width: 650,
     height: 500,
     show: false,
     frame: true,
-    maximizable: true,
+
     autoHideMenuBar: true,
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
@@ -84,20 +84,30 @@ function createOpenWin(data) {
       nodeIntegration: true
     }
   })
-  let cookieDetails = {...data.cookieData}
+
-  openWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
+  workWindow.webContents.session.cookies.set(
-    console.log('Cookie set successfully.')
+    {
-  }).catch(err =>{
+      url: 'https://file.ysaix.com:7868',
+      name: 'Admin-Token',
+      value: data
+    },
+    function (error) {
+      if (error) {
         console.error('Set cookie failed:', error)
-  })
+      } else {
+        console.log('Cookie set successfully.')
+      }
+    }
+  )
+  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()
   })
-  openWindow.on('closed', () => {
+  workWindow.on('closed', () => {
-    openWindow = null
+    workWindow = null
   })
 }
 
@@ -155,7 +165,7 @@ app.on('ready', () => {
 
   //打开作业窗口
   ipcMain.on('openWork', (e, data) => {
-    createOpenWin(data)
+    createWork(data)
   })
 
   createLoginWindow()

src/renderer/src/utils/config.js

@@ -1,9 +0,0 @@
-
-// 作业
-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'
-}

src/renderer/src/views/prepare/index.vue

@@ -37,7 +37,7 @@
           </el-popover>
         </div>
         <div style="display: flex">
-          <el-button @click="handleHomeWork">布置作业</el-button>
+          <el-button>布置作业</el-button>
           <el-button @click="isDialogOpen = true">上传资料</el-button>
           <el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
         </div>
@@ -73,10 +73,7 @@ import { toTimeText } from '@/utils/date'
 import { ElMessage } from 'element-plus'
 import { isHaveLocalFile, parseCataByNode, creatPPT, isAsyncLocalFile } 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 },
@@ -101,8 +98,7 @@ export default {
         fileRoot: '备课'
       },
       // 当前教材封面图
-      curBookImg: '',
+      curBookImg: ''
-      userStore: ''
     }
   },
   computed: {
@@ -118,7 +114,6 @@ export default {
       this.callback(param)
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
-    this.userStore = useUserStore()
   },
   mounted() {
     // const destination = '0901高一【数学(人教A版)】集合的概念-PPT课件.pptx'
@@ -276,6 +271,7 @@ export default {
     nodeClick(data) {
       if (this.currentNode.id === data.node.id) return
       this.curBookImg = data.textBook.curBookImg
+      console.log(data.textBook)
       this.checkFileList = []
       let cata = parseCataByNode(data.node)
       this.currentNode = data.node
@@ -303,18 +299,7 @@ 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>