Compare commits
No commits in common. "22f35a66388552e3ada8ed85745032b0ab4ab745" and "0964cc09659ddc17212391ab4cd0e674968a9a82" have entirely different histories.
22f35a6638
...
0964cc0965
|
@ -168,7 +168,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },
|
emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
listenList: [],
|
listenList: [],
|
||||||
|
@ -266,18 +266,15 @@ export default {
|
||||||
},
|
},
|
||||||
// 文件资源打开web AIX 布置作业
|
// 文件资源打开web AIX 布置作业
|
||||||
openFileLink(item){
|
openFileLink(item){
|
||||||
let unitId = item.levelSecondId ? item.levelSecondId : item.levelFirstId
|
|
||||||
// key 对应的 linkConfig.js 外部链接配置
|
// key 对应的 linkConfig.js 外部链接配置
|
||||||
let key = 'filehomework'
|
let key = 'filehomework'
|
||||||
let configObj = outLink()[key]
|
let configObj = outLink()[key]
|
||||||
// 通知主进程
|
// 通知主进程
|
||||||
ipcRenderer.send('openWindow', {
|
ipcRenderer.send('openWindow', {
|
||||||
key,
|
key,
|
||||||
fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}&unitId=${unitId}`,
|
fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}`,
|
||||||
cookieData: { ...configObj.data }
|
cookieData: { ...configObj.data }
|
||||||
})
|
})
|
||||||
|
|
||||||
this.$emit('on-filearg', item)
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
|
@ -79,7 +79,6 @@
|
||||||
@on-delete="deleteTalk"
|
@on-delete="deleteTalk"
|
||||||
@on-set="openSet"
|
@on-set="openSet"
|
||||||
@on-delhomework="delhomework"
|
@on-delhomework="delhomework"
|
||||||
@on-filearg="isOpenHomework = true"
|
|
||||||
>
|
>
|
||||||
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
||||||
</file-list-item>
|
</file-list-item>
|
||||||
|
@ -92,7 +91,6 @@
|
||||||
@on-delete="deleteTalk"
|
@on-delete="deleteTalk"
|
||||||
@on-set="openSet"
|
@on-set="openSet"
|
||||||
@on-delhomework="delhomework"
|
@on-delhomework="delhomework"
|
||||||
|
|
||||||
>
|
>
|
||||||
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
<el-checkbox v-if="!item.uniquekey" label="" :value="item" />
|
||||||
</file-list-item>
|
</file-list-item>
|
||||||
|
@ -147,7 +145,7 @@ import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
|
||||||
import SetHomework from './container/set-homework.vue'
|
import SetHomework from './container/set-homework.vue'
|
||||||
import outLink from '@/utils/linkConfig'
|
import outLink from '@/utils/linkConfig'
|
||||||
import { createWindow } from '@/utils/tool'
|
import { createWindow } from '@/utils/tool'
|
||||||
import { cloneDeep } from 'lodash'
|
import { uniqBy, cloneDeep } from 'lodash'
|
||||||
import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
|
import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
|
||||||
import { getSelfReserv, startClass } from '@/api/classManage'
|
import { getSelfReserv, startClass } from '@/api/classManage'
|
||||||
const toolStore = useToolState()
|
const toolStore = useToolState()
|
||||||
|
@ -229,8 +227,8 @@ export default {
|
||||||
const curWin = Remote.getCurrentWindow()
|
const curWin = Remote.getCurrentWindow()
|
||||||
curWin.on('focus', ()=>{
|
curWin.on('focus', ()=>{
|
||||||
if(!this.isOpenHomework) return
|
if(!this.isOpenHomework) return
|
||||||
|
console.log(100)
|
||||||
this.initHomeWork()
|
this.initHomeWork()
|
||||||
this.asyncAllFile()
|
|
||||||
this.isOpenHomework = false
|
this.isOpenHomework = false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -477,21 +475,10 @@ export default {
|
||||||
}
|
}
|
||||||
// key 对应的 linkConfig.js 外部链接配置
|
// key 对应的 linkConfig.js 外部链接配置
|
||||||
let configObj = outLink()[key]
|
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', {
|
ipcRenderer.send('openWindow', {
|
||||||
key,
|
key,
|
||||||
fullPath: fullPath,
|
fullPath: configObj.fullPath,
|
||||||
cookieData: { ...configObj.data }
|
cookieData: { ...configObj.data }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -564,8 +551,10 @@ export default {
|
||||||
res.rows[i].entpcourseworklistarray = []
|
res.rows[i].entpcourseworklistarray = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 去重
|
||||||
|
let ary = uniqBy([...list], 'id')
|
||||||
// 深度克隆
|
// 深度克隆
|
||||||
this.currentWorkList = cloneDeep(list)
|
this.currentWorkList = cloneDeep(ary)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getWeekday1(date) {
|
getWeekday1(date) {
|
||||||
|
|
Loading…
Reference in New Issue