diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 285836c8f..534078e74 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -226,15 +226,38 @@ class Listofworksstudentone extends Component {
key: 'classroom',
dataIndex: 'classroom',
align: "center",
- className:'font-14',
+ className:'font-14 maxnamewidth145',
width:'145px',
render: (text, record) => (
<span className="font-14 maxnamewidth145" style={{width:'145px'}}>
- <span className=" font-14 maxnamewidth145" style={{
- color: '#9A9A9A',
- textAlign: "center",
- width:'145px',
- }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
+ {record.classroom === undefined ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a> : record.classroom === "" ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a> : record.classroom === null ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a>
+ :
+ <a className=" font-14 maxnamewidth145"
+ title={record.classroom}
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>{record.classroom}</a>
+ }
</span>
),
},
@@ -430,6 +453,373 @@ class Listofworksstudentone extends Component {
onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
}
+ </span>
+ ),
+ },
+ ],
+ columnsstu2: [
+ // {
+ // title: '序号',
+ // dataIndex: 'number',
+ // key: 'number',
+ // align: "center",
+ // className:'font-14',
+ // width:'100px',
+ // render: (text, record) => (
+ // <span style={{width:'100px'}}>
+ // {record.number === undefined ?
+ // <span style={{
+ // color: '#9A9A9A',
+ // textAlign: "center",
+ // width:'100px'
+ // }}> --</span>
+ // : record.number === "" ?
+ // <span style={{
+ // color: '#9A9A9A',
+ // textAlign: "center",
+ // width:'100px'
+ // }}>--</span>
+ // : record.number === "--" ?
+ // <span style={{
+ // color: '#9A9A9A',
+ // textAlign: "center",
+ // width:'100px'
+ // }}>--</span>
+ // :
+ // <span style={{
+ // color: '#07111B',
+ // textAlign: "center",
+ // width:'100px'
+ // }}> {record.number}</span>
+ // }
+ // </span>
+ // ),
+ // },
+ {
+ title: '姓名',
+ dataIndex: 'name',
+ key: 'name',
+ align: "center",
+ className:'font-14 maxnamewidth200',
+ width:'200px',
+ render: (text, record) => (
+ <span className="maxnamewidth200">
+ {record.name === undefined ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'200px'
+ }}>--</span>
+ :
+ record.name === "" ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'200px'
+ }}>--</span>
+ :
+ record.name === null ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'200px'
+ }}>--</span>
+ :
+ record.name === "--" ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'200px'
+ }}>--</span>
+ :
+ <a className="maxnamewidth200" title={record.name} style={{
+ color: '#07111B',
+ textAlign: "center",
+ width:'200px'
+ }}>{record.name}</a>
+ }
+
+ </span>
+ ),
+ },
+ {
+ title: '学号',
+ dataIndex: 'stduynumber',
+ key: 'stduynumber',
+ align: "center",
+ className:'font-14 maxnamewidth145',
+ width:'145px',
+ render: (text, record) => (
+ <span className="maxnamewidth145" style={{
+ width:'145px',
+ }}>
+ {record.stduynumber === undefined ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--
+ </span>
+ : record.stduynumber === null ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--
+ </span>
+ : record.stduynumber === "" ?
+ <span style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--
+ </span>
+ :
+ <a
+ title={record.stduynumber}
+ className="maxnamewidth145"
+ style={{
+ color:'#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>{
+ record.stduynumber
+ }
+ </a>
+
+ }
+
+ </span>
+ ),
+ },
+ {
+ title: '分班',
+ key: 'classroom',
+ dataIndex: 'classroom',
+ align: "center",
+ className:'font-14 maxnamewidth145',
+ width:'145px',
+ render: (text, record) => (
+ <span className="font-14 maxnamewidth145" style={{width:'145px'}}>
+ {record.classroom === undefined ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a> : record.classroom === "" ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a> : record.classroom === null ?
+ <a className=" font-14 maxnamewidth145"
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>--</a>
+ :
+ <a className=" font-14 maxnamewidth145"
+ title={record.classroom}
+ style={{
+ color: '#9A9A9A',
+ textAlign: "center",
+ width:'145px',
+ }}>{record.classroom}</a>
+ }
+ </span>
+ ),
+ },
+ {
+ title: '提交状态',
+ dataIndex: 'submitstate',
+ key: 'submitstate',
+ align: "center",
+ className:'font-14',
+ width:'98px',
+ render: (text, record) => (
+ <span style={{width:'98px',}}>
+ <span style={record.submitstate === "延时提交" ? {
+ color: '#DD1717',
+ textAlign: "center",
+ width:'98px',
+ } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'98px',
+ }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}</span>
+
+ </span>
+ ),
+ },
+ {
+ title: '实战耗时',
+ dataIndex: 'cost_time',
+ key: 'cost_time',
+ align: 'center',
+ className:'font-14',
+ width:'145px',
+ render: (text, record) => (
+ <span style={
+ {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'145px',
+ }
+ }>
+ {record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+ <span style={
+ {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'145px',
+ }
+ }
+ >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+ </span>
+ }
+ </span>
+ )
+
+ },
+ // {
+ // title: '更新时间',
+ // dataIndex: 'updatetime',
+ // key: 'updatetime',
+ // align: "center",
+ // className:'font-14',
+ // render: (text, record) => (
+ // <span>
+ // <span style={{
+ // color: '#9A9A9A',
+ // "text-align": "center"
+ // }}>{record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}</span>
+ // </span>
+ // ),
+ // },
+ {
+ title: '完成情况',
+ dataIndex: 'completion',
+ key: 'completion',
+ align: "center",
+ className:'font-14',
+ width:'99px',
+ render: (text, record) => (
+ <span style={{
+ width:'99px',
+ }}>
+ <span style={{color: '#07111B',textAlign: "center", width:'99px'}}>{record.completion+"/"+this.state.challenges_count}</span>
+ </span>
+ ),
+ },
+ {
+ title: '关卡得分',
+ dataIndex: 'levelscore',
+ key: 'levelscore',
+ align: 'center',
+ className:'font-14',
+ width:'99px',
+ render: (text, record) => (
+ <span style={{
+ width:'99px',
+ }}>
+ <span style={parseInt(record.levelscore) <= 60 ? {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'99px',
+ } : parseInt(record.levelscore) < 90 ? {
+ color: '#FF6800',
+ textAlign: "center",
+ width:'99px',
+ } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width:'99px',} : {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'99px',
+ }}>{record.levelscore}</span>
+ </span>
+ )
+ },
+ {
+ title: '效率分',
+ dataIndex: 'efficiencyscore',
+ key: 'efficiencyscore',
+ align: 'center',
+ className:'font-14',
+ width:'80px',
+ render: (text, record) => (
+ <span style={{
+ width:'80px',
+ }}>
+ {
+ record.efficiencyscore&& record.efficiencyscore=== "--"?(
+ <span style={{color:"#9A9A9A", width:'80px',}}>
+ --
+ </span>
+ )
+ :
+ <span style={parseInt(record.efficiencyscore) <= 60 ? {
+ color: '#747A7F',
+ textAlign: "center",
+ width:'80px',
+ } : parseInt(record.efficiencyscore) < 90 ? {
+ color: '#FF6800',
+ textAlign: "center",
+ width:'80px',
+ } : parseInt(record.efficiencyscore) >= 90 ? {
+ color: '#DD1717',
+ textAlign: "center",
+ width:'80px',
+ } : {color: '#747A7F', textAlign: "center", width:'80px',}}>{record.efficiencyscore}</span>
+ }
+
+ </span>
+ )
+ },
+ {
+ title: '最终成绩',
+ dataIndex: 'levelscore',
+ key: 'levelscore',
+ align: "center",
+ className:'font-14',
+ width:'99px',
+ render: (text, record) => (
+ <span style={{width:'99px',}}>
+ {
+ record.levelscore && record.levelscore === "--"?
+ <span style={{color: '#9A9A9A', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
+ :
+ <span style={parseInt(record.levelscore) >=90 ? {
+ color: '#DD1717',
+ textAlign: "center",
+ width:'99px',
+ } : parseInt(record.levelscore) <= 60?{
+ color: '#FF6800',
+ textAlign: "center",
+ width:'99px',
+ }: {color: '#747A7F', textAlign: "center",width:'99px',}}>{record.levelscore}</span>
+ }
+
+ </span>
+ ),
+ },
+ {
+ title: '操作',
+ dataIndex: 'operating',
+ key: 'operating',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+ <span>
+ {
+ record.submitstate === "未提交" ?<span style={{ color: '#9A9A9A'}}>--</span>
+ :
+ <a style={{textAlign: "center"}}
+ className="color-blue"
+ onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+ }
+
</span>
),
},
@@ -570,9 +960,7 @@ class Listofworksstudentone extends Component {
}
}>
{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
- <Tooltip placement="bottom" title={<div>
- 学员在EduCoder做实训花费的时间
- </div>}>
+
<a style={
{
color: '#747A7F',
@@ -581,7 +969,6 @@ class Listofworksstudentone extends Component {
}
>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
</a>
- </Tooltip>
}
</span>
// <a style={
@@ -2575,7 +2962,7 @@ class Listofworksstudentone extends Component {
})
}
render() {
- 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;
+ let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
// console.log(this.state.student_works);
@@ -3202,8 +3589,9 @@ class Listofworksstudentone extends Component {
{data === undefined ? "" : <Table
style={styletable}
dataSource={data}
- columns={columnsstu}
+ columns={columnsstu2}
pagination={false}
+ showHeader={false}
loading={false}
/>}
</div>
@@ -3245,18 +3633,18 @@ class Listofworksstudentone extends Component {
font-weight:400;
color:rgba(255,104,0,1);
}
- .computeTime {
- width: 122px;
- height: 31px;
- display: inline-block;
- padding: 5px;
- text-align: center;
- line-height: 20px;
- color: #FE6B21;
- border: 1px solid #FE6B21;
- cursor: pointer;
- border-radius: 4px;
- }
+ .computeTime {
+ width: 122px;
+ height: 31px;
+ display: inline-block;
+ padding: 5px;
+ text-align: center;
+ line-height: 20px;
+ color: #FE6B21;
+ border: 1px solid #FE6B21;
+ cursor: pointer;
+ border-radius: 4px;
+ }
.computeTimes{
width: 122px;
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css
index 0ad96345e..7fda90b59 100644
--- a/public/react/src/modules/courses/shixunHomework/style.css
+++ b/public/react/src/modules/courses/shixunHomework/style.css
@@ -51,6 +51,13 @@
white-space:nowrap;
cursor: default;
}
+.maxnamewidth200{
+ max-width: 200px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
.maxnamewidth145{
max-width: 145px;
overflow:hidden;