diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue index 92bc0af..96302ab 100644 --- a/src/renderer/src/views/prepare/container/file-list-item.vue +++ b/src/renderer/src/views/prepare/container/file-list-item.vue @@ -168,7 +168,7 @@ export default { } } }, - emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null }, + emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null }, data() { return { listenList: [], @@ -266,15 +266,18 @@ export default { }, // 文件资源打开web AIX 布置作业 openFileLink(item){ + let unitId = item.levelSecondId ? item.levelSecondId : item.levelFirstId // key 对应的 linkConfig.js 外部链接配置 let key = 'filehomework' let configObj = outLink()[key] // 通知主进程 ipcRenderer.send('openWindow', { key, - fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}`, + fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}&unitId=${unitId}`, cookieData: { ...configObj.data } }) + + this.$emit('on-filearg', item) } }, mounted() { diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index ea7cbcc..a26068a 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -79,6 +79,7 @@ @on-delete="deleteTalk" @on-set="openSet" @on-delhomework="delhomework" + @on-filearg="isOpenHomework = true" > @@ -91,6 +92,7 @@ @on-delete="deleteTalk" @on-set="openSet" @on-delhomework="delhomework" + > @@ -145,7 +147,7 @@ import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue' import SetHomework from './container/set-homework.vue' import outLink from '@/utils/linkConfig' import { createWindow } from '@/utils/tool' -import { uniqBy, cloneDeep } from 'lodash' +import { cloneDeep } from 'lodash' import { delClasswork, addEntpcourse } from '@/api/teaching/classwork' import { getSelfReserv, startClass } from '@/api/classManage' const toolStore = useToolState() @@ -227,8 +229,8 @@ export default { const curWin = Remote.getCurrentWindow() curWin.on('focus', ()=>{ if(!this.isOpenHomework) return - console.log(100) this.initHomeWork() + this.asyncAllFile() this.isOpenHomework = false }) @@ -475,10 +477,21 @@ export default { } // key 对应的 linkConfig.js 外部链接配置 let configObj = outLink()[key] + let fullPath = configObj.fullPath + //打开作业 高考 url增加unitId 章节ID + if(key != 'standard' && key != 'aiModel'){ + let unitId = this.uploadData.levelSecondId ? this.uploadData.levelSecondId : this.uploadData.levelFirstId + if(key == 'gk'){ + fullPath += `?unitId=${unitId}` + } + else{ + fullPath += `&unitId=${unitId}` + } + } // 通知主进程 ipcRenderer.send('openWindow', { key, - fullPath: configObj.fullPath, + fullPath: fullPath, cookieData: { ...configObj.data } }) }, @@ -551,10 +564,8 @@ export default { res.rows[i].entpcourseworklistarray = [] } } - // 去重 - let ary = uniqBy([...list], 'id') // 深度克隆 - this.currentWorkList = cloneDeep(ary) + this.currentWorkList = cloneDeep(list) }) }, getWeekday1(date) {