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

自己分支调整

Browse Source
dev_cs
杨树林 6 years ago
parent 671e05622d
commit 6be83e182d
2 changed files with 149 additions and 97 deletions
Show Stats Download Patch File Download Diff File

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

@ -93,27 +93,32 @@ class Listofworksstudentone extends Component {
key: 'number', key: 'number',
align: "center", align: "center",
className:'font-14', className:'font-14',
width:'100px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{width:'100px'}}>
{record.number === undefined ? {record.number === undefined ?
<span style={{ <span style={{
color: '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}> --</span> }}> --</span>
: record.number === "" ? : record.number === "" ?
<span style={{ <span style={{
color: '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: record.number === "--" ? : record.number === "--" ?
<span style={{ <span style={{
color: '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: :
<span style={{ <span style={{
color: '#07111B', color: '#07111B',
textAlign: "center" textAlign: "center",
width:'100px'
}}> {record.number}</span> }}> {record.number}</span>
} }
</span> </span>
@ -124,37 +129,42 @@ class Listofworksstudentone extends Component {
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
align: "center", align: "center",
className:'font-14 maxnamewidth100', className:'font-14 maxnamewidth110',
width:'100px', width:'100px',
render: (text, record) => ( render: (text, record) => (
<span className="maxnamewidth100"> <span className="maxnamewidth110">
{record.name === undefined ? {record.name === undefined ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: :
record.name === "" ? record.name === "" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: :
record.name === null ? record.name === null ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: :
record.name === "--" ? record.name === "--" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'100px'
}}>--</span> }}>--</span>
: :
<a className="maxnamewidth100" title={record.name} style={{ <a className="maxnamewidth110" title={record.name} style={{
"color": '#07111B', color: '#07111B',
textAlign: "center" textAlign: "center",
width:'100px'
}}>{record.name}</a> }}>{record.name}</a>
} }
@ -166,34 +176,41 @@ class Listofworksstudentone extends Component {
dataIndex: 'stduynumber', dataIndex: 'stduynumber',
key: 'stduynumber', key: 'stduynumber',
align: "center", align: "center",
className:'font-14 maxnamewidth110', className:'font-14 maxnamewidth145',
width:'145px',
render: (text, record) => ( render: (text, record) => (
<span className="maxnamewidth110"> <span className="maxnamewidth145" style={{
width:'145px',
}}>
{record.stduynumber === undefined ? {record.stduynumber === undefined ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'145px',
}}>-- }}>--
</span> </span>
: record.stduynumber === null ? : record.stduynumber === null ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'145px',
}}>-- }}>--
</span> </span>
: record.stduynumber === "" ? : record.stduynumber === "" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'145px',
}}>-- }}>--
</span> </span>
: :
<a <a
title={record.stduynumber} title={record.stduynumber}
className="maxnamewidth110" className="maxnamewidth145"
style={{ style={{
"color": '#9A9A9A', color:'#9A9A9A',
textAlign: "center" textAlign: "center",
width:'145px',
}}>{ }}>{
record.stduynumber record.stduynumber
} }
@ -210,11 +227,13 @@ class Listofworksstudentone extends Component {
dataIndex: 'classroom', dataIndex: 'classroom',
align: "center", align: "center",
className:'font-14', className:'font-14',
width:'145px',
render: (text, record) => ( render: (text, record) => (
<span> <span className="font-14 maxnamewidth145" style={{width:'145px'}}>
<span className="ysltable" style={{ <span className=" font-14 maxnamewidth145" style={{
"color": '#9A9A9A', color: '#9A9A9A',
textAlign: "center" textAlign: "center",
width:'145px',
}}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span> }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
</span> </span>
), ),
@ -225,14 +244,17 @@ class Listofworksstudentone extends Component {
key: 'submitstate', key: 'submitstate',
align: "center", align: "center",
className:'font-14', className:'font-14',
width:'98px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{width:'98px',}}>
<span style={record.submitstate === "延时提交" ? { <span style={record.submitstate === "延时提交" ? {
"color": '#DD1717', color: '#DD1717',
textAlign: "center" textAlign: "center",
} : record.submitstate === "按时提交" ? {"color": '#29BD8B', textAlign: "center"} : { width:'98px',
"color": '#747A7F', } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
textAlign: "center" color: '#747A7F',
textAlign: "center",
width:'98px',
}}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span> }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
</span> </span>
@ -244,11 +266,13 @@ class Listofworksstudentone extends Component {
key: 'cost_time', key: 'cost_time',
align: 'center', align: 'center',
className:'font-14', className:'font-14',
width:'145px',
render: (text, record) => ( render: (text, record) => (
<span style={ <span style={
{ {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center",
width:'145px',
} }
}> }>
{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--": {record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
@ -258,7 +282,8 @@ class Listofworksstudentone extends Component {
<span style={ <span style={
{ {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center",
width:'145px',
} }
} }
>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
@ -278,7 +303,7 @@ class Listofworksstudentone extends Component {
// render: (text, record) => ( // render: (text, record) => (
// <span> // <span>
// <span style={{ // <span style={{
// "color": '#9A9A9A', // color: '#9A9A9A',
// "text-align": "center" // "text-align": "center"
// }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span> // }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
// </span> // </span>
@ -290,9 +315,12 @@ class Listofworksstudentone extends Component {
key: 'completion', key: 'completion',
align: "center", align: "center",
className:'font-14', className:'font-14',
width:'99px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{
<span style={{color: '#07111B',textAlign: "center"}}>{record.completion+"/"+this.state.challenges_count}</span> width:'99px',
}}>
<span style={{color: '#07111B',textAlign: "center", width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
</span> </span>
), ),
}, },
@ -302,17 +330,23 @@ class Listofworksstudentone extends Component {
key: 'levelscore', key: 'levelscore',
align: 'center', align: 'center',
className:'font-14', className:'font-14',
width:'99px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{
width:'99px',
}}>
<span style={parseInt(record.levelscore) <= 60 ? { <span style={parseInt(record.levelscore) <= 60 ? {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center",
width:'99px',
} : parseInt(record.levelscore) < 90 ? { } : parseInt(record.levelscore) < 90 ? {
color: '#FF6800', color: '#FF6800',
textAlign: "center" textAlign: "center",
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : { width:'99px',
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width:'99px',} : {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center",
width:'99px',
}}>{record.levelscore}</span> }}>{record.levelscore}</span>
</span> </span>
) )
@ -323,25 +357,31 @@ class Listofworksstudentone extends Component {
key: 'efficiencyscore', key: 'efficiencyscore',
align: 'center', align: 'center',
className:'font-14', className:'font-14',
width:'80px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{
width:'80px',
}}>
{ {
record.efficiencyscore&& record.efficiencyscore=== "--"?( record.efficiencyscore&& record.efficiencyscore=== "--"?(
<span style={{color:"#9A9A9A"}}> <span style={{color:"#9A9A9A", width:'80px',}}>
-- --
</span> </span>
) )
: :
<span style={parseInt(record.efficiencyscore) <= 60 ? { <span style={parseInt(record.efficiencyscore) <= 60 ? {
color: '#747A7F', color: '#747A7F',
textAlign: "center" textAlign: "center",
width:'80px',
} : parseInt(record.efficiencyscore) < 90 ? { } : parseInt(record.efficiencyscore) < 90 ? {
color: '#FF6800', color: '#FF6800',
textAlign: "center" textAlign: "center",
width:'80px',
} : parseInt(record.efficiencyscore) >= 90 ? { } : parseInt(record.efficiencyscore) >= 90 ? {
color: '#DD1717', color: '#DD1717',
textAlign: "center" textAlign: "center",
} : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore}</span> width:'80px',
} : {color: '#747A7F', textAlign: "center", width:'80px',}}>{record.efficiencyscore}</span>
} }
</span> </span>
@ -353,19 +393,22 @@ class Listofworksstudentone extends Component {
key: 'levelscore', key: 'levelscore',
align: "center", align: "center",
className:'font-14', className:'font-14',
width:'99px',
render: (text, record) => ( render: (text, record) => (
<span> <span style={{width:'99px',}}>
{ {
record.levelscore && record.levelscore === "--"? record.levelscore && record.levelscore === "--"?
<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.levelscore}</span> <span style={{color: '#9A9A9A', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
: :
<span style={parseInt(record.levelscore) >=90 ? { <span style={parseInt(record.levelscore) >=90 ? {
color: '#DD1717', color: '#DD1717',
textAlign: "center" textAlign: "center",
width:'99px',
} : parseInt(record.levelscore) <= 60?{ } : parseInt(record.levelscore) <= 60?{
color: '#FF6800', color: '#FF6800',
textAlign: "center", textAlign: "center",
}: {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span> width:'99px',
}: {color: '#747A7F', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
} }
</span> </span>
@ -391,7 +434,6 @@ class Listofworksstudentone extends Component {
), ),
}, },
], ],
orders: "", orders: "",
b_order:"desc", b_order:"desc",
allow_late:false, allow_late:false,
@ -408,8 +450,8 @@ class Listofworksstudentone extends Component {
course_group: null, course_group: null,
publish_immediately: undefined, publish_immediately: undefined,
end_immediately: undefined, end_immediately: undefined,
mystyle: {"display": "block", "color": '#07111B', textAlign: "center"}, mystyle: {"display": "block", color: '#07111B', textAlign: "center"},
mystyles: {"display": "none", "color": '#07111B', textAlign: "center"}, mystyles: {"display": "none", color: '#07111B', textAlign: "center"},
mystyle1: {"display": "block"}, mystyle1: {"display": "block"},
mystyles1: {"display": "none"}, mystyles1: {"display": "none"},
unlimited: 0, unlimited: 0,
@ -426,7 +468,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{"color": '#07111B', textAlign: "center"}}>{record.number} <span style={{color: '#07111B', textAlign: "center"}}>{record.number}
</span> </span>
) )
}, },
@ -438,7 +480,7 @@ class Listofworksstudentone extends Component {
className:'font-14 maxnamewidth100', className:'font-14 maxnamewidth100',
width:'100px', width:'100px',
render: (text, record) => ( render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', textAlign: "center"}}>{record.name}</a> <a className="maxnamewidth100" title={record.name} style={{color: '#07111B', textAlign: "center"}}>{record.name}</a>
) )
}, },
{ {
@ -492,7 +534,7 @@ class Listofworksstudentone extends Component {
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span> <span>
{record.classroom === undefined ?<span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{"color": '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{"color": '#07111B',textAlign: "center"}}>{record.classroom}</span>} {record.classroom === undefined ?<span className="ysltable" style={{color: '#07111B', textAlign: "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{color: '#07111B', textAlign: "center"}}>--</span> : <span className="ysltable" style={{color: '#07111B',textAlign: "center"}}>{record.classroom}</span>}
</span> </span>
) )
}, },
@ -544,7 +586,7 @@ class Listofworksstudentone extends Component {
</span> </span>
// <a style={ // <a style={
// { // {
// "color": '#747A7F', // color: '#747A7F',
// "text-align": "center" // "text-align": "center"
// } // }
// } // }
@ -561,7 +603,7 @@ class Listofworksstudentone extends Component {
// align: 'center', // align: 'center',
// className:'font-14', // className:'font-14',
// render: (text, record) => ( // render: (text, record) => (
// <span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span> // <span style={{color: '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
// ), // ),
// }, // },
{ {
@ -576,7 +618,7 @@ class Listofworksstudentone extends Component {
<Tooltip placement="bottom" title={<div> <Tooltip placement="bottom" title={<div>
<div>已通过{record.completion}关，共{this.state.challenges_count}关</div> <div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
</div>}> </div>}>
<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span> <span style={{color: '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
</Tooltip> </Tooltip>
</span> </span>
@ -591,13 +633,13 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={parseInt(record.levelscore) <= 60 ? { <span style={parseInt(record.levelscore) <= 60 ? {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
} : parseInt(record.levelscore) < 90 ? { } : parseInt(record.levelscore) < 90 ? {
"color": '#FF6800', color: '#FF6800',
"text-align": "center" "text-align": "center"
} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
}}>{record.levelscore}</span> }}>{record.levelscore}</span>
</span> </span>
@ -637,15 +679,15 @@ class Listofworksstudentone extends Component {
) )
: :
<span style={parseInt(record.efficiencyscore) <= 60 ? { <span style={parseInt(record.efficiencyscore) <= 60 ? {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
} : parseInt(record.efficiencyscore) < 90 ? { } : parseInt(record.efficiencyscore) < 90 ? {
"color": '#FF6800', color: '#FF6800',
"text-align": "center" "text-align": "center"
} : parseInt(record.efficiencyscore) >= 90 ? { } : parseInt(record.efficiencyscore) >= 90 ? {
"color": '#DD1717', color: '#DD1717',
"text-align": "center" "text-align": "center"
} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span> } : {color: '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
} }
</span> </span>
@ -669,18 +711,18 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"? record.finalscore&&record.finalscore==="--"?
<span style= <span style=
{{ {{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
: :
<span style={parseInt(record.finalscore) <= 60 ? { <span style={parseInt(record.finalscore) <= 60 ? {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
} : parseInt(record.finalscore) < 90 ? { } : parseInt(record.finalscore) < 90 ? {
"color": '#FF6800', color: '#FF6800',
"text-align": "center" "text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
} }
@ -697,18 +739,18 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"? record.finalscore&&record.finalscore==="--"?
<span style= <span style=
{{ {{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
: :
<span style={parseInt(record.finalscore) <= 60 ? { <span style={parseInt(record.finalscore) <= 60 ? {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
} : parseInt(record.finalscore) < 90 ? { } : parseInt(record.finalscore) < 90 ? {
"color": '#FF6800', color: '#FF6800',
"text-align": "center" "text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
"color": '#747A7F', color: '#747A7F',
"text-align": "center" "text-align": "center"
}}>{record.finalscore}</span> }}>{record.finalscore}</span>
} }
@ -742,7 +784,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.number} <span style={{color: '#07111B', "text-align": "center"}}>{record.number}
</span> </span>
) )
}, },
@ -754,7 +796,7 @@ class Listofworksstudentone extends Component {
className:'font-14 maxnamewidth100', className:'font-14 maxnamewidth100',
width:'100px', width:'100px',
render: (text, record) => ( render: (text, record) => (
<a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a> <a className="maxnamewidth100" title={record.name} style={{color: '#07111B', "text-align": "center"}}>{record.name}</a>
) )
}, },
{ {
@ -767,19 +809,19 @@ class Listofworksstudentone extends Component {
<span className="maxnamewidth110"> <span className="maxnamewidth110">
{record.stduynumber === undefined ? {record.stduynumber === undefined ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === null ? : record.stduynumber === null ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>-- }}>--
</span> </span>
: record.stduynumber === "" ? : record.stduynumber === "" ?
<span style={{ <span style={{
"color": '#9A9A9A', color: '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>-- }}>--
</span> </span>
@ -837,7 +879,7 @@ class Listofworksstudentone extends Component {
// align: 'center', // align: 'center',
// className:'font-14', // className:'font-14',
// render: (text, record) => ( // render: (text, record) => (
// <span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span> // <span style={{color: '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
// ), // ),
// }, // },
{ {
@ -1044,10 +1086,6 @@ class Listofworksstudentone extends Component {
datajs:[], datajs:[],
} }
// console.log("902");
// console.log("902");
// console.log(this.props);
} }
componentDidCatch(error, info){ componentDidCatch(error, info){
console.log("-----------------------------905错误信息"); console.log("-----------------------------905错误信息");

16
public/react/src/modules/courses/shixunHomework/style.css
Unescape View File

@ -38,13 +38,27 @@
.TopicDetailTable .bottomBody li:last-child{border-bottom: none;} .TopicDetailTable .bottomBody li:last-child{border-bottom: none;}
.maxnamewidth100{ .maxnamewidth100{
max-width: 145px; max-width: 100px;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap; white-space:nowrap;
cursor: default; cursor: default;
} }
.maxnamewidth110{ .maxnamewidth110{
max-width: 100px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth145{
max-width: 145px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth145{
max-width: 145px; max-width: 145px;
overflow:hidden; overflow:hidden;
text-overflow:ellipsis; text-overflow:ellipsis;

Write Preview
Loading…
Cancel
Save