{teacherdata === undefined ? "" : teacherdata.student_works.length}个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生）
-
+
@@ -1581,7 +1610,6 @@ class Listofworks extends Component {
columns={columns}
pagination={false}
loading={loadingstate}
- onChange={this.TablePagination}
/>}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 1c12130ed..8659bc472 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -60,7 +60,202 @@ class Listofworksstudentone extends Component {
"display": "none"
},
student_works: [],
- startbtn: false
+ startbtn: false,
+ columns: [
+ {
+ title: '序号',
+ dataIndex: 'number',
+ key: 'number',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.number === undefined ?
+ --
+ : record.number === "" ?
+ --
+ : record.number === "--" ?
+ --
+ :
+ {record.number}
+ }
+
+ ),
+ },
+ {
+ title: '姓名',
+ dataIndex: 'name',
+ key: 'name',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.name === undefined ?
+ --
+ :
+ record.name === "" ?
+ --
+ :
+ record.name === null ?
+ --
+ :
+ record.name === "--" ?
+ --
+ :
+ {record.name}
+ }
+
+
+ ),
+ },
+ {
+ title: '学号',
+ dataIndex: 'stduynumber',
+ key: 'stduynumber',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
+
+ ),
+ },
+ {
+ title: '分班',
+ key: 'classroom',
+ dataIndex: 'classroom',
+ align: "center",
+ className:'font-14',
+ width:'288px',
+ render: (text, record) => (
+
+ {record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}
+
+ ),
+ },
+ {
+ title: '提交状态',
+ dataIndex: 'submitstate',
+ key: 'submitstate',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}
+
+
+ ),
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updatetime',
+ key: 'updatetime',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
+
+ ),
+ },
+ {
+ title: '完成情况',
+ dataIndex: 'completion',
+ key: 'completion',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.completion+"/"+this.state.challenges_count}
+
+ ),
+ },
+ {
+ title: '最终成绩',
+ dataIndex: 'levelscore',
+ key: 'levelscore',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {
+ record.levelscore && record.levelscore === "--"?
+ {record.levelscore}
+ :
+ =90 ? {
+ "color": '#DD1717',
+ "text-align": "center"
+ } : parseInt(record.levelscore) <= 60?{
+ "color": '#FF6800',
+ "text-align": "center",
+ }: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
+ }
+
+
+ ),
+ },
+ {
+ title: '操作',
+ dataIndex: 'operating',
+ key: 'operating',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {
+ record.submitstate === "未提交" ?--
+ :
+ this.Viewstudenttraininginformation(record)}>{record.operating}
+ }
+
+
+ ),
+ },
+ ],
}
//
}
@@ -193,7 +388,14 @@ class Listofworksstudentone extends Component {
let datalists = [];
var styletable = {"display": "none"}
- // console.log("seacthdata设置数据3")
+ this.state.columns.map((item,key)=>{
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columns.splice(key,1)
+ }
+ }
+ })
+ let columns2=this.state.columns;
var teacherlist = undefined;
var teacherlists = undefined;
@@ -297,11 +499,21 @@ class Listofworksstudentone extends Component {
teacherlists: teacherlists,
loadingstate: false,
styletable: styletable,
+ columns:columns2,
})
}
// 设置数据
seacthdata = (teacherdata) => {
let datalist = [];
+ this.state.columns.map((item,key)=>{
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columns.splice(key,1)
+ }
+ }
+ })
+ let columns2=this.state.columns;
+
if (teacherdata !== undefined) {
// console.log("seacthdata设置数据")
// console.log(this.state.teacherdata.id )
@@ -361,6 +573,7 @@ class Listofworksstudentone extends Component {
data: datalist,
teacherlist: teacherlist,
loadingstate: false,
+ columns:columns2,
})
}
// 查看学员实训信息
@@ -530,202 +743,8 @@ class Listofworksstudentone extends Component {
}
render() {
- let {visibles, game_list, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
- let columns = [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.number === undefined ?
- --
- : record.number === "" ?
- --
- : record.number === "--" ?
- --
- :
- {record.number}
- }
-
- ),
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.name === undefined ?
- --
- :
- record.name === "" ?
- --
- :
- record.name === null ?
- --
- :
- record.name === "--" ?
- --
- :
- {record.name}
- }
+ let {visibles, game_list,columns, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
-
- ),
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: "center",
- className:'font-14',
- width:'288px',
- render: (text, record) => (
-
- {record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}
-
-
- ),
- },
- {
- title: '更新时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
-
- ),
- },
- {
- title: '完成情况',
- dataIndex: 'completion',
- key: 'completion',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.completion+"/"+this.state.challenges_count}
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'levelscore',
- key: 'levelscore',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {
- record.levelscore && record.levelscore === "--"?
- {record.levelscore}
- :
- =90 ? {
- "color": '#DD1717',
- "text-align": "center"
- } : parseInt(record.levelscore) <= 60?{
- "color": '#FF6800',
- "text-align": "center",
- }: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
- }
-
-
- ),
- },
- {
- title: '操作',
- dataIndex: 'operating',
- key: 'operating',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {
- record.submitstate === "未提交" ?--
- :
- this.Viewstudenttraininginformation(record)}>{record.operating}
- }
-
-
- ),
- },
- ];
return (
teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
// 学生不能查看别人的
@@ -978,12 +997,12 @@ class Listofworksstudentone extends Component {
style={{"color": '#FF6800'}}>{teacherdata.left_time.time}}
-