Merge pull request 'zhuhao_dev' (#416) from zhuhao_dev into main
Reviewed-on: #416
This commit is contained in:
commit
19494eb9e7
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "aix-win",
|
"name": "aix-win",
|
||||||
"version": "2.1.30",
|
"version": "2.1.33",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "./out/main/index.js",
|
"main": "./out/main/index.js",
|
||||||
"author": "上海交大重庆人工智能研究院",
|
"author": "上海交大重庆人工智能研究院",
|
||||||
|
|
|
@ -280,14 +280,14 @@ export default {
|
||||||
cookie,
|
cookie,
|
||||||
fileType: item.fileType
|
fileType: item.fileType
|
||||||
})
|
})
|
||||||
ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
|
/*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
|
||||||
items.async = 'on'
|
items.async = 'on'
|
||||||
})
|
})
|
||||||
ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
|
ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
|
||||||
items.fileSize = data.fileSize
|
items.fileSize = data.fileSize
|
||||||
items.md5 = md5
|
items.md5 = md5
|
||||||
items.async = true
|
items.async = true
|
||||||
})
|
})*/
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -357,14 +357,14 @@ export default {
|
||||||
cookie,
|
cookie,
|
||||||
fileType: item.fileType
|
fileType: item.fileType
|
||||||
})
|
})
|
||||||
ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
|
/*ipcRenderer.on('listen-file-change-on' + item.fileNewName, () => {
|
||||||
items.async = 'on'
|
items.async = 'on'
|
||||||
})
|
})
|
||||||
ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
|
ipcRenderer.on('listen-file-change-success' + item.fileNewName, (e, { data, md5 }) => {
|
||||||
items.fileSize = data.fileSize
|
items.fileSize = data.fileSize
|
||||||
items.md5 = md5
|
items.md5 = md5
|
||||||
items.async = true
|
items.async = true
|
||||||
})
|
})*/
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -537,7 +537,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
clickChoose(value) {
|
clickChoose(value) {
|
||||||
this.checkFileList = value ? this.currentFileList : []
|
this.checkFileList = value ? this.currentSCFileList : []
|
||||||
},
|
},
|
||||||
deleteTalk(item) {
|
deleteTalk(item) {
|
||||||
let index = this.currentFileList.indexOf(item)
|
let index = this.currentFileList.indexOf(item)
|
||||||
|
|
|
@ -161,7 +161,11 @@ const delRow = (item) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加入备课
|
// 加入备课
|
||||||
const addLesson = ({ id }) => {
|
const addLesson = ({ id, fileSize }) => {
|
||||||
|
if (fileSize>1024*1024*150) {
|
||||||
|
ElMessage.warning('文件超过150M,暂停超过150M资源的下载,请重新选择')
|
||||||
|
return
|
||||||
|
}
|
||||||
let data = {
|
let data = {
|
||||||
id,
|
id,
|
||||||
fileRoot: '备课',
|
fileRoot: '备课',
|
||||||
|
@ -191,7 +195,7 @@ const handleRow = (item) => {
|
||||||
curRow.value = item
|
curRow.value = item
|
||||||
isShow.value = true
|
isShow.value = true
|
||||||
console.log(item,'item');
|
console.log(item,'item');
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -121,6 +121,10 @@ const handleRow = (item) => {
|
||||||
thirdPreview.value.init(item.itemId)
|
thirdPreview.value.init(item.itemId)
|
||||||
}
|
}
|
||||||
const openChapter = (item)=>{
|
const openChapter = (item)=>{
|
||||||
|
if (item.size>1024*1024*150) {
|
||||||
|
ElMessage.warning('文件超过150M,暂停超过150M资源的下载,请重新选择')
|
||||||
|
return
|
||||||
|
}
|
||||||
currentItem.value = item
|
currentItem.value = item
|
||||||
// 打开弹窗
|
// 打开弹窗
|
||||||
treelogRef.value.openDialog()
|
treelogRef.value.openDialog()
|
||||||
|
|
Loading…
Reference in New Issue