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

Merge remote-tracking branch 'origin/master'

Browse Source
dev_forum
杨树明 5 years ago
parent 63e3ae8385 9ca6811f6c
commit ffa647be48
4 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File

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

@ -1349,11 +1349,13 @@ class Listofworks extends Component {
axios.get(url).then((response) => { axios.get(url).then((response) => {
console.log("1350"); console.log("1350");
console.log(response); console.log(response);
if(response.data.status === 200){ if(response.data.status&&response.data.status===-1){
window.open("/api"+url, '_blank');
}else{
}else if(response.data.status&&response.data.status===-2){
}else{
window.open("/api"+url, '_blank');
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -1374,7 +1376,12 @@ class Listofworks extends Component {
axios.get(url).then((response) => { axios.get(url).then((response) => {
console.log("1374"); console.log("1374");
console.log(response); console.log(response);
if(response.data.status=== 200){ if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
}else{
window.open("/api"+url, '_blank'); window.open("/api"+url, '_blank');
} }

44
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -1608,21 +1608,20 @@ class Trainingjobsetting extends Component {
}) })
} }
// 导出实习报告批量 // 导出实习报告批量
internshipreport = () => { internshipreport = (url) => {
console.log("internshipreport"); console.log("internshipreport");
var homeworkid = this.props.match.params.homeworkid; // var homeworkid = this.props.match.params.homeworkid;
let url = "/zip/shixun_report"; // let url = "/zip/shixun_report";
axios.get((url),{ axios.get(url).then((response) => {
params: {
homework_common_id: homeworkid,
}
},{responseType: 'blob'}).then((response) => {
console.log("326"); console.log("326");
console.log(response); console.log(response);
if(response.status === 200){ if(response.data.status&&response.data.status===-1){
window.open(url, '_blank');
}else{
}else if(response.data.status&&response.data.status===-2){
}else{
window.open("/api"+url, '_blank');
} }
}).catch((error) => { }).catch((error) => {
@ -1631,19 +1630,22 @@ class Trainingjobsetting extends Component {
} }
// 课堂学生成绩的导出下载 // 课堂学生成绩的导出下载
Classstudentachievement = () => { Classstudentachievement = (url) => {
console.log("Classstudentachievement"); console.log("Classstudentachievement");
const course_id = this.props.match.params.coursesId; // const course_id = this.props.match.params.coursesId;
let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx"; // let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx";
axios.get((url),{responseType: 'blob'}).then((response) => { axios.get(url).then((response) => {
console.log("339"); console.log("1374");
console.log(response); console.log(response);
if(response.status === 200){ if(response.data.status&&response.data.status===-1){
window.open(url, '_blank');
}else if(response.data.status&&response.data.status===-2){
}else{ }else{
window.open("/api"+url, '_blank');
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
@ -1789,9 +1791,9 @@ class Trainingjobsetting extends Component {
{this.props.isAdmin() ? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}> {this.props.isAdmin() ? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}> <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
<li><a onClick={()=>this.internshipreport()}>实训报告</a> <li><a onClick={()=>this.internshipreport(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`)}>实训报告</a>
</li> </li>
<li><a onClick={()=>this.Classstudentachievement()}>学生成绩</a> <li><a onClick={()=>this.Classstudentachievement(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>学生成绩</a>
</li> </li>
</ul> </ul>
</li>: ""} </li>: ""}

44
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -319,21 +319,20 @@ class Workquestionandanswer extends Component {
// 导出实习报告批量 // 导出实习报告批量
internshipreport = () => { internshipreport = (url) => {
console.log("internshipreport"); console.log("internshipreport");
var homeworkid = this.props.match.params.homeworkid; // var homeworkid = this.props.match.params.homeworkid;
let url = "/zip/shixun_report"; // let url = "/zip/shixun_report";
axios.get((url),{ axios.get(url).then((response) => {
params: {
homework_common_id: homeworkid,
}
},{responseType: 'blob'}).then((response) => {
console.log("326"); console.log("326");
console.log(response); console.log(response);
if(response.status === 200){ if(response.data.status&&response.data.status===-1){
window.open(url, '_blank');
}else{
}else if(response.data.status&&response.data.status===-2){
}else{
window.open("/api"+url, '_blank');
} }
}).catch((error) => { }).catch((error) => {
@ -342,19 +341,22 @@ class Workquestionandanswer extends Component {
} }
// 课堂学生成绩的导出下载 // 课堂学生成绩的导出下载
Classstudentachievement = () => { Classstudentachievement = (url) => {
console.log("Classstudentachievement"); console.log("Classstudentachievement");
const course_id = this.props.match.params.coursesId; // const course_id = this.props.match.params.coursesId;
let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx"; // let url = "/courses/" + course_id + "/export_member_scores_excel.xlsx";
axios.get((url),{responseType: 'blob'}).then((response) => { axios.get(url).then((response) => {
console.log("339"); console.log("1374");
console.log(response); console.log(response);
if(response.status === 200){ if(response.data.status&&response.data.status===-1){
window.open(url, '_blank');
}else if(response.data.status&&response.data.status===-2){
}else{ }else{
window.open("/api"+url, '_blank');
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
@ -485,9 +487,9 @@ class Workquestionandanswer extends Component {
<li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}> <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}> <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
<li><a onClick={()=>this.internshipreport()}>实训报告</a> <li><a onClick={()=>this.internshipreport(`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`)}>实训报告</a>
</li> </li>
<li><a onClick={()=>this.Classstudentachievement()}>学生成绩</a> <li><a onClick={()=>this.Classstudentachievement(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>学生成绩</a>
</li> </li>
</ul> </ul>
</li> : ""} </li> : ""}

2
public/react/src/modules/tpm/TPMsettings/TPMsettings.js
Unescape View File

@ -1481,7 +1481,7 @@ export default class TPMsettings extends Component {
<a onClick={()=>this.testscripttip(0)}><img <a onClick={()=>this.testscripttip(0)}><img
src={getImageUrl("images/educoder/problem.png") }/></a> src={getImageUrl("images/educoder/problem.png") }/></a>
<div className="invite-tip clearfix none " id="test_script_tip" <div className="invite-tip clearfix none " id="test_script_tip"
style={{top: '33px', right: '-6px',width: '271px',zIndex: '10',display: testscripttiptype===true?'block':"none"}}> style={{top: '33px', right: '-6px',width: '322px',zIndex: '10',display: testscripttiptype===true?'block':"none"}}>
<span className="top-black-trangle"></span> <span className="top-black-trangle"></span>
<div className="padding20 invitecontent clearfix"> <div className="padding20 invitecontent clearfix">
<p className="font-12 edu-txt-left"> <p className="font-12 edu-txt-left">

Write Preview
Loading…
Cancel
Save