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 bca7a89c8c 3bda274a30
commit a5339cd95a
5 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
public/react/package.json
Unescape View File

@ -93,7 +93,7 @@
"wrap-md-editor": "^0.2.20" "wrap-md-editor": "^0.2.20"
}, },
"scripts": { "scripts": {
"start": "node --max_old_space_size=8072 scripts/start.js", "start": "node --max_old_space_size=15360 scripts/start.js",
"build": "node --max_old_space_size=15360 scripts/build.js", "build": "node --max_old_space_size=15360 scripts/build.js",
"concat": "node scripts/concat.js", "concat": "node scripts/concat.js",
"gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json", "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",

4
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -123,7 +123,7 @@ class Fileslists extends Component{
list.map((item,key)=>{ list.map((item,key)=>{
course_second_categoriess=item.course_second_categories course_second_categoriess=item.course_second_categories
}) })
debugger
this.setState({ this.setState({
course_modules:response.data, course_modules:response.data,
has_course_groups:response.data.has_course_groups, has_course_groups:response.data.has_course_groups,
@ -850,7 +850,7 @@ class Fileslists extends Component{
{/*})*/} {/*})*/}
{/*)*/} {/*)*/}
{/*})}*/} {/*})}*/}
{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)? {this.props.isAdmin()?parseInt(this.props.match.params.main_id)===filesId&&filesId?
<p className="drop_down_btn"> <p className="drop_down_btn">
<a className="color-grey-6" onClick={()=>this.addDir()}>添加目录</a> <a className="color-grey-6" onClick={()=>this.addDir()}>添加目录</a>
</p> </p>

2
public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
Unescape View File

@ -102,7 +102,7 @@ class Exercisestatisticalresult extends Component {
} }
`} `}
</style> </style>
<div className={"educontent mb20" } style={{width: "1250px"}}> <div className={"educontent mb20" } >
{data&&data.course_groups.length===0?"":<div className="stud-class-set"> {data&&data.course_groups.length===0?"":<div className="stud-class-set">
<div className="clearfix edu-back-white"> <div className="clearfix edu-back-white">

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

@ -1346,7 +1346,7 @@ class Listofworks extends Component {
// } // }
// let url = "/zip/shixun_report"; // let url = "/zip/shixun_report";
// let homeworkid = this.props.match.params.homeworkid; // let homeworkid = this.props.match.params.homeworkid;
axios.get((url),{headers:{'filename':'utf-8'}}).then((response) => { axios.get((url),{responseType: 'blob'}).then((response) => {
console.log("1350"); console.log("1350");
console.log(response); console.log(response);
if(response.data.status&&response.data.status===-1){ if(response.data.status&&response.data.status===-1){
@ -1355,50 +1355,25 @@ class Listofworks extends Component {
}else if(response.data.status&&response.data.status===-2){ }else if(response.data.status&&response.data.status===-2){
}else{ }else{
window.location.href("/api"+url); // window.location.href("/api"+url);
// response.blob().then(blob => { console.log("开始下载zip文件")
// //关闭loading 按钮恢复正常 const type='application/zip'//ZIP文件
// let blobUrl = window.URL.createObjectURL(blob); const blob = new Blob([response.data], { type: type })
// const filename = times.formatNowDate() + '.zip'; const downloadElement = document.createElement('a')
// const aElement = document.createElement('a'); const href = window.URL.createObjectURL(blob)
// document.body.appendChild(aElement); //后台再header中传文件名
// aElement.style.display = 'none'; const name = decodeURI(response.headers['content-disposition'].split('=')[1])
// aElement.href = blobUrl; downloadElement.href = href
// aElement.download = filename; downloadElement.download = name
// aElement.click(); document.body.appendChild(downloadElement)
// document.body.removeChild(aElement); downloadElement.click()
// }); document.body.removeChild(downloadElement) // 下载完成移除元素
window.URL.revokeObjectURL(href) // 释放掉blob对象
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
} }
//字节装为字符串
utf8ByteArrayToString(bytes) {
var out = [], pos =0, c =0;
while (pos < bytes.length) {
var c1 = bytes[pos++];
if (c1 <128) {
out[c++] = String.fromCharCode(c1);
}else if (c1 >191 && c1 <224) {
var c2 = bytes[pos++];
out[c++] = String.fromCharCode((c1 &31) <<6 | c2 &63);
}else if (c1 >239 && c1 <365) {
var c2 = bytes[pos++];
var c3 = bytes[pos++];
var c4 = bytes[pos++];
var u = ((c1 &7) <<18 | (c2 &63) <<12 | (c3 &63) <<6 | c4 &63) -0x10000;
out[c++] = String.fromCharCode(0xD800 + (u >>10));
out[c++] = String.fromCharCode(0xDC00 + (u &1023));
}else {
var c2 = bytes[pos++];
var c3 = bytes[pos++];
out[c++] =String.fromCharCode((c1 &15) <<12 | (c2 &63) <<6 | c3 &63);
}
}
return out.join('');
}
// 课堂学生成绩的导出下载 // 课堂学生成绩的导出下载
Classstudentachievement=(url)=>{ Classstudentachievement=(url)=>{
console.log("Classstudentachievement"); console.log("Classstudentachievement");
@ -1410,7 +1385,7 @@ class Listofworks extends Component {
// search: this.state.searchtext, // search: this.state.searchtext,
// } // }
// },{responseType: 'blob'}) // },{responseType: 'blob'})
axios.get((url),{headers:{'filename':'utf-8'}}).then((response) => { axios.get((url),{responseType: 'blob'}).then((response) => {
console.log("1374"); console.log("1374");
console.log(response); console.log(response);
if(response.data.status&&response.data.status===-1){ if(response.data.status&&response.data.status===-1){
@ -1419,9 +1394,20 @@ class Listofworks extends Component {
}else if(response.data.status&&response.data.status===-2){ }else if(response.data.status&&response.data.status===-2){
}else{ }else{
window.location.href("/api"+url); const type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' //excel文件
const blob = new Blob([response.data], { type: type })
// window.open("/api"+url, '_blank'); const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)
//后台再header中传文件名
const name = decodeURI(response.headers['content-disposition'].split('=')[1])
console.log(response.headers['content-disposition'].split('=')[1]);
console.log(name);
downloadElement.href = href
downloadElement.download = name
document.body.appendChild(downloadElement)
downloadElement.click()
document.body.removeChild(downloadElement) // 下载完成移除元素
window.URL.revokeObjectURL(href) // 释放掉blob对象
} }
}).catch((error) => { }).catch((error) => {

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

@ -976,7 +976,8 @@ class ShixunHomework extends Component{
order, order,
}=this.state; }=this.state;
let main_id=this.props.match.params.main_id;
let category_id=this.props.match.params.category_id;
return( return(
<React.Fragment > <React.Fragment >
<div> <div>
@ -1131,7 +1132,7 @@ class ShixunHomework extends Component{
{course_modules&&course_modules.main_category.map((item,key)=>{ {course_modules&&course_modules.main_category.map((item,key)=>{
return( return(
datas&&datas.category_id===null?datas.main_category_id===item.main_category_id?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)}>{item.main_category_name}</li>:"" datas&&datas.category_id===null?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)}>{item.main_category_name}</li>:""
) )
})} })}
@ -1139,8 +1140,12 @@ class ShixunHomework extends Component{
{ course_modules&&course_modules.homework_category.filter((item,key)=> { { course_modules&&course_modules.homework_category.filter((item,key)=> {
return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1) return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1)
}).map( (item,key) => { }).map( (item,key) => {
return if(datas&&datas.category_id!=null&&datas&&datas.category_id===item.category_id===false){
datas&&datas.category_id!=null?datas.category_id===item.category_id?"":<li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>:"" return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>
}
if(datas&&datas.category_id===null){
return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )}>{item.category_name}</li>
}
})} })}
@ -1152,7 +1157,7 @@ class ShixunHomework extends Component{
} }
`} `}
</style> </style>
{course_modules&&course_modules.homework_category.length===0? {course_modules&&course_modules.homework_category.length===0&&datas&&datas.category_id===null?
<div className={"courseSecond"}>暂无数据</div>:""} <div className={"courseSecond"}>暂无数据</div>:""}
{/*{course_modules&&course_modules.homework_category.map((item,key)=>{*/} {/*{course_modules&&course_modules.homework_category.map((item,key)=>{*/}

Write Preview
Loading…
Cancel
Save