-
+
{tableData && tableData.course_name}
>
{tableData.graduation_name}
@@ -111,9 +111,9 @@ class GraduateTopicDetail extends Component{
选题详情
- {tableData && tableData.graduation_topic_name}
-
- this.props.history.goBack()}>返回
+ {tableData && tableData.graduation_topic_name}
+
+ this.props.history.goBack()}>返回
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index 4e92f75ee..c9bd3f496 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -169,6 +169,7 @@ class GraduateTopicDetailTable extends Component{
} = this.state
const isAdmin =this.props.isAdmin();
const isStudent =this.props.isStudent();
+ const isNotMember=this.props.isNotMember();
console.log(un_addClass_notice)
return(
@@ -176,7 +177,7 @@ class GraduateTopicDetailTable extends Component{
序号
姓名
-
学号
+ {isNotMember ?"" :
学号}
分班
选题时间
操作
@@ -260,7 +261,7 @@ class GraduateTopicDetailTable extends Component{
{parseInt(key+1)+(parseInt(page-1)*15)}
{item.student_name}
- {item.student_id}
+ {isNotMember ?"" :{item.student_id}}
{item.class_group_name || "--"}
{item.selected_time}
{
@@ -288,6 +289,9 @@ class GraduateTopicDetailTable extends Component{
isAdmin &&
{item.result=== "待确认"?"--":item.result}
}
+ {
+ isNotMember && --
+ }
)
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 17a1b070e..7ccfae974 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -70,9 +70,9 @@ class GraduateTopicItem extends Component{
`}
{
- isNotMember?discussMessage.private_icon===true?
- {discussMessage.name}: this.toDetailPage(`${discussMessage.id}`)}
- className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""
+ isNotMember && discussMessage.private_icon===true ?
+ {discussMessage.name}:
+ this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}
}
{
diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
index ceca9b291..f8846d751 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js
@@ -192,7 +192,12 @@ class PollDetailTabFirst extends Component{
key: 'classes',
dataIndex: 'classes',
width:160,
- className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none"
+ className:poll_types && poll_types.groups_count > 0 ? "edu-txt-center":"edu-txt-center none",
+ render:(classes,item,index)=>{
+ return(
+ item.classes ? {item.classes} : --
+ )
+ }
}, {
title: '提交状态',
dataIndex: 'status',
@@ -212,22 +217,42 @@ class PollDetailTabFirst extends Component{
width:160,
render:(time,item,index)=>{
return(
- item.time == null ? "--" : moment(item.time).format('YYYY-MM-DD HH:mm')
+ item.time == null ? -- : moment(item.time).format('YYYY-MM-DD HH:mm')
)
}
},{
title: '操作',
dataIndex: 'operation',
key: 'operation',
- className:poll_types && poll_types.un_anonymous ? "edu-txt-center":"edu-txt-center none",
+ className:"edu-txt-center",
width:120,
render:(operation,item,index)=>{
return(
- item.status == 1 ? 查看:--
+ item.status == 1 ? 查看:--
)
}
}];
+ // 非课堂成员不显示学号列
+ let isNotMember =this.props.isNotMember();
+ if(isNotMember){
+ columns.some((item,key)=> {
+ if (item.title === "学号") {
+ columns.splice(key, 1)
+ return true
+ }
+ }
+ )
+ }
// un_anonymous true为实名问卷，显示操作列，否则隐藏
+ if(poll_types && (isNotMember || poll_types.un_anonymous == false)){
+ columns.some((item,key)=> {
+ if (item.title === "操作") {
+ columns.splice(key, 1)
+ return true
+ }
+ }
+ )
+ }
return(
{
From 755e9fcc5cbe60929d2ff2e54fcb1c677513e81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 17:36:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../exercise/Studentshavecompletedthelist.js | 3639 +++--------------
.../exercise/Testpapersettinghomepage.js | 13 +-
.../courses/shixunHomework/Listofworks.js | 56 +-
.../shixunHomework/Listofworksstudentone.js | 420 +-
4 files changed, 920 insertions(+), 3208 deletions(-)
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index a84347e25..4769cce87 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -8,7 +8,8 @@ import {
Checkbox,
Table,
Radio,
- Pagination
+ Pagination,
+ Tooltip,
} from "antd";
import axios from 'axios';
import '../css/members.css'
@@ -71,9 +72,9 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
{record.number === "--" ?
- {record.number}
+ {record.number}
:
- {record.number}
+ {record.number}
}
@@ -88,9 +89,9 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
{record.name === "--" ?
- {record.name}
+ {record.name}
:
- {record.name}
+ {record.name}
}
@@ -105,20 +106,20 @@ class Studentshavecompletedthelist extends Component {
render: (text, record) => (
{record.stduynumber === null ?
- -- :
+ }}>-- :
record.stduynumber ===
"" ?
-
-- :
-
-- :
+ {record.stduynumber}
+ }}>{record.stduynumber}
}
@@ -129,24 +130,25 @@ class Studentshavecompletedthelist extends Component {
key: 'classroom',
dataIndex: 'classroom',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
+ width:"260px",
render: (text, record) => (
{record.classroom === null ?
- -- :
+ }}>-- :
record.classroom ===
"" ?
-
-- :
-
-- :
+ {record.classroom}
+ }}>{record.classroom}
}
@@ -157,16 +159,16 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'submitstate',
key: 'submitstate',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
- {record.submitstate}
+ }}>{record.submitstate}
)
@@ -176,13 +178,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'updatetime',
key: 'updatetime',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.updatetime === "--" ?
- {record.updatetime}
+ {record.updatetime}
:
- {record.updatetime}
+ {record.updatetime}
}
),
@@ -192,18 +194,18 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'completion',
key: 'completion',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.completion === "--" ?
-
{record.completion}
-
+
:
-
90 ? {
+ 90 ? {
"color": '#DD1717',
"text-align": "center"
} : parseInt(record.completion) <= 90 ? {
@@ -216,7 +218,7 @@ class Studentshavecompletedthelist extends Component {
{
"color": '#747A7F',
"text-align": "center"
- }}>{record.completion}
+ }}>{record.completion}
}
@@ -227,18 +229,18 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'levelscore',
key: 'levelscore',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.levelscore === "--" ?
-
{record.levelscore}
-
+
:
-
90 ? {
+ 90 ? {
"color": '#DD1717',
"text-align": "center"
} : parseInt(record.levelscore) <= 90 ? {
@@ -247,7 +249,7 @@ class Studentshavecompletedthelist extends Component {
} : parseInt(record.levelscore) <= 60 ? {
"color": '#747A7F',
"text-align": "center"
- } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
+ } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
}
)
@@ -257,18 +259,22 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.efficiencyscore === "--" ?
+
+ 未评分
+ 未评分
+
}>
--
+ }}>--
+
:
-
90 ? {
+ 90 ? {
"color": '#DD1717',
"text-align": "center"
- , "width": "124px"
- } : parseInt(record.efficiencyscore) <= 90 ? {
+ } : parseInt(record.efficiencyscore) <= 90 ? {
"color": '#FF6800',
"text-align": "center"
- , "width": "124px"
- } : parseInt(record.efficiencyscore) <= 60 ? {
+ } : parseInt(record.efficiencyscore) <= 60 ? {
"color": '#747A7F',
"text-align": "center",
} : {
"color": '#747A7F',
"text-align": "center"
- , "width": "124px"
- }}>{record.efficiencyscore}
+ }}>{record.efficiencyscore}
}
@@ -548,14 +529,14 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'number',
key: 'number',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.number=== "--"?
- --
+ --
:
- {record.number}
+ {record.number}
}
@@ -566,14 +547,14 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'name',
key: 'name',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.name === "--" ?
- --
+ --
:
- {record.name}
+ {record.name}
}
)
@@ -583,24 +564,24 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'stduynumber',
key: 'stduynumber',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.stduynumber === null ?
- --
+ }}>--
: record.stduynumber === "" ?
-
--
+ }}>--
:
-
{record.stduynumber}
+ }}>{record.stduynumber}
}
@@ -611,22 +592,23 @@ class Studentshavecompletedthelist extends Component {
key: 'classroom',
dataIndex: 'classroom',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
+ width:"260px",
render: (text, record) => (
{record.classroom === null ?
- -- : record.classroom === "" ?
- -- : record.classroom === "" ?
+
-- :
- -- :
+
{record.classroom}
+ }}>{record.classroom}
}
@@ -637,16 +619,16 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'submitstate',
key: 'submitstate',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
- {record.submitstate}
+ }}>{record.submitstate}
)
@@ -656,15 +638,15 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'updatetime',
key: 'updatetime',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.updatetime === "--" ?
- --
+ --
:
- {record.updatetime}
+ {record.updatetime}
}
@@ -675,17 +657,17 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'completion',
key: 'completion',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.completion === "--"?
- --
+ }}>--
:
-
90 ? {
+ 90 ? {
"color": '#DD1717',
"text-align": "center",
} : parseInt(record.completion) <= 90 ? {
@@ -697,7 +679,7 @@ class Studentshavecompletedthelist extends Component {
} : {
"color": '#747A7F',
"text-align": "center",
- }}>{record.completion}
+ }}>{record.completion}
}
@@ -708,16 +690,16 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'levelscore',
key: 'levelscore',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.levelscore === "--" ?
- -- :
- 90 ? {
+ }}>-- :
+
90 ? {
"color": '#DD1717',
"text-align": "center",
} : parseInt(record.levelscore) <= 90 ? {
@@ -726,7 +708,7 @@ class Studentshavecompletedthelist extends Component {
} : parseInt(record.levelscore) <= 60 ? {
"color": '#747A7F',
"text-align": "center",
- } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
+ } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
}
@@ -737,16 +719,21 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{
record.efficiencyscore === "--" ?
+
+ 未评分
+ }>
-- :
-
90 ? {
+ }}>--
+
+ :
+
90 ? {
"color": '#DD1717',
"text-align": "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
@@ -758,7 +745,7 @@ class Studentshavecompletedthelist extends Component {
} : {
"color": '#747A7F',
"text-align": "center",
- }}>{record.efficiencyscore}
+ }}>{record.efficiencyscore}
}
)
@@ -768,11 +755,11 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'operating',
key: 'operating',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.operating==="--"?
- {record.operating}
+ {record.operating}
:
{record.operating}
@@ -795,14 +782,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'number',
key: 'number',
align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.number === "--" ?
- --
+ --
:
- {record.number}
+ {record.number}
}
)
@@ -812,14 +798,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'name',
key: 'name',
align: 'center',
- className: "edu-txt-center",
- width: '149px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.name==="--"?
- {record.name}
+ {record.name}
:
- {record.name}
+ {record.name}
}
)
@@ -829,14 +814,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'stduynumber',
key: 'stduynumber',
align: 'center',
- className: "edu-txt-center",
- width: '159px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.stduynumber === "--" ?
- {record.stduynumber}
+ {record.stduynumber}
:
- {record.stduynumber}
+ {record.stduynumber}
}
),
@@ -846,13 +830,14 @@ class Studentshavecompletedthelist extends Component {
key: 'classroom',
dataIndex: 'classroom',
align: 'center',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
+ width:'260px',
render: (text, record) => (
{record.classroom==="--"?
- {record.classroom}
+ {record.classroom}
:
- {record.classroom}
+ {record.classroom}
}
)
@@ -862,17 +847,16 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'submitstate',
key: 'submitstate',
align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
- {record.submitstate}
+ }}>{record.submitstate}
)
@@ -883,14 +867,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'updatetime',
key: 'updatetime',
align: 'center',
- width: '194px',
- className: "edu-txt-center",
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.updatetime==="--"?
- --
+ --
:
- {record.updatetime}
+ {record.updatetime}
}
),
@@ -900,14 +883,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'completion',
key: 'completion',
align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.completion=== "--"?
- --
+ --
:
- {record.completion}
+ {record.completion}
}
)
@@ -917,14 +899,13 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'levelscore',
key: 'levelscore',
align: 'center',
- className: "edu-txt-center",
- width: '130px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.levelscore==="--"?
- --
+ --
:
- {record.levelscore}
+ {record.levelscore}
}
)
@@ -934,15 +915,18 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
{record.efficiencyscore === "--" ?
+
+ 未评分
+ }>
--
+
:
-
90 ? {
+ 90 ? {
"color": '#DD1717',
"text-align": "center",
} : parseInt(record.efficiencyscore) <= 90 ? {
@@ -954,7 +938,7 @@ class Studentshavecompletedthelist extends Component {
} : {
"color": '#747A7F',
"text-align": "center",
- }}>{record.efficiencyscore}
+ }}>{record.efficiencyscore}
}
)
@@ -964,13 +948,199 @@ class Studentshavecompletedthelist extends Component {
dataIndex: 'finalscore',
key: 'finalscore',
align: 'center',
- className: "edu-txt-center",
- width: '78px',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.finalscore==="--"?
+ --
+ :
+ {record.finalscore}
+ }
+
+
+ )
+ },
+ ],
+ columnsystwo: [
+ {
+ title: '序号',
+ dataIndex: 'number',
+ key: 'number',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.number === "--" ?
+ --
+ :
+ {record.number}
+ }
+
+ )
+ },
+ {
+ title: '姓名',
+ dataIndex: 'name',
+ key: 'name',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.name==="--"?
+ {record.name}
+ :
+ {record.name}
+ }
+
+ )
+ },
+ {
+ title: '学号',
+ dataIndex: 'stduynumber',
+ key: 'stduynumber',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.stduynumber === "--" ?
+ {record.stduynumber}
+ :
+ {record.stduynumber}
+ }
+
+ ),
+ },
+ {
+ title: '分班',
+ key: 'classroom',
+ dataIndex: 'classroom',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ width:'260px',
+ render: (text, record) => (
+
+ {record.classroom==="--"?
+ {record.classroom}
+ :
+ {record.classroom}
+ }
+
+ )
+ },
+ {
+ title: '提交状态',
+ dataIndex: 'submitstate',
+ key: 'submitstate',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.submitstate}
+
+
+ )
+
+ },
+ {
+ title: '提交时间',
+ dataIndex: 'updatetime',
+ key: 'updatetime',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.updatetime==="--"?
+ --
+ :
+ {record.updatetime}
+ }
+
+ ),
+ },
+ {
+ title: '客观题得分',
+ dataIndex: 'completion',
+ key: 'completion',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.completion=== "--"?
+ --
+ :
+ {record.completion}
+ }
+
+ )
+ },
+ {
+ title: '主观题得分',
+ dataIndex: 'levelscore',
+ key: 'levelscore',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.levelscore==="--"?
+ --
+ :
+ {record.levelscore}
+ }
+
+ )
+ },
+ {
+ title: '最终成绩',
+ dataIndex: 'efficiencyscore',
+ key: 'efficiencyscore',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {record.efficiencyscore === "--" ?
+
+ 未评分
+ }>
+
--
+
+ :
+
90 ? {
+ "color": '#DD1717',
+ "text-align": "center",
+ } : parseInt(record.efficiencyscore) <= 90 ? {
+ "color": '#FF6800',
+ "text-align": "center",
+ } : parseInt(record.efficiencyscore) <= 60 ? {
+ "color": '#747A7F',
+ "text-align": "center",
+ } : {
+ "color": '#747A7F',
+ "text-align": "center",
+ }}>{record.efficiencyscore}
+ }
+
+ )
+ },
+ {
+ title: '操作',
+ dataIndex: 'finalscore',
+ key: 'finalscore',
+ align: 'center',
+ className: "edu-txt-center font-14",
render: (text, record) => (
{record.finalscore==="--"?
- --
+ --
:
{record.finalscore}
@@ -979,7 +1149,7 @@ class Studentshavecompletedthelist extends Component {
)
},
- ]
+ ],
}
// console.log("Studentshavecompletedthelist");
// console.log(props.current_status);
@@ -1076,1019 +1246,118 @@ class Studentshavecompletedthelist extends Component {
this.Generatenewdatas(response.data.exercise_users);
if (response.data.exercise_types.subjective === 0) {
if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
+ this.state.columnss.map((item,key)=>{
+ if(item.title==="分班"){
+ this.state.columnss.splice(key,1)
+ }
+ if(item.title==="客观题得分"){
+ this.state.columnss.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnss.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnss.splice(key,1)
+ }
+ }
+ })
+ let columnss2=this.state.columnss;
this.setState({
- columnss: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'operating',
- key: 'operating',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {
- this.props.current_status === 1 ?
- 查看
- :
- {"--"}
- }
-
-
- )
- },
- ]
- })
- } else {
- this.setState({
- columnss: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'operating',
- key: 'operating',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {
- this.props.current_status === 1 ?
- 查看
- :
- {"--"}
- }
-
-
- )
- },
- ]
- })
- }
+ columnss: columnss2,
+ })
+ } else {
+ this.state.columnss.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnss.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnss.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnss.splice(key,1)
+ }
+ }
+ })
+ let columnss2=this.state.columnss;
+ this.setState({
+ columnss: columnss2
+ })
+ }
}
} else {
//学生已截止
if (response.data.exercise_types.subjective === 0) {
if (this.state.loadingstate === false) {
- thiss.setState({
- columns: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center ",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- width: "110px",
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: "175px",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- width: "120px",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: "175px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: "236.4px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- }
- ],
- columnstwo: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- width: "110px",
- className: "edu-txt-center tabletd",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "175px",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "120px",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
+ this.state.columnstwo.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnstwo.splice(key,1)
}
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "175px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "236.4px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
}
-
- )
+ })
+ let columnstwo2=this.state.columnstwo;
+ this.state.columns.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columns.splice(key,1)
}
- ],
+ }
+ })
+ let columns2=this.state.columns
+ thiss.setState({
+ columns: columns2,
+ columnstwo: columnstwo2,
loadingstate: true,
})
} else {
- thiss.setState({
- columns: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center ",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- width: "110px",
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: "175px",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- width: "120px",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: "175px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: "236.4px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
+ this.state.columnstwo.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnstwo.splice(key,1)
}
-
- )
+ }
+ })
+ let columnstwo2=this.state.columnstwo;
+ this.state.columns.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columns.splice(key,1)
}
- ],
- columnstwo: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- width: "110px",
- className: "edu-txt-center tabletd",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
+ }
+ })
+ let columns2=this.state.columns
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "175px",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "120px",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "175px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "236.4px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- }
- ],
+ thiss.setState({
+ columns: columns2,
+ columnstwo:columnstwo2,
})
}
@@ -2341,340 +1610,37 @@ class Studentshavecompletedthelist extends Component {
current_answer_user: response.data.current_answer_user,
})
if (response.data.exercise_types.subjective === 0) {
-
- this.setState({
- columns: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center ",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: "110px",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- width: "175px",
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- width: "120px",
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: "124px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: "236px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- }
- ],
- columnstwo: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "84px",
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "110px",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- width: "175px",
- className: "edu-txt-center tabletd",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- width: "120px",
- className: "edu-txt-center tabletd",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
+ this.state.columnstwo.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnstwo.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnstwo.splice(key,1)
}
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "124px",
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "236px",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center tabletd",
- width: "124px",
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
+ }
+ })
+ let columnstwo2=this.state.columnstwo;
+ this.state.columns.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columns.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columns.splice(key,1)
}
- ],
+ }
+ })
+ let columns2=this.state.columns
+ this.setState({
+ columns: columns2,
+ columnstwo: columnstwo2,
loadingstate: false,
})
}
@@ -2749,6 +1715,19 @@ class Studentshavecompletedthelist extends Component {
// console.log("77771111111");
//分班大于0显示分班
//7ge
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
+ }
+ }
+ })
thiss.setState({
data: datalist,
teacherlist: teacherlist,
@@ -2758,174 +1737,28 @@ class Studentshavecompletedthelist extends Component {
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
loadingstate: false,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '110px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '183px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '193px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- width: '193px',
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '146px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '228px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '146px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- }
- ]
+ columnsys: this.state.columnsys,
})
} else {
//分班小于0不显示分班
//6ge
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="分班"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="客观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
+ }
+ }
+ })
+
thiss.setState({
data: datalist,
teacherlist: teacherlist,
@@ -2935,144 +1768,7 @@ class Studentshavecompletedthelist extends Component {
commit_status: response.data.commit_status,
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- width: '149px',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- width: '159px',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '194px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- }
- ]
+ columnsys: this.state.columnsys,
})
}
@@ -3082,6 +1778,19 @@ class Studentshavecompletedthelist extends Component {
if (response.data.exercise_types.groups_count > 0) {
//显示分班
//8ge
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="客观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
+ }
+ }
+ })
this.setState({
data: datalist,
teacherlist: teacherlist,
@@ -3090,195 +1799,28 @@ class Studentshavecompletedthelist extends Component {
commit_status: response.data.commit_status,
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
- loadingstate: false,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '96px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '169px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '179px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- width: '179px',
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '132px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '214px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '132px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'finalscore',
- key: 'finalscore',
- align: 'center',
- className: "edu-txt-center",
- width: '98px',
- render: (text, record) => (
-
- {record.finalscore==="--"?
- --
- :
- {record.finalscore}
- }
-
-
- )
- },
- ]
+ loadingstate: false,
+ columnsys: this.state.columnsys,
})
} else {
//不显示分班
//7ge
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="分班"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="客观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(item.title==="主观题得分"){
+ this.state.columnsys.splice(key,1)
+ }
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
+ }
+ }
+ })
this.setState({
data: datalist,
teacherlist: teacherlist,
@@ -3288,164 +1830,7 @@ class Studentshavecompletedthelist extends Component {
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
loadingstate: false,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '110px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '228px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '193px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '146px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '193px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '183px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'finalscore',
- key: 'finalscore',
- align: 'center',
- className: "edu-txt-center",
- width: '146px',
- render: (text, record) => (
-
- {record.finalscore==="--"?
- --
- :
- {record.finalscore}
- }
-
-
- )
- },
- ]
+ columnsys: this.state.columnsys,
})
}
@@ -3455,7 +1840,15 @@ class Studentshavecompletedthelist extends Component {
//包括主观题
if (indexi === exercise_users.length) {
console.log("2548包含主观题不包含分班");
+
if (response.data.exercise_types.groups_count > 0) {
+ this.state.columnsys.map((item,key)=>{
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
+ }
+ }
+ })
this.setState({
data: datalist,
teacherlist: teacherlist,
@@ -3464,205 +1857,19 @@ class Studentshavecompletedthelist extends Component {
commit_status: response.data.commit_status,
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '149px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '159px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
+ columnsys: this.state.columnsys,
+ })
+ } else {
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="分班"){
+ this.state.columnsys.splice(key,1)
}
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '194px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
}
-
- ),
- },
- {
- title: '客观题得分',
- dataIndex: 'completion',
- key: 'completion',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.completion=== "--"?
- --
- :
- {record.completion}
- }
-
- )
- },
- {
- title: '主观题得分',
- dataIndex: 'levelscore',
- key: 'levelscore',
- align: 'center',
- className: "edu-txt-center",
- width: '130px',
- render: (text, record) => (
-
- {record.levelscore==="--"?
- --
- :
- {record.levelscore}
}
-
- )
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- ]
})
- } else {
this.setState({
data: datalist,
teacherlist: teacherlist,
@@ -3671,178 +1878,7 @@ class Studentshavecompletedthelist extends Component {
commit_status: response.data.commit_status,
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '149px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '159px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className: "edu-txt-center",
- width: '194px',
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '客观题得分',
- dataIndex: 'completion',
- key: 'completion',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.completion=== "--"?
- --
- :
- {record.completion}
- }
-
- )
- },
- {
- title: '主观题得分',
- dataIndex: 'levelscore',
- key: 'levelscore',
- align: 'center',
- className: "edu-txt-center",
- width: '130px',
- render: (text, record) => (
-
- {record.levelscore==="--"?
- --
- :
- {record.levelscore}
- }
-
- )
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- ]
+ columnsys: this.state.columnsys,
})
}
} else {
@@ -3857,223 +1893,19 @@ class Studentshavecompletedthelist extends Component {
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
loadingstate: false,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '149px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '159px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
+ columnsys: this.state.columnsystwo,
+ })
+ } else {
+ this.state.columnsys.map((item,key)=>{
+ if(item.title==="分班"){
+ this.state.columnsys.splice(key,1)
}
-
- ),
- },
- {
- title: '分班',
- key: 'classroom',
- dataIndex: 'classroom',
- align: 'center',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.classroom === null ?
- -- : record.classroom === "" ?
- -- :
- {record.classroom}
- }
-
- )
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- width: '194px',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '客观题得分',
- dataIndex: 'completion',
- key: 'completion',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.completion=== "--"?
- --
- :
- {record.completion}
+ if(this.props.isNotMember()===true) {
+ if(item.title==="学号"){
+ this.state.columnsys.splice(key,1)
}
-
- )
- },
- {
- title: '主观题得分',
- dataIndex: 'levelscore',
- key: 'levelscore',
- align: 'center',
- className: "edu-txt-center",
- width: '130px',
- render: (text, record) => (
-
- {record.levelscore==="--"?
- --
- :
- {record.levelscore}
- }
-
- )
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'finalscore',
- key: 'finalscore',
- align: 'center',
- className: "edu-txt-center",
- width: '78px',
- render: (text, record) => (
-
- {record.finalscore==="--"?
- {record.finalscore}
- :
- {record.finalscore}
- }
-
- )
- },
- ]
+ }
})
- } else {
this.setState({
data: datalist,
teacherlist: teacherlist,
@@ -4083,197 +1915,7 @@ class Studentshavecompletedthelist extends Component {
exercise_users: response.data.exercise_users,
course_groups: response.data.course_groups,
loadingstate: false,
- columnsys: [
- {
- title: '序号',
- dataIndex: 'number',
- key: 'number',
- align: 'center',
- className: "edu-txt-center",
- width: '76px',
- render: (text, record) => (
-
- {record.number==="--"?
- --
- :
- {record.number}
- }
-
- )
- },
- {
- title: '姓名',
- dataIndex: 'name',
- key: 'name',
- align: 'center',
- className: "edu-txt-center",
- width: '149px',
- render: (text, record) => (
-
- {record.name==="--"?
- --
- :
- {record.name}
-
- }
-
- )
- },
- {
- title: '学号',
- dataIndex: 'stduynumber',
- key: 'stduynumber',
- align: 'center',
- className: "edu-txt-center",
- width: '159px',
- render: (text, record) => (
-
- {record.stduynumber === null ?
- --
- : record.stduynumber === "" ?
- --
- :
- {record.stduynumber}
- }
-
- ),
- },
- {
- title: '提交状态',
- dataIndex: 'submitstate',
- key: 'submitstate',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.submitstate}
-
- )
-
- },
- {
- title: '提交时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- width: '194px',
- className: "edu-txt-center",
- render: (text, record) => (
-
- {record.updatetime==="--"?
-
- :
- {record.updatetime}
- }
-
- ),
- },
- {
- title: '客观题得分',
- dataIndex: 'completion',
- key: 'completion',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.completion=== "--"?
- --
- :
- {record.completion}
- }
-
- )
- },
- {
- title: '主观题得分',
- dataIndex: 'levelscore',
- key: 'levelscore',
- align: 'center',
- className: "edu-txt-center",
- width: '130px',
- render: (text, record) => (
-
- {record.levelscore==="--"?
- --
- :
- {record.levelscore}
- }
-
- )
- },
- {
- title: '最终成绩',
- dataIndex: 'efficiencyscore',
- key: 'efficiencyscore',
- align: 'center',
- className: "edu-txt-center",
- width: '112px',
- render: (text, record) => (
-
- {record.efficiencyscore === "--" ?
- --
- :
- 90 ? {
- "color": '#DD1717',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 90 ? {
- "color": '#FF6800',
- "text-align": "center",
- } : parseInt(record.efficiencyscore) <= 60 ? {
- "color": '#747A7F',
- "text-align": "center",
- } : {
- "color": '#747A7F',
- "text-align": "center",
- }}>{record.efficiencyscore}
- }
-
- )
- },
- {
- title: '操作',
- dataIndex: 'finalscore',
- key: 'finalscore',
- align: 'center',
- className: "edu-txt-center",
- width: '78px',
- render: (text, record) => (
-
- {record.finalscore==="--"?
- {record.finalscore}
- :
- {record.finalscore}
- }
-
-
- )
- },
- ]
+ columnsys: this.state.columnsys,
})
}
@@ -4332,14 +1974,16 @@ class Studentshavecompletedthelist extends Component {
unlimited: 0,
course_groupyslsthree: undefined,
loadingstate: true,
+ page:1
})
} else {
this.setState({
unlimited: 0,
course_groupyslsthree: undefined,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
// notlimiteds = () => {
// this.setState({
@@ -4356,15 +2000,17 @@ class Studentshavecompletedthelist extends Component {
unlimiteds: 0,
course_groupyslstwo: undefined,
loadingstate: true,
+ page:1,
})
} else {
this.setState({
unlimiteds: 0,
course_groupyslstwo: undefined,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
checkeboxstwo = (checkedValues, data) => {
// console.log(checkedValues)
@@ -4375,43 +2021,49 @@ class Studentshavecompletedthelist extends Component {
loadingstate: true,
course_groupyslstwo: undefined,
unlimiteds: 0,
+ page:1
})
} else {
this.setState({
course_groupyslstwo: undefined,
unlimiteds: 0,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
loadingstate: true,
course_groupyslstwo: undefined,
unlimiteds: 0,
+ page:1
})
} else {
this.setState({
course_groupyslstwo: undefined,
unlimiteds: 0,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else {
// console.log(checkedValues);
- this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
if (this.state.loadingstate === false) {
this.setState({
loadingstate: true,
course_groupyslstwo: checkedValues,
- unlimiteds: 1
+ unlimiteds: 1,
+ page:1,
})
} else {
this.setState({
course_groupyslstwo: checkedValues,
- unlimiteds: 1
+ unlimiteds: 1,
+ page:1,
})
}
@@ -4448,30 +2100,34 @@ class Studentshavecompletedthelist extends Component {
unlimited: 0,
course_groupyslsthree: undefined,
loadingstate: true,
+ page:1
})
} else {
this.setState({
unlimited: 0,
course_groupyslsthree: undefined,
+ page:1
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
unlimited: 0,
course_groupyslsthree: undefined,
loadingstate: true,
+ page:1
})
} else {
this.setState({
unlimited: 0,
course_groupyslsthree: undefined,
+ page:1
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@@ -4479,15 +2135,17 @@ class Studentshavecompletedthelist extends Component {
unlimited: 1,
loadingstate: true,
course_groupyslsthree: checkedValues,
+ page:1
})
} else {
this.setState({
unlimited: 1,
course_groupyslsthree: checkedValues,
+ page:1
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
}
@@ -4499,16 +2157,18 @@ class Studentshavecompletedthelist extends Component {
checkedValuesineinfo: undefined,
course_groupysls: undefined,
loadingstate: true,
+ page:1,
})
} else {
this.setState({
unlimitedtwo: 0,
checkedValuesineinfo: undefined,
course_groupysls: undefined,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, null, null)
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
}
funtaskstatustwo = (checkedValues, data) => {
@@ -4521,30 +2181,34 @@ class Studentshavecompletedthelist extends Component {
course_groupysls: undefined,
unlimitedtwo: 0,
loadingstate: true,
+ page:1,
})
} else {
this.setState({
course_groupysls: undefined,
unlimitedtwo: 0,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
course_groupysls: undefined,
unlimitedtwo: 0,
loadingstate: true,
+ page:1,
})
} else {
this.setState({
course_groupysls: undefined,
unlimitedtwo: 0,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@@ -4553,17 +2217,19 @@ class Studentshavecompletedthelist extends Component {
course_groupysls: checkedValues,
unlimitedtwo: 1,
loadingstate: true,
+ page:1
})
} else {
this.setState({
checkedValuesineinfo: checkedValues,
course_groupysls: checkedValues,
unlimitedtwo: 1,
+ page:1
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.props.setcourse_groupysls(checkedValues)
}
@@ -4580,10 +2246,11 @@ class Studentshavecompletedthelist extends Component {
if (this.state.loadingstate === false) {
this.setState({
loadingstate: true,
+ page:1
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
}
//搜索学生 文字输入
@@ -4591,11 +2258,11 @@ class Studentshavecompletedthelist extends Component {
// console.log(e.target.value)
if (e.target.value === "") {
this.setState({
- searchtext: undefined
+ searchtext: undefined,
})
} else {
this.setState({
- searchtext: e.target.value
+ searchtext: e.target.value,
})
}
@@ -4610,10 +2277,11 @@ class Studentshavecompletedthelist extends Component {
if (this.state.loadingstate === false) {
this.setState({
loadingstate: true,
+ page:1,
})
}
- this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, null, null);
+ this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
// console.log(value)
@@ -4636,7 +2304,7 @@ class Studentshavecompletedthelist extends Component {
})
}
- this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
+ this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
}
if (e === "score") {
@@ -4823,16 +2491,16 @@ class Studentshavecompletedthelist extends Component {
@@ -4855,7 +2523,7 @@ class Studentshavecompletedthelist extends Component {
columns={columnsys}
pagination={false}
loading={loadingstate}
- onChange={this.TablePaginationsy}
+ // onChange={this.TablePaginationsy}
/>}