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>*/}

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

@ -1,220 +1,221 @@
/*MemoDetail --------------------------------- START */ /*MemoDetail --------------------------------- START */
.educontent { .educontent {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* 左侧区域最小高度*/
#forum_index_list { /* 左侧区域最小高度*/
min-height: 400px; #forum_index_list {
position: relative; min-height: 400px;
} position: relative;
.noMemosTip { }
position: absolute; .noMemosTip {
right: 10px; position: absolute;
top: 58px; right: 10px;
z-index: 999; top: 58px;
} z-index: 999;
#forum_list { }
background: #f9f9f9; #forum_list {
} background: #f9f9f9;
#forum_list .return_btn { }
line-height: 38px; #forum_list .return_btn {
/* margin-right: 15px; */ line-height: 38px;
font-size: 14px; /* margin-right: 15px; */
cursor: pointer; font-size: 14px;
} cursor: pointer;
#forum_list .return_btn.no_mr { }
margin-right: -16px; #forum_list .return_btn.no_mr {
} margin-right: -16px;
div#forum_list>div { }
background: #fff; div#forum_list>div {
} background: #fff;
.memoContent img { }
max-width: 815px; .memoContent img {
} max-width: 815px;
.memoReplies { }
position: relative; .memoReplies {
margin-top: 8px; position: relative;
} margin-top: 8px;
.memoReplies .-fit { }
position: static; .memoReplies .-fit {
} position: static;
.replies_count { }
margin-left: 12px; .replies_count {
} margin-left: 12px;
.replies_count .label { }
color: #666666; .replies_count .label {
} color: #666666;
.replies_count .count { }
color: #999999; .replies_count .count {
margin-left: 10px; color: #999999;
} margin-left: 10px;
}
.memoMore {
padding-top: 10px; .memoMore {
height: 50px; padding-top: 10px;
line-height: 50px; height: 50px;
text-align: center; line-height: 50px;
color: rgba(69,155,230,1); text-align: center;
cursor: pointer; color: rgba(69,155,230,1);
position: relative; cursor: pointer;
} position: relative;
.memoMore .writeCommentBtn{ }
position: absolute; .memoMore .writeCommentBtn{
right: 0px; position: absolute;
color: #666666; right: 0px;
top: 15px; color: #666666;
} top: 15px;
.memoMore .writeCommentBtn:hover { }
color: #4DACFF; .memoMore .writeCommentBtn:hover {
} color: #4DACFF;
/*使用md編輯器用为子回复时，宽度会变*/ }
.panel-comment_item .comment_orig_content { /*使用md編輯器用为子回复时，宽度会变*/
width: 705px; .panel-comment_item .comment_orig_content {
} width: 705px;
}
.iconfont.icon-xiazai {
font-size: 22px!important; .iconfont.icon-xiazai {
margin-right: 6px; font-size: 22px!important;
} margin-right: 6px;
/* MemoDetail --------------------------------- END */ }
/* MemoDetail --------------------------------- END */
/* PostItem --------------------------------- START */
.forum_table_item { /* PostItem --------------------------------- START */
padding-left: 20px; .forum_table_item {
} padding-left: 20px;
/* 置顶 */ }
.forum_table_item .btn-top { /* 置顶 */
border-radius: 11px; .forum_table_item .btn-top {
padding: 0px 6px; border-radius: 11px;
background: #FF4343; padding: 0px 6px;
background: #FF4343;
}
}
/* 管理员操作 */
.edu-position-hide { /* 管理员操作 */
position: absolute; .edu-position-hide {
top: 15px; position: absolute;
left: -20px; top: 15px;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); left: -20px;
background: #fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
z-index: 1001; background: #fff;
padding: 5px 0; z-index: 1001;
z-index: 999999; padding: 5px 0;
} z-index: 999999;
.edu-position-hide li a:hover { }
background: #4CACFF; .edu-position-hide li a:hover {
color: #fff; background: #4CACFF;
} color: #fff;
.edu-position-hidebox>a:link{ }
color: #4CACFF; .edu-position-hidebox>a:link{
} color: #4CACFF;
.edu-position-hidebox:hover .edu-position-hide { }
display: block; .edu-position-hidebox:hover .edu-position-hide {
} display: block;
.edu-position-hide li a { }
display: inline-block; .edu-position-hide li a {
height: 30px; display: inline-block;
width: 100px; height: 30px;
line-height: 30px; width: 100px;
text-align: center; line-height: 30px;
font-size: 12px!important; text-align: center;
} font-size: 12px!important;
/* PostItem --------------------------------- END */ }
/* PostItem --------------------------------- END */
/* MemoNew --------------------------------- START */
/* MemoNew --------------------------------- START */
#attachments_fields div.ui-progressbar {
width: 120px; #attachments_fields div.ui-progressbar {
height: 10px; width: 120px;
margin: 2px 0 -2px 8px; height: 10px;
display: inline-block; margin: 2px 0 -2px 8px;
} display: inline-block;
.ui-widget-header { }
border: 1px solid #4CACFF; .ui-widget-header {
background: #4CACFF; border: 1px solid #4CACFF;
} background: #4CACFF;
.iconfont.icon-fujian { }
color: #29BD8B .iconfont.icon-fujian {
} color: #29BD8B
}
/* rc-select样式覆写*/
.ecSelect { /* rc-select样式覆写*/
width: 300px; .ecSelect {
} width: 300px;
.ecSelect .rc-select-selection { }
height: 40px; .ecSelect .rc-select-selection {
} height: 40px;
.ecSelect .rc-select-search--inline .rc-select-search__field { }
padding-top: 6px; .ecSelect .rc-select-search--inline .rc-select-search__field {
} padding-top: 6px;
.ecSelect .rc-select-selection--single .rc-select-selection-selected-value }
, .ecSelect .rc-select-selection__placeholder { .ecSelect .rc-select-selection--single .rc-select-selection-selected-value
top: 6px; , .ecSelect .rc-select-selection__placeholder {
top: 6px;
}
.ecSelect .rc-select-arrow { }
top: 6px; .ecSelect .rc-select-arrow {
} top: 6px;
.defalutCancelbtn { }
cursor: pointer; .defalutCancelbtn {
} cursor: pointer;
.defalutSubmitbtnysl{ }
display: block;border: 1px solid #4CACFF;background-color: #4CACFF;color: #fff!important;width: 120px;text-align: center;line-height: 40px;border-radius: 2px; .defalutSubmitbtnysl{
width: 130px; display: block;border: 1px solid #4CACFF;background-color: #4CACFF;color: #fff!important;width: 120px;text-align: center;line-height: 40px;border-radius: 2px;
height: 40px; width: 130px;
background: rgba(76,172,255,1); height: 40px;
border-radius: 4px; background: rgba(76,172,255,1);
font-size: 16px; border-radius: 4px;
font-family: MicrosoftYaHei; font-size: 16px;
font-weight: 400; font-family: MicrosoftYaHei;
color: rgba(255,255,255,1); font-weight: 400;
} color: rgba(255,255,255,1);
#attachments_fields { }
margin-left: -77px; #attachments_fields {
display: flex; margin-left: -77px;
flex-direction: column; display: flex;
} flex-direction: column;
.uploadBtn { }
/* margin-left: 46px; */ .uploadBtn {
} /* margin-left: 46px; */
#memoMD.show_content_grey { }
padding: 0; #memoMD.show_content_grey {
} padding: 0;
.newForm .attachments_fields { }
/*margin-left: -39px !important*/ .newForm .attachments_fields {
} /*margin-left: -39px !important*/
#attachments_fields div.ui-progressbar { }
width: 120px; #attachments_fields div.ui-progressbar {
height: 10px; width: 120px;
margin: 2px 0 -2px 8px; height: 10px;
display: inline-block; margin: 2px 0 -2px 8px;
} display: inline-block;
.ui-progressbar-value.ui-widget-header { }
border: 1px solid #4CACFF; .ui-progressbar-value.ui-widget-header {
background: #4CACFF; border: 1px solid #4CACFF;
} background: #4CACFF;
/* MemoNew --------------------------------- END */ }
/* MemoNew --------------------------------- END */
/*RightMyPublish*/
.publishMemoSection { /*RightMyPublish*/
padding-bottom: 0px !important; .publishMemoSection {
} padding-bottom: 0px !important;
.advertisement { }
margin-top: 10px; .advertisement {
height: 155px; margin-top: 10px;
} height: 155px;
.advertisement img{ }
width: 100%; .advertisement img{
} width: 100%;
}
/* MyPublish*/
.returnBtn { /* MyPublish*/
font-size:16px; .returnBtn {
color:rgba(153,153,153,1); font-size:16px;
float: right; color:rgba(153,153,153,1);
margin-right: 50px; float: right;
position: relative; margin-right: 50px;
bottom: 12px; position: relative;
bottom: 12px;
} }

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

1569
public/stylesheets/educoder/edu-main.css
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save