diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 03f0dea64..2f4c92159 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -273,11 +273,11 @@ class Listofworksstudentone extends Component {
width:'98px',
render: (text, record) => (
<span style={{width:'98px',}}>
- <span style={record.submitstate === "延时提交" ? {
+ <span style={record.submitstate === "延时完成" ? {
color: '#DD1717',
textAlign: "center",
width:'98px',
- } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
+ } : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
color: '#747A7F',
textAlign: "center",
width:'98px',
@@ -414,7 +414,7 @@ class Listofworksstudentone extends Component {
)
},
{
- title: '最终成绩',
+ title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
align: "center",
@@ -625,11 +625,11 @@ class Listofworksstudentone extends Component {
width:'98px',
render: (text, record) => (
<span style={{width:'98px',}}>
- <span style={record.submitstate === "延时提交" ? {
+ <span style={record.submitstate === "延时完成" ? {
color: '#DD1717',
textAlign: "center",
width:'98px',
- } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
+ } : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center",width:'98px',} : {
color: '#747A7F',
textAlign: "center",
width:'98px',
@@ -762,7 +762,7 @@ class Listofworksstudentone extends Component {
)
},
{
- title: '最终成绩',
+ title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
align: "center",
@@ -918,10 +918,10 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- <span style={record.submitstate === "延时提交" ? {
+ <span style={record.submitstate === "延时完成" ? {
color: '#DD1717',
textAlign: "center"
- } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center"} : {
+ } : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.submitstate}
@@ -1064,7 +1064,7 @@ class Listofworksstudentone extends Component {
)
},
{
- title: '最终成绩',
+ title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
align: 'center',
@@ -1103,7 +1103,7 @@ class Listofworksstudentone extends Component {
<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
- <div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+ <div>{record.finalscore === "--"?<span>当前成绩：0分</span> :<span>当前成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore&&record.finalscore==="--"?
@@ -1231,10 +1231,10 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- <span style={record.submitstate === "延时提交" ? {
+ <span style={record.submitstate === "延时完成" ? {
color: '#DD1717',
textAlign: "center"
- } : record.submitstate === "按时提交" ? {color: '#29BD8B', textAlign: "center"} : {
+ } : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.submitstate}
@@ -1370,7 +1370,7 @@ class Listofworksstudentone extends Component {
)
},
{
- title: '最终成绩',
+ title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
align: 'center',
@@ -1409,7 +1409,7 @@ class Listofworksstudentone extends Component {
<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
- <div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+ <div>{record.finalscore === "--"?<span>当前成绩：0分</span> :<span>当前成绩：{record.finalscore}分</span>}</div>
</div>}>
{
record.finalscore&&record.finalscore==="--"?
@@ -1619,9 +1619,9 @@ class Listofworksstudentone extends Component {
// console.log(homeworkid);
// search:搜索关键字
- // order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
+ // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id
// b_order:desc：倒序 ， asc：顺序
- // work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
+ // work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限
// course_group:分班情况 [232, 231]， []:不限（空数组）
var order = "asc";
if (ordervlue === "updated_at") {
@@ -1696,7 +1696,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -1733,7 +1733,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -1789,7 +1789,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time,
- submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
+ submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -1830,7 +1830,7 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time,
- submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" : student_works[i].work_status === 2 ? "延时提交" : "未提交",
+ submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" : student_works[i].work_status === 2 ? "延时完成" : "未提交",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -1884,7 +1884,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -1919,7 +1919,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -1972,7 +1972,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time,
- submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
+ submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -2119,9 +2119,9 @@ class Listofworksstudentone extends Component {
// console.log(homeworkid);
// search:搜索关键字
- // order:排序方式：更新时间：update_time，最终成绩：work_score，学号：student_id
+ // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id
// b_order:desc：倒序 ， asc：顺序
- // work_status:0:未提交， 1:按时提交， 2:延时提交，“”不限
+ // work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限
// course_group:分班情况 [232, 231]， []:不限（空数组）
var order = "asc";
if (ordervlue === "updated_at") {
@@ -2319,7 +2319,7 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time,
- submitstate:student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" :student_works[i].work_status === 2 ? "延时提交" : "未提交",
+ submitstate:student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" :student_works[i].work_status === 2 ? "延时完成" : "未提交",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@@ -2356,7 +2356,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -2394,7 +2394,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -2431,7 +2431,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -2468,7 +2468,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -2502,7 +2502,7 @@ class Listofworksstudentone extends Component {
if(item.title==="效率分") {
continue
}
- if(item.title==="最终成绩") {
+ if(item.title==="当前成绩") {
continue
}
if(item.title==="学号") {
@@ -3366,7 +3366,7 @@ class Listofworksstudentone extends Component {
<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
<ul className="edu-position-hide undis mt10">
<li> <a onClick={(e) => this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>
- <li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩</a></li>
+ <li> <a onClick={(e) => this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>当前成绩</a></li>
<li> <a onClick={(e) => this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
</ul>
</li>