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

Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
chromesetting
cxt 5 years ago
parent 1ad274851a 136e0b9a91
commit 48b48c3bd6
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
public/react/config/webpack.config.prod.js
Unescape View File

@ -326,8 +326,8 @@ module.exports = {
comments: false comments: false
}, },
compress: { compress: {
drop_debugger: false, drop_debugger: true,
drop_console: false drop_console: true
} }
} }
}), }),

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

@ -344,7 +344,7 @@ class Listofworksstudentone extends Component {
// ), // ),
// }, // },
{ {
title: '当前完成关卡', title: '最新完成关卡',
dataIndex: 'curcomlevel', dataIndex: 'curcomlevel',
key: 'curcomlevel', key: 'curcomlevel',
align: "center", align: "center",
@ -496,7 +496,7 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span style={{width: '40px'}}> <span style={{width: '40px'}}>
{ {
record.submitstate === "未提交" ? <span style={{color: '#9A9A9A'}}>--</span> record.submitstate === "未开启" ? <span style={{color: '#9A9A9A'}}>--</span>
: :
<a style={{textAlign: "center"}} <a style={{textAlign: "center"}}
className="color-blue" className="color-blue"
@ -738,7 +738,7 @@ class Listofworksstudentone extends Component {
// ), // ),
// }, // },
{ {
title: '当前完成关卡', title: '最新完成关卡',
dataIndex: 'curcomlevel', dataIndex: 'curcomlevel',
key: 'curcomlevel', key: 'curcomlevel',
align: "center", align: "center",
@ -891,7 +891,7 @@ class Listofworksstudentone extends Component {
render: (text, record) => ( render: (text, record) => (
<span style={{width: '40px'}}> <span style={{width: '40px'}}>
{ {
record.submitstate === "未提交" ? <span style={{color: '#9A9A9A'}}>--</span> record.submitstate === "未开启" ? <span style={{color: '#9A9A9A'}}>--</span>
: :
<a style={{textAlign: "center"}} <a style={{textAlign: "center"}}
className="color-blue" className="color-blue"
@ -1091,7 +1091,7 @@ class Listofworksstudentone extends Component {
// ), // ),
// }, // },
{ {
title: '当前完成关卡', title: '最新完成关卡',
dataIndex: 'curcomlevel', dataIndex: 'curcomlevel',
key: 'curcomlevel', key: 'curcomlevel',
align: "center", align: "center",
@ -1291,7 +1291,7 @@ class Listofworksstudentone extends Component {
width: '40px', width: '40px',
render: (text, record) => ( render: (text, record) => (
record.submitstate === "未提交" ? record.submitstate === "未开启" ?
<a style={{textAlign: "center",width: '40px'}} className="color-blue" <a style={{textAlign: "center",width: '40px'}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)} onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> : onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
@ -1454,7 +1454,7 @@ class Listofworksstudentone extends Component {
) )
}, },
{ {
title: '当前完成关卡', title: '最新完成关卡',
dataIndex: 'curcomlevel', dataIndex: 'curcomlevel',
key: 'curcomlevel', key: 'curcomlevel',
align: "center", align: "center",
@ -1653,7 +1653,7 @@ class Listofworksstudentone extends Component {
className: 'font-14', className: 'font-14',
width: '40px', width: '40px',
render: (text, record) => ( render: (text, record) => (
record.submitstate === "未提交" ? record.submitstate === "未开启" ?
<a style={{textAlign: "center",width: '40px'}} className="color-blue" <a style={{textAlign: "center",width: '40px'}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)} onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> : onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
@ -1896,7 +1896,7 @@ class Listofworksstudentone extends Component {
// search:搜索关键字 // search:搜索关键字
// order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id
// b_order:desc：倒序 ， asc：顺序 // b_order:desc：倒序 ， asc：顺序
// work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限 // work_status:0:未开启， 1:按时完成， 2:延时完成，“”不限
// course_group:分班情况 [232, 231]， []:不限（空数组） // course_group:分班情况 [232, 231]， []:不限（空数组）
var order = "asc"; var order = "asc";
if (ordervlue === "updated_at") { if (ordervlue === "updated_at") {
@ -2074,7 +2074,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id, stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name, classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time, 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:this.state.teacherdata.student_works[i].update_time,
// updatetime:"", // updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata, updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -2118,7 +2118,7 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id, stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name, classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time, 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:this.state.teacherdata.student_works[i].update_time,
// updatetime:"", // updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata, updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -2279,7 +2279,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id, stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name, classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time, 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:this.state.teacherdata.student_works[i].update_time,
// updatetime:"", // updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata, updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -2432,7 +2432,7 @@ class Listofworksstudentone extends Component {
// search:搜索关键字 // search:搜索关键字
// order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id
// b_order:desc：倒序 ， asc：顺序 // b_order:desc：倒序 ， asc：顺序
// work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限 // work_status:0:未开启， 1:按时完成， 2:延时完成，“”不限
// course_group:分班情况 [232, 231]， []:不限（空数组） // course_group:分班情况 [232, 231]， []:不限（空数组）
var order = "asc"; var order = "asc";
if (ordervlue === "updated_at") { if (ordervlue === "updated_at") {
@ -2641,7 +2641,7 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id, stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name, classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time, 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:this.state.teacherdata.student_works[i].update_time,
// updatetime:"", // updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata, updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -3477,22 +3477,22 @@ class Listofworksstudentone extends Component {
} }
if(homewrok===false){ if(homewrok===false){
for(var i=0;i<columnsstu.length;i++){ for(var i=0;i<columnsstu.length;i++){
if (columnsstu[i].title === "当前完成关卡"){//item.id==122 if (columnsstu[i].title === "最新完成关卡"){//item.id==122
columnsstu.splice(i,1) columnsstu.splice(i,1)
} }
} }
for(var i=0;i<columnsstu2.length;i++){ for(var i=0;i<columnsstu2.length;i++){
if (columnsstu2[i].title === "当前完成关卡"){//item.id==122 if (columnsstu2[i].title === "最新完成关卡"){//item.id==122
columnsstu2.splice(i,1) columnsstu2.splice(i,1)
} }
} }
for(var i=0;i<columns.length;i++){ for(var i=0;i<columns.length;i++){
if (columns[i].title === "当前完成关卡"){//item.id==122 if (columns[i].title === "最新完成关卡"){//item.id==122
columns.splice(i,1) columns.splice(i,1)
} }
} }
for(var i=0;i<columnss.length;i++){ for(var i=0;i<columnss.length;i++){
if (columnss[i].title === "当前完成关卡"){//item.id==122 if (columnss[i].title === "最新完成关卡"){//item.id==122
columnss.splice(i,1) columnss.splice(i,1)
} }
} }

Write Preview
Loading…
Cancel
Save