diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 29e836744..0554d3dbf 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -67,7 +67,7 @@ class Listofworksstudentone extends Component { pages: 1, limit: 20, loadingstate: true, - order: "update_time", + order: "", search: null, day: 0, hour: 0, @@ -130,30 +130,30 @@ class Listofworksstudentone extends Component { {record.name === undefined ? -- : record.name === "" ? -- : record.name === null ? -- : record.name === "--" ? -- : {record.name} } @@ -167,24 +167,23 @@ class Listofworksstudentone extends Component { key: 'stduynumber', align: "center", className:'font-14 maxnamewidth110', - width:'110px', render: (text, record) => ( {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- @@ -193,8 +192,8 @@ class Listofworksstudentone extends Component { title={record.stduynumber} className="maxnamewidth110" style={{ - color: '#9A9A9A', - textAlign: "center" + "color": '#9A9A9A', + textAlign: "center" }}>{ record.stduynumber } @@ -214,7 +213,7 @@ class Listofworksstudentone extends Component { render: (text, record) => ( {record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom} @@ -229,10 +228,10 @@ class Listofworksstudentone extends Component { render: (text, record) => ( {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} @@ -251,26 +250,37 @@ class Listofworksstudentone extends Component { color: '#747A7F', textAlign: "center" } - }>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } - + }> + {record.cost_time === null? "--":record.cost_time === undefined?"--": + {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} + + } + ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: "center", - className:'font-14', - render: (text, record) => ( - - {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} - - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: "center", + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} + // + // ), + // }, { title: '完成情况', dataIndex: 'completion', @@ -279,7 +289,7 @@ class Listofworksstudentone extends Component { className:'font-14', render: (text, record) => ( - {record.completion+"/"+this.state.challenges_count} + {record.completion+"/"+this.state.challenges_count} ), }, @@ -379,7 +389,7 @@ class Listofworksstudentone extends Component { }, ], - orders: "update_time", + orders: "", b_order:"desc", allow_late:false, checkedValuesine: undefined, @@ -395,8 +405,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, @@ -413,7 +423,7 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.number} + {record.number} ) }, @@ -425,7 +435,7 @@ class Listofworksstudentone extends Component { className:'font-14 maxnamewidth100', width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { @@ -434,7 +444,6 @@ class Listofworksstudentone extends Component { key: 'stduynumber', align: "center", className:'font-14 maxnamewidth110', - width:'110px', render: (text, record) => ( {record.stduynumber === undefined ? @@ -480,7 +489,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}} ) }, @@ -514,21 +523,41 @@ class Listofworksstudentone extends Component { color: '#747A7F', textAlign: "center" } - }>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } - + }> + {record.cost_time === null? "--":record.cost_time === undefined?"--": + {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} + + } + + // {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } + // ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - className:'font-14', - render: (text, record) => ( - {record.updatetime} - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // {record.updatetime} + // ), + // }, { title: '完成情况', dataIndex: 'completion', @@ -541,7 +570,7 @@ class Listofworksstudentone extends Component {
已通过{record.completion}关，共{this.state.challenges_count}关
}> - {record.completion+"/"+this.state.challenges_count} + {record.completion+"/"+this.state.challenges_count} @@ -556,14 +585,14 @@ class Listofworksstudentone extends Component { render: (text, record) => ( = 90 ? {color: '#DD1717', textAlign: "center"} : { - color: '#747A7F', - textAlign: "center" + "color": '#FF6800', + "text-align": "center" + } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" }}>{record.levelscore} ) @@ -602,15 +631,15 @@ class Listofworksstudentone extends Component { ) : = 90 ? { - color: '#DD1717', - textAlign: "center" - } : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore} + "color": '#DD1717', + "text-align": "center" + } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} } @@ -634,19 +663,19 @@ class Listofworksstudentone extends Component { record.finalscore&&record.finalscore==="--"? {record.finalscore} : = 90 ? {color: '#DD1717', textAlign: "center"} : { - color: '#747A7F', - textAlign: "center" + "color": '#FF6800', + "text-align": "center" + } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" }}>{record.finalscore} } @@ -662,19 +691,19 @@ class Listofworksstudentone extends Component { record.finalscore&&record.finalscore==="--"? {record.finalscore} : = 90 ? {color: '#DD1717', textAlign: "center"} : { - color: '#747A7F', - textAlign: "center" + "color": '#FF6800', + "text-align": "center" + } : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" }}>{record.finalscore} } @@ -707,7 +736,7 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.number} + {record.number} ) }, @@ -719,7 +748,7 @@ class Listofworksstudentone extends Component { className:'font-14 maxnamewidth100', width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { @@ -728,25 +757,24 @@ class Listofworksstudentone extends Component { key: 'stduynumber', align: "center", className:'font-14 maxnamewidth110', - width:'110px', render: (text, record) => ( {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- : @@ -774,7 +802,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}} ) }, @@ -796,16 +824,16 @@ class Listofworksstudentone extends Component { ) }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - className:'font-14', - render: (text, record) => ( - {record.updatetime} - ), - }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // {record.updatetime} + // ), + // }, { title: '实战耗时', dataIndex: 'cost_time', @@ -818,10 +846,20 @@ class Listofworksstudentone extends Component { color: '#747A7F', textAlign: "center" } - }>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } - + }> + {record.cost_time === null ? "--":record.cost_time === undefined ?"--": + {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} + + } + ) - }, { title: '完成情况', @@ -904,7 +942,7 @@ class Listofworksstudentone extends Component { } : parseInt(record.efficiencyscore) >= 90 ? { color: '#DD1717', textAlign: "center" - } : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore} + } : {color: '#747A7F',textAlign: "center"}}>{record.efficiencyscore} } @@ -1031,9 +1069,6 @@ class Listofworksstudentone extends Component { // console.log(this.props); // console.log(this.props.isAdmin()) this.student(); - // console.log("Listofworksstudentone---------------"); - // console.log(this.props); - // console.log(JSON.stringify(this.props)); } isupdatas = () => { var homeworkid = this.props.match.params.homeworkid; @@ -1659,9 +1694,9 @@ class Listofworksstudentone extends Component { var homeworkid = this.props.match.params.homeworkid; let urll = `/homework_commons/${homeworkid}/works_list.json?`; var order = "asc"; - if (ordervlue === "update_time") { - order = "desc"; - } + // if (ordervlue === "update_time") { + // order = "desc"; + // } var checkedValuesines = checkedValuesine; var checkedValuesineinfos = checkedValuesineinfo; var searchtexts = searchtext @@ -2068,15 +2103,15 @@ class Listofworksstudentone extends Component { } //排序 funordert = (e) => { - if (e === "update_time") { - // 时间 - // 时间排序是从小到大 - this.setState({ - orders: "update_time", - loadingstate: true, - }) - this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); - } + // if (e === "update_time") { + // // 时间 + // // 时间排序是从小到大 + // this.setState({ + // orders: "update_time", + // loadingstate: true, + // }) + // this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit); + // } if (e === "work_score") { // 成绩 @@ -2476,7 +2511,8 @@ class Listofworksstudentone extends Component { }) } }else { - this.props.slowDownload(url); + this.props.showNotification(`正在下载中`); + window.open("/api"+url, '_blank'); } }).catch((error) => { console.log(error) @@ -2494,13 +2530,27 @@ class Listofworksstudentone extends Component { let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; const antIcon = ; - + // console.log(this.state.student_works); + // console.log("841"); + // console.log(this.state.columns); + // console.log(datajs); + // console.log("2202"); + // console.log(this.props.isAdmin()); + // console.log("2498"); + // console.log(data); + // console.log(datas); + // console.log(this.props.isAdmin()); let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; - - // console.log("Listofworksstudentone+++++++++"); - // console.log(this.props); - // console.log(JSON.stringify(this.props)); + // if(this.props.isAdmin() === false){ + // if(teacherdata.student_works!==undefined){ + // if(teacherdata.student_works.length>0){ + // + // + // } + // } + // + // } return ( this.props.isAdmin() === true ? ( @@ -2750,10 +2800,10 @@ class Listofworksstudentone extends Component { */} diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index f2b0c39ed..c2affa32c 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -38,14 +38,14 @@ .TopicDetailTable .bottomBody li:last-child{border-bottom: none;} .maxnamewidth100{ - max-width: 100px; + max-width: 145px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; cursor: default; } .maxnamewidth110{ - max-width: 110px; + max-width: 145px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;