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

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

Browse Source
dev_hjm
daiao 6 years ago
parent 2e53af0f4f f8c7f1eaa2
commit cf941f60d8
5 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File

25
public/react/src/modules/courses/boards/TopicDetail.css
Unescape View File

@ -1,12 +1,15 @@
.edu-class-container { .edu-class-container {
width: 1200px; width: 1200px;
margin: 10px auto 20px; margin: 10px auto 20px;
} }
#forum_index_list { #forum_index_list {
margin-top: 90px; margin-top: 90px;
margin-bottom: 320px; margin-bottom: 320px;
} }
#yslforum_index_list {
.uploadBtn { margin-top: 20px;
margin-left: 0px; margin-bottom: 320px;
}
.uploadBtn {
margin-left: 0px;
} }

2
public/react/src/modules/courses/boards/TopicDetail.js
Unescape View File

@ -526,7 +526,7 @@ class TopicDetail extends Component {
const courseId=this.props.match.params.coursesId; const courseId=this.props.match.params.coursesId;
const boardId = this.props.match.params.boardId const boardId = this.props.match.params.boardId
return ( return (
<div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="forum_index_list"> {/* fl with100 */} <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
<style>{` <style>{`
.topicDetail #forum_list .return_btn.no_mr { .topicDetail #forum_list .return_btn.no_mr {
margin-right: 1px; margin-right: 1px;

2
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -278,7 +278,7 @@ class CommonWorkPost extends Component{
} }
// 附件相关 START // 附件相关 START
handleChange = (info) => { handleChange = (info) => {
if (info.file.status === 'uploading') { if (info.file.status === 'uploading' || info.file.status === 'done') {
let fileList = info.fileList; let fileList = info.fileList;
this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) }); this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });

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

@ -71,13 +71,13 @@ class ShixunWorkDetails extends Component {
<div className="educontent"> <div className="educontent">
<p className="clearfix mt20"> <p className="clearfix mt20">
<a className="fl color-grey-9 btn colorgrey hovercolorblue" <a className="fl color-grey-9 btn colorgrey hovercolorblue"
onClick={()=>this.goback(1)} href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`}
> >
<span className={"color-grey-9"}>{data&&data.course_name}123</span> <a className={"color-grey-9"} >{data&&data.course_name}</a>
</a> </a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<a className="btn colorgrey fl hovercolorblue grey" <a className="btn colorgrey fl hovercolorblue grey"
onClick={this.goback} href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}/list?tab=0`}
// to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id} // to={"/courses/"+data&&data.course_id+"/"+this.state.shixuntypes+"/"+data&&data.homework_common_id}
> >
<span className={"color-grey-9"}>实训作业</span> <span className={"color-grey-9"}>实训作业</span>

77
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js
Unescape View File

@ -28,10 +28,10 @@ class ShixunCustomsPass extends Component {
datas.push({ datas.push({
customs:{position:item.position,subject:item.subject}, customs:{position:item.position,subject:item.subject},
taskname:{name:item.username}, taskname:{name:item.username},
openingtime:moment(item.end_time).format('YYYY-MM-DD HH:mm:ss'), openingtime:item.end_time===null?"无":item.end_time===undefined?"无":item.end_time===""?"无":moment(item.end_time).format('YYYY-MM-DD HH:mm:ss'),
evaluating: {final_score:item.final_score,all_score:item.all_score}, evaluating: {final_score:item.final_score,all_score:item.all_score},
finishtime:item.copy_username, finishtime:item.copy_username,
elapsedtime:moment(item.copy_end_time).format('YYYY-MM-DD HH:mm:ss'), elapsedtime:item.copy_end_time===null?"无":item.copy_end_time===undefined?"无":item.copy_end_time===""?"无":moment(item.copy_end_time).format('YYYY-MM-DD HH:mm:ss'),
empvalue:item.code_rate, empvalue:item.code_rate,
// adjustmentminute:asdasd // adjustmentminute:asdasd
}) })
@ -200,6 +200,9 @@ class ShixunCustomsPass extends Component {
</style> </style>
{ {
data&&data.challenge_list.map((item,key)=>{ data&&data.challenge_list.map((item,key)=>{
// console.log("203challenge_list下面的数据");
// console.log(item);
// console.log(JSON.stringify(item));
return( return(
<div key={key} className={"mb20"}> <div key={key} className={"mb20"}>
<div className="font-16 color-dark-21 ml20 mr20"> <div className="font-16 color-dark-21 ml20 mr20">
@ -213,46 +216,46 @@ class ShixunCustomsPass extends Component {
<span className={"font-14"}>{item.subject}</span> <span className={"font-14"}>{item.subject}</span>
</a> </a>
</span> </span>
<span className="fr codeboxright">代码文件：{item.code_list[0].path}</span> <span className="fr codeboxright">代码文件：{item.code_list.length===0?"无":item.code_list[0].path===undefined?"无":item.code_list[0].path}</span>
</p> </p>
</div> </div>
{item.code_list.map((ite,k)=>{ {item.code_list.length===0?"":item.code_list.map((ite,k)=>{
return( return(
<div className="font-16 color-dark-21 ml20 mr20" key={k}> <div className="font-16 color-dark-21 ml20 mr20" key={k}>
<div className=" mt15"> <div className=" mt15">
<p className="clearfix pt5 pb5 codebox"> <p className="clearfix pt5 pb5 codebox">
<span className="fl"> <span className="fl">
<span className={"colorC8161D"}>{item.username}</span> <span className={"colorC8161D"}>{item.username}</span>
的代码文件 的代码文件
</span> </span>
<span className="fr"> <span className="fr">
<span className={"color-green"}>{item.copy_username}</span> <span className={"color-green"}>{item.copy_username}</span>
的代码文件 的代码文件
</span> </span>
</p> </p>
<style> <style>
{` {`
.borderccc{ .borderccc{
border:1px solid #ccc border:1px solid #ccc
} }
`} `}
</style> </style>
<div className="test-code mt20 borderccc"> <div className="test-code mt20 borderccc">
<li className="clearfix"> <li className="clearfix">
<MonacoDiffEditor <MonacoDiffEditor
height="500" height="500"
// language="javascript" // language="javascript"
original={ite.origin_content} original={ite.origin_content}
value={ ite.target_content} value={ ite.target_content}
// options={options} // options={options}
/> />
</li> </li>
</div> </div>
</div> </div>
</div> </div>
) )
})} })}
</div> </div>
@ -267,4 +270,4 @@ class ShixunCustomsPass extends Component {
} }
} }
export default ShixunCustomsPass; export default ShixunCustomsPass;

Write Preview
Loading…
Cancel
Save