Merge pull request 'lyc-dev' (#55) from lyc-dev into main

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 workWindow
+let openWindow
-function createWork(data) {
+function createOpenWin(data) {
-  if (workWindow) return
+  if (openWindow) return
-  workWindow = new BrowserWindow({
+  openWindow = new BrowserWindow({
     width: 650,
     height: 500,
     show: false,
     frame: true,
-
+    maximizable: true,
     autoHideMenuBar: true,
     ...(process.platform === 'linux' ? { icon } : {}),
     webPreferences: {
@@ -84,30 +84,20 @@ function createWork(data) {
       nodeIntegration: true
     }
   })
-
+  let cookieDetails = {...data.cookieData}
-  workWindow.webContents.session.cookies.set(
+  openWindow.webContents.session.cookies.set(cookieDetails).then(()=>{
-    {
-      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.')
-      }
+  }).catch(err =>{
-    }
+    console.error('Set cookie failed:', error)
-  )
-  workWindow.loadURL(
-    'https://file.ysaix.com:7868/teaching/classtaskassign?titleName=%E4%BD%9C%E4%B8%9A%E5%B8%83%E7%BD%AE'
-  )
-
-  workWindow.once('ready-to-show', () => {
-    workWindow.show()
   })
-  workWindow.on('closed', () => {
+    
-    workWindow = null
+  openWindow.loadURL(data.fullPath)
+
+  openWindow.once('ready-to-show', () => {
+    openWindow.show()
+  })
+  openWindow.on('closed', () => {
+    openWindow = null
   })
 }
 
@@ -165,7 +155,7 @@ app.on('ready', () => {
 
   //打开作业窗口
   ipcMain.on('openWork', (e, data) => {
-    createWork(data)
+    createOpenWin(data)
   })
 
   createLoginWindow()

src/renderer/src/utils/config.js

@@ -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'
+}

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

@@ -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, 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 },
@@ -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'
@@ -271,7 +276,6 @@ 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
@@ -299,7 +303,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>