diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 6a1e16d6d..57c69f837 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -28,16 +28,24 @@ class Fileslistitem extends Component{ this.props.Settingtypes(discussMessage.id) } - downloadfiles=(url,name)=>{ - const aLink = document.createElement('a'); - aLink.style.display='none'; - console.log(name) - aLink.setAttribute('download',name) - aLink.href = url; - document.body.appendChild(aLink); - aLink.click(); - // document.body.removeChild(aLink); + downloadfiles=(url)=>{ + axios.get((url),{responseType: 'blob'}).then((response) => { + const blob = new Blob([response.data]); + const downloadElement = document.createElement('a'); + const href = window.URL.createObjectURL(blob); + // const string = Base64.decode(response.headers['content-disposition'].split('=')[1]); + const string = response.headers['content-disposition'].split('=')[1]; + downloadElement.href = href; + downloadElement.download = string; + document.body.appendChild(downloadElement); + downloadElement.click(); + document.body.removeChild(downloadElement) ;// 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放掉blob对象 + }).catch((error) => { + console.log(error) + }); } + showfiles=(value)=>{ let {discussMessage,coursesId}=this.props let file_id=discussMessage.id @@ -47,16 +55,14 @@ class Fileslistitem extends Component{ course_id:coursesId }, }).then((result)=>{ - if(result.data.attachment_histories.length===0){ - this.downloadfiles(result.data.url,result.data.title) + this.downloadfiles(result.data.url) }else{ this.setState({ Showoldfiles:true, allfiles:result.data }) } - }).catch((error)=>{ console.log(error) }) @@ -208,15 +214,19 @@ class Fileslistitem extends Component{ } { - this.props.isNotMember ? + this.props.isNotMember===true? + discussMessage.is_lock === true ? {discussMessage.title} - :"" - } + :this.showfiles(discussMessage.title)} + title={discussMessage.title} + className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}:"" + } { discussMessage.is_lock === true ? - + :"" diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index 8ffd16937..e890b92ef 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -107,9 +107,9 @@ class ExerciseListItem extends Component{ } { - this.props.isNotMember()? + this.props.isNotMember()? item.lock_status === 0 ? {item.exercise_name} - :"" + : {item.exercise_name}:"" } { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 10ce65436..892a8d599 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -229,15 +229,17 @@ class GraduateTaskItem extends Component{ } { - this.props.isNotMember? + this.props.isNotMember===true?this.props.discussMessage.private_icon===true? {discussMessage.name} - :"" + :{discussMessage.name}:"" } { this.props.discussMessage.private_icon===true? - + : diff --git a/public/react/src/modules/courses/shixunHomework/Httpdownloads.js b/public/react/src/modules/courses/shixunHomework/Httpdownloads.js index 11bd91f6b..84b1d090b 100644 --- a/public/react/src/modules/courses/shixunHomework/Httpdownloads.js +++ b/public/react/src/modules/courses/shixunHomework/Httpdownloads.js @@ -3,8 +3,7 @@ import axios from 'axios'; // 导出实习报告批量zip 、xlsx 类型 -export function Internshipreportsy (url,struy,types,stingtype){ - axios.get((url),{responseType: 'blob'}).then((response) => { +export function Internshipreportsy (url,struy,types,stingtype,response){ const blob = new Blob([response.data], { type: stingtype }); const downloadElement = document.createElement('a'); const href = window.URL.createObjectURL(blob); @@ -15,7 +14,4 @@ export function Internshipreportsy (url,struy,types,stingtype){ downloadElement.click(); document.body.removeChild(downloadElement) ;// 下载完成移除元素 window.URL.revokeObjectURL(href) // 释放掉blob对象 - }).catch((error) => { - console.log(error) - }); } \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 58c868677..832d5eaa4 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1355,11 +1355,11 @@ class Listofworks extends Component { }else if(response.data.status&&response.data.status===-2){ }else { - if(type === 1){ - Internshipreportsy(url,struy,".zip",'application/zip'); - }else{ - Internshipreportsy(url,struy,".xlsx",'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); - } + // if(type === 1){ + // Internshipreportsy(url,struy,".zip",'application/zip'); + // }else{ + Internshipreportsy(url,struy,".xlsx",'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',response); + // } } } }).catch((error) => { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 459a88e5e..912366168 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -304,15 +304,16 @@ class ShixunhomeWorkItem extends Component{ } { - this.props.isNotMember? - {discussMessage.name} - :"" + this.props.isNotMember===true? this.props.discussMessage.private_icon===true? + {discussMessage.name} + : {discussMessage.name}:"" } { this.props.discussMessage.private_icon===true? - + :