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

调整

Browse Source
dev_forum
杨树林 6 years ago
parent 19f678e597
commit 618efb6df1
7 changed files with 1132 additions and 1108 deletions
Show Stats Download Patch File Download Diff File

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

@ -91,6 +91,7 @@ class Listofworks extends Component {
unlimited: 0, unlimited: 0,
unlimitedtwo: 1, unlimitedtwo: 1,
code_review: false, code_review: false,
boolgalist:false,
columns: [ columns: [
{ {
title: '序号', title: '序号',
@ -778,7 +779,7 @@ class Listofworks extends Component {
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
let datalist = []; let datalist = [];
var game_list = result.data.game_list var game_list = result.data.game_list
var boolgalist=false;
for (var i = 0; i < game_list.length; i++) { for (var i = 0; i < game_list.length; i++) {
datalist.push({ datalist.push({
@ -789,6 +790,10 @@ class Listofworks extends Component {
complete_status: game_list[i].complete_status, complete_status: game_list[i].complete_status,
}) })
if(game_list[i].complete_status === 1){
boolgalist=true;
}
} }
// console.log("viewtraining"); // console.log("viewtraining");
// console.log(datalist); // console.log(datalist);
@ -796,7 +801,8 @@ class Listofworks extends Component {
this.setState({ this.setState({
viewtrainingdata: result.data, viewtrainingdata: result.data,
visibles: true, visibles: true,
game_list: datalist game_list: datalist,
boolgalist:boolgalist,
}) })
} }
}).catch((error) => { }).catch((error) => {
@ -1001,7 +1007,7 @@ class Listofworks extends Component {
render() { render() {
// console.log("Listofworks.js000") // console.log("Listofworks.js000")
let {columns, page, limit, course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state; let {columns, page, boolgalist,limit, course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
// //
// console.log(teacherdata&&teacherdata.shixun_identifier) // console.log(teacherdata&&teacherdata.shixun_identifier)
// console.log(course_group_info) // console.log(course_group_info)
@ -1045,6 +1051,7 @@ class Listofworks extends Component {
viewtrainingdata={viewtrainingdata} viewtrainingdata={viewtrainingdata}
game_list={game_list} game_list={game_list}
visible={visibles} visible={visibles}
boolgalist={boolgalist}
Cancel={() => this.cancelModulationModels()} Cancel={() => this.cancelModulationModels()}
/> />
@ -1080,12 +1087,12 @@ class Listofworks extends Component {
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<ActionBtn <ActionBtn
className=" btn colorgrey fl hovercolorblue " className=" btn colorgrey fl hovercolorblue "
to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn> to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id===undefined?"":jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">作业详情</WordsBtn> <WordsBtn className="fl">作业详情</WordsBtn>
</p> </p>
</div> </div>
<div className="educontent mb30"> <div className="educontent mb30" style={{width:"1250px"}}>
<p className=" fl color-black summaryname"> <p className=" fl color-black summaryname">
{teacherdata === undefined ? "" : teacherdata.homework_name} {teacherdata === undefined ? "" : teacherdata.homework_name}
</p> </p>
@ -1101,7 +1108,7 @@ class Listofworks extends Component {
</div> </div>
<div className="edu-back-white"> <div className="edu-back-white" style={{width:"1250px"}}>
<div className="stud-class-set bor-bottom-greyE "> <div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list"> <div className=" clearfix edu-back-white poll_list">
<Link className="active" <Link className="active"
@ -1164,7 +1171,7 @@ class Listofworks extends Component {
</CheckboxGroup> </CheckboxGroup>
{/*请输入姓名或学号搜索*/} {/*请输入姓名或学号搜索*/}
<div className="fr mr5 search-new" style={{marginBottom: '1px'}}> <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
<Search <Search
placeholder="请输入姓名或学号搜索" placeholder="请输入姓名或学号搜索"
id="subject_search_input" id="subject_search_input"

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

@ -688,7 +688,7 @@ class Listofworksstudentone extends Component {
<WordsBtn className="fl">作业详情</WordsBtn> <WordsBtn className="fl">作业详情</WordsBtn>
</p> </p>
</div> </div>
<div className="educontent mb30"> <div className="educontent mb30" style={{width:"1250px"}}>
<p className=" fl color-black summaryname"> <p className=" fl color-black summaryname">
{teacherdata === undefined ? "" : teacherdata.homework_name} {teacherdata === undefined ? "" : teacherdata.homework_name}
</p> </p>
@ -696,11 +696,11 @@ class Listofworksstudentone extends Component {
typelist={teacherdata === undefined ? [""] : teacherdata.homework_status} typelist={teacherdata === undefined ? [""] : teacherdata.homework_status}
/> />
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" <a className="color-grey-9 fr font-16 summaryname ml20 mr20"
href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}`}>返回</a> href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id===undefined?"":jobsettingsdata.data.category.category_id}`}>返回</a>
<p className="color-grey-9 fr font-16"></p> <p className="color-grey-9 fr font-16"></p>
</div> </div>
<div className="edu-back-white"> <div className="edu-back-white" style={{width:"1250px"}}>
<div className="stud-class-set bor-bottom-greyE "> <div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list"> <div className=" clearfix edu-back-white poll_list">
<Link className="active" <Link className="active"

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

@ -36,10 +36,10 @@ class TraineetraininginformationModal extends Component {
props: this.props, props: this.props,
userids: this.props.userids, userids: this.props.userids,
game_list:this.props.game_list, game_list:this.props.game_list,
gline:0, boolgalist:this.props.boolgalist,
}) })
// console.log("TraineetraininginformationModal") // console.log("TraineetraininginformationModal")
// console.log(this.props) // console.log(this.props)
} }
@ -51,123 +51,133 @@ class TraineetraininginformationModal extends Component {
// this.seacthdata(); // this.seacthdata();
} }
// 设置数据 LimitNumber=(txt)=> {
// seacthdata = () => { var str = txt;
// if(str.length>25){
// console.log(datalist) str = str.substring(0,25)+"......"
// } }
return str;
}
render() { render() {
const columns = [ var columns;
if(this.props.boolgalist === true) {
columns = [
{ {
title: '关卡', title: '关卡',
dataIndex: 'number', dataIndex: 'number',
key: 'number', key: 'number',
width: 92,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a> <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
</span> </span>
), ),
}, },
{ {
title: '完成时间', title: '完成时间',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
width: 178, width: 178,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a> <a style={{
"color": '#989898',
"text-align": "center"
}}>{record.name === 'Invalid date' ? "--" : record.name}</a>
</span> </span>
), ),
}, },
{ {
title: '耗时', title: '',
dataIndex: 'stduynumber', dataIndex: 'complete_status',
key: 'stduynumber', key: 'complete_status',
align: "center", width: 100,
render: (text, record) => ( align: "center",
<span> render: (text, record) => (
<a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a> <span>
{record.complete_status === 2 ? <img src={delay}/> : record.complete_status === 3 ?
<img src={invalid}/> : ""}
</span> </span>
), ),
}, },
{ {
title: '经验值', title: '耗时',
key: 'classroom', dataIndex: 'stduynumber',
dataIndex: 'classroom', key: 'stduynumber',
align: "center", width: 92,
render: (text, record) => ( align: "center",
<span> render: (text, record) => (
<a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a> <span>
<a style={{"color": '#989898', "text-align": "center"}}>{record.stduynumber}</a>
</span> </span>
), ),
} },
];
const columnss = [
{ {
title: '关卡', title: '经验值',
dataIndex: 'number', key: 'classroom',
key: 'number',
width: 92, width: 92,
dataIndex: 'classroom',
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span>
<a style={{"color": '#29BD8B', "text-align": "center"}}>{record.classroom}</a>
</span>
),
}
]
}
else {
columns = [
{
title: '关卡',
dataIndex: 'number',
key: 'number',
align: "center",
render: (text, record) => (
<span >
<a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a> <a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a>
</span> </span>
), ),
}, },
{ {
title: '完成时间', title: '完成时间',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
width: 178, width: 178,
align: "center", align: "center",
render: (text, record) => ( render: (text, record) => (
<span > <span >
<a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a> <a style={{"color":'#989898', "text-align": "center"}} >{record.name==='Invalid date'?"--":record.name}</a>
</span> </span>
), ),
}, },
{ {
title: '', title: '耗时',
dataIndex: 'complete_status', dataIndex: 'stduynumber',
key: 'complete_status', key: 'stduynumber',
width: 100, align: "center",
align: "center", render: (text, record) => (
render: (text, record) => ( <span>
<span>
{record.complete_status===2?<img src={delay}/>:record.complete_status===3?<img src={invalid}/>:""}
</span>
),
},
{
title: '耗时',
dataIndex: 'stduynumber',
key: 'stduynumber',
width: 92,
align: "center",
render: (text, record) => (
<span>
<a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a> <a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a>
</span> </span>
), ),
}, },
{ {
title: '经验值', title: '经验值',
key: 'classroom', key: 'classroom',
width: 92, dataIndex: 'classroom',
dataIndex: 'classroom', align: "center",
align: "center", render: (text, record) => (
render: (text, record) => ( <span>
<span>
<a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a> <a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a>
</span> </span>
), ),
}
]
} }
];
return ( return (
<div> <div>
<Modal <Modal
@ -181,7 +191,7 @@ class TraineetraininginformationModal extends Component {
<div style={{width:"100%" }}className="login_register_content" > <div style={{width:"100%" }}className="login_register_content" >
<div style={{"width": "100%","text-align": "left","clear": "both"}}> <div style={{"width": "100%","text-align": "left","clear": "both"}}>
<div className="mt5 fl" > <div className="mt5 fl" >
<span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_name}</span> <span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" : this.LimitNumber(this.props.viewtrainingdata.shixun_name)}</span>
<span className="ml10 " style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span> <span className="ml10 " style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
</div> </div>
{/*<Button type="primary" className="ml30" >实训报告</Button>*/} {/*<Button type="primary" className="ml30" >实训报告</Button>*/}

1
public/react/src/modules/forums/Post.css
Unescape View File

@ -2,6 +2,7 @@
.educontent { .educontent {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* 左侧区域最小高度*/ /* 左侧区域最小高度*/
#forum_index_list { #forum_index_list {
min-height: 400px; min-height: 400px;

5
public/react/src/modules/forums/RightSection.css
Unescape View File

@ -8,6 +8,11 @@
height: 30px; height: 30px;
margin-bottom: 30px; margin-bottom: 30px;
margin-right: 35px; margin-right: 35px;
}
.search-newysl {
width:237px!important;
height: 30px;
margin-bottom: 30px;
} }
.search-new-input { .search-new-input {
padding-left: 16px; padding-left: 16px;

2
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -319,7 +319,7 @@ class LoginDialog extends Component {
this.setState({ this.setState({
isRender: false isRender: false
}) })
window.location.href="/"; // window.location.href="/";
} }
loginEDU=()=>{ loginEDU=()=>{

1
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -782,3 +782,4 @@ html>body #ajax-indicator { position: fixed; }
.editormd-dialog-footer{ .editormd-dialog-footer{
padding: 0px; padding: 0px;
} }
.educontentysl{width: 1250px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/

Write Preview
Loading…
Cancel
Save