diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 0887cfbec..285836c8f 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -93,27 +93,32 @@ class Listofworksstudentone extends Component { key: 'number', align: "center", className:'font-14', + width:'100px', render: (text, record) => ( - + {record.number === undefined ? -- : record.number === "" ? -- : record.number === "--" ? -- : {record.number} } @@ -124,37 +129,42 @@ class Listofworksstudentone extends Component { dataIndex: 'name', key: 'name', align: "center", - className:'font-14 maxnamewidth100', + className:'font-14 maxnamewidth110', width:'100px', render: (text, record) => ( - + {record.name === undefined ? -- : record.name === "" ? -- : record.name === null ? -- : record.name === "--" ? -- : - {record.name} } @@ -166,34 +176,41 @@ class Listofworksstudentone extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: "center", - className:'font-14 maxnamewidth110', + className:'font-14 maxnamewidth145', + width:'145px', render: (text, record) => ( - + {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- : { record.stduynumber } @@ -210,11 +227,13 @@ class Listofworksstudentone extends Component { dataIndex: 'classroom', align: "center", className:'font-14', + width:'145px', render: (text, record) => ( - - + {record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom} ), @@ -225,14 +244,17 @@ class Listofworksstudentone extends Component { key: 'submitstate', align: "center", className:'font-14', + width:'98px', render: (text, record) => ( - + {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} @@ -244,11 +266,13 @@ class Listofworksstudentone extends Component { key: 'cost_time', align: 'center', className:'font-14', + width:'145px', render: (text, record) => ( {record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--": @@ -258,7 +282,8 @@ class Listofworksstudentone extends Component { {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} @@ -278,7 +303,7 @@ class Listofworksstudentone extends Component { // render: (text, record) => ( // // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} // @@ -290,9 +315,12 @@ class Listofworksstudentone extends Component { key: 'completion', align: "center", className:'font-14', + width:'99px', render: (text, record) => ( - - {record.completion+"/"+this.state.challenges_count} + + {record.completion+"/"+this.state.challenges_count} ), }, @@ -302,17 +330,23 @@ class Listofworksstudentone extends Component { key: 'levelscore', align: 'center', className:'font-14', + width:'99px', render: (text, record) => ( - + = 90 ? {color: '#DD1717', textAlign: "center"} : { + textAlign: "center", + width:'99px', + } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width:'99px',} : { color: '#747A7F', - textAlign: "center" + textAlign: "center", + width:'99px', }}>{record.levelscore} ) @@ -323,25 +357,31 @@ class Listofworksstudentone extends Component { key: 'efficiencyscore', align: 'center', className:'font-14', + width:'80px', render: (text, record) => ( - + { record.efficiencyscore&& record.efficiencyscore=== "--"?( - + -- ) : = 90 ? { color: '#DD1717', - textAlign: "center" - } : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore} + textAlign: "center", + width:'80px', + } : {color: '#747A7F', textAlign: "center", width:'80px',}}>{record.efficiencyscore} } @@ -353,19 +393,22 @@ class Listofworksstudentone extends Component { key: 'levelscore', align: "center", className:'font-14', + width:'99px', render: (text, record) => ( - + { record.levelscore && record.levelscore === "--"? - {record.levelscore} + {record.levelscore} : =90 ? { color: '#DD1717', - textAlign: "center" + textAlign: "center", + width:'99px', } : parseInt(record.levelscore) <= 60?{ color: '#FF6800', textAlign: "center", - }: {color: '#747A7F', textAlign: "center"}}>{record.levelscore} + width:'99px', + }: {color: '#747A7F', textAlign: "center",width:'99px',}}>{record.levelscore} } @@ -391,7 +434,6 @@ class Listofworksstudentone extends Component { ), }, ], - orders: "", b_order:"desc", allow_late:false, @@ -408,8 +450,8 @@ class Listofworksstudentone extends Component { course_group: null, publish_immediately: undefined, end_immediately: undefined, - mystyle: {"display": "block", "color": '#07111B', textAlign: "center"}, - mystyles: {"display": "none", "color": '#07111B', textAlign: "center"}, + mystyle: {"display": "block", color: '#07111B', textAlign: "center"}, + mystyles: {"display": "none", color: '#07111B', textAlign: "center"}, mystyle1: {"display": "block"}, mystyles1: {"display": "none"}, unlimited: 0, @@ -426,7 +468,7 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.number} + {record.number} ) }, @@ -438,7 +480,7 @@ class Listofworksstudentone extends Component { className:'font-14 maxnamewidth100', width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { @@ -492,7 +534,7 @@ class Listofworksstudentone extends Component { className:'font-14', render: (text, record) => ( - {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}} + {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}} ) }, @@ -544,7 +586,7 @@ class Listofworksstudentone extends Component { // ( - // {record.updatetime} + // {record.updatetime} // ), // }, { @@ -576,7 +618,7 @@ class Listofworksstudentone extends Component {
已通过{record.completion}关，共{this.state.challenges_count}关
}> - {record.completion+"/"+this.state.challenges_count} + {record.completion+"/"+this.state.challenges_count} @@ -591,13 +633,13 @@ class Listofworksstudentone extends Component { render: (text, record) => ( = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', + } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : { + color: '#747A7F', "text-align": "center" }}>{record.levelscore} @@ -637,15 +679,15 @@ class Listofworksstudentone extends Component { ) : = 90 ? { - "color": '#DD1717', + color: '#DD1717', "text-align": "center" - } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} + } : {color: '#747A7F', "text-align": "center"}}>{record.efficiencyscore} } @@ -669,18 +711,18 @@ class Listofworksstudentone extends Component { record.finalscore&&record.finalscore==="--"? {record.finalscore} : = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', + } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : { + color: '#747A7F', "text-align": "center" }}>{record.finalscore} } @@ -697,18 +739,18 @@ class Listofworksstudentone extends Component { record.finalscore&&record.finalscore==="--"? {record.finalscore} : = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', + } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : { + color: '#747A7F', "text-align": "center" }}>{record.finalscore} } @@ -742,7 +784,7 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.number} + {record.number} ) }, @@ -754,7 +796,7 @@ class Listofworksstudentone extends Component { className:'font-14 maxnamewidth100', width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { @@ -767,19 +809,19 @@ class Listofworksstudentone extends Component { {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- @@ -837,7 +879,7 @@ class Listofworksstudentone extends Component { // align: 'center', // className:'font-14', // render: (text, record) => ( - // {record.updatetime} + // {record.updatetime} // ), // }, { @@ -1044,10 +1086,6 @@ class Listofworksstudentone extends Component { datajs:[], } - // console.log("902"); - // console.log("902"); - // console.log(this.props); - } componentDidCatch(error, info){ console.log("-----------------------------905错误信息"); diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index c2affa32c..0ad96345e 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -38,13 +38,27 @@ .TopicDetailTable .bottomBody li:last-child{border-bottom: none;} .maxnamewidth100{ - max-width: 145px; + max-width: 100px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; cursor: default; } .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; overflow:hidden; text-overflow:ellipsis;