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

This commit is contained in:
lyc 2024-08-14 14:08:52 +08:00
commit 22f35a6638
2 changed files with 22 additions and 8 deletions

View File

@ -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() {

View File

@ -79,6 +79,7 @@
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
@on-filearg="isOpenHomework = true"
>
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</file-list-item>
@ -91,6 +92,7 @@
@on-delete="deleteTalk"
@on-set="openSet"
@on-delhomework="delhomework"
>
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
</file-list-item>
@ -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
// urlunitId 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) {