m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source
dev_forum
hjm 5 years ago
parent be00690f22 8e50879796
commit 09a3e14dd0
6 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File

42
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -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 ?
<span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
:""
}
:<a
onClick={()=>this.showfiles(discussMessage.title)}
title={discussMessage.title}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:""
}
{
discussMessage.is_lock === true ?
<Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip>
:""

4
public/react/src/modules/courses/exercise/ExerciseListItem.js
Unescape View File

@ -107,9 +107,9 @@ class ExerciseListItem extends Component{
}
{
this.props.isNotMember()?
this.props.isNotMember()? item.lock_status === 0 ?
<span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
:""
: <a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
}
{

8
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -229,15 +229,17 @@ class GraduateTaskItem extends Component{
}
{
this.props.isNotMember?
this.props.isNotMember===true?this.props.discussMessage.private_icon===true?
<span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
:""
:<a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
title={discussMessage.name}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
}
{
this.props.discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip>
:

6
public/react/src/modules/courses/shixunHomework/Httpdownloads.js
Unescape View File

@ -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)
});
}

10
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

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

9
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -304,15 +304,16 @@ class ShixunhomeWorkItem extends Component{
}
{
this.props.isNotMember?
<span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
:""
this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
<span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
: <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
}
{
this.props.discussMessage.private_icon===true?
<Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<Tooltip title={ this.props.isNotMember===true?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip>
:

Write Preview
Loading…
Cancel
Save