diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index 26d4499aa..72512be43 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -17,7 +17,8 @@ class AccessoryModal extends Component{ ModalSave:"", loadtype:false, updatas:false, - shixunsreplace:false + shixunsreplace:false, + Errormessage:false, } } @@ -41,7 +42,10 @@ class AccessoryModal extends Component{ // for(var list of fileList ){ // console.log(fileList) // } - this.setState({ fileList }); + this.setState({ + fileList:fileList, + Errormessage:false, + }); } onAttachmentRemove = (file) => { @@ -121,10 +125,23 @@ class AccessoryModal extends Component{ if (newfileList.length == 0) { // this.props.showNotification('请先上传附件') - this.setState({ - shixunsreplace:true, - }) + if(this.props.modalname === "补交附件"){ + this.setState({ + Errormessage:true, + shixunsreplace:false, + }) + }else{ + this.setState({ + shixunsreplace:true, + Errormessage:false, + }) + } return; + }else{ + this.setState({ + shixunsreplace:false, + Errormessage:false, + }) } let url= this.props.reviseAttachmentUrl || "/graduation_works/"+id+"/revise_attachment.json" @@ -326,6 +343,14 @@ class AccessoryModal extends Component{ border:'1px solid rgba(234,234,234,1)', padding: '10px' }}> + { + this.state.Errormessage && this.state.Errormessage === true ? +

+ 还未上传附件 +

+ :
+ + } {this.state.updatas===true?请上传附件:""}
{this.props.Cancelname || '取消'} diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 33362df65..c2930bcdf 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' @@ -54,7 +55,7 @@ class Studentshavecompletedthelist extends Component { unsubmitted: false, exercise_users: undefined, loadingstate: true, - order: undefined, + order: "end_at", current_answer_user: undefined, course_groups: undefined, course_groupsdatas: false, @@ -67,14 +68,13 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'number', key: 'number', align: 'center', - width: "84px", - className: "edu-txt-center", + className: "edu-txt-center font-14", render: (text, record) => ( {record.number === "--" ? - {record.number} + {record.number} : - {record.number} + {record.number} } @@ -85,14 +85,13 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'name', key: 'name', align: 'center', - className: "edu-txt-center", - width: "110px", + className: "edu-txt-center font-14", render: (text, record) => ( {record.name === "--" ? - {record.name} + {record.name} : - {record.name} + {record.name} } @@ -103,28 +102,24 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: 'center', - className: "edu-txt-center", - width: "175px", + className: "edu-txt-center font-14", render: (text, record) => ( {record.stduynumber === null ? - -- : + }}>-- : record.stduynumber === "" ? - -- : - -- : + {record.stduynumber} + }}>{record.stduynumber} } @@ -135,28 +130,25 @@ class Studentshavecompletedthelist extends Component { key: 'classroom', dataIndex: 'classroom', align: 'center', - className: "edu-txt-center", - width: "120px", - render: (text, record) => ( + className: "edu-txt-center font-14", + width:"260px", + render: (text, record) => ( {record.classroom === null ? - -- : + }}>-- : record.classroom === "" ? - -- : - -- : + {record.classroom} + }}>{record.classroom} } @@ -167,19 +159,16 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'submitstate', key: 'submitstate', align: 'center', - width: "124px", - className: "edu-txt-center", + className: "edu-txt-center font-14", render: (text, record) => ( - {record.submitstate} + }}>{record.submitstate} ) @@ -189,14 +178,13 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', - className: "edu-txt-center", - width: "236.4px", - render: (text, record) => ( + className: "edu-txt-center font-14", + render: (text, record) => ( {record.updatetime === "--" ? - {record.updatetime} + {record.updatetime} : - {record.updatetime} + {record.updatetime} } ), @@ -206,37 +194,31 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'completion', key: 'completion', align: 'center', - className: "edu-txt-center", - width: "124px", - render: (text, record) => ( + className: "edu-txt-center font-14", + render: (text, record) => ( { record.completion === "--" ? - + }}> {record.completion} - + : - 90 ? { + 90 ? { "color": '#DD1717', "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 90 ? { + } : parseInt(record.completion) <= 90 ? { "color": '#FF6800', "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 60 ? { + } : parseInt(record.completion) <= 60 ? { "color": '#747A7F', "text-align": "center" - , "width": "124px" - } : + } : { "color": '#747A7F', "text-align": "center" - , "width": "124px" - }}>{record.completion} + }}>{record.completion} } @@ -247,32 +229,27 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'levelscore', key: 'levelscore', align: 'center', - width: "124px", - className: "edu-txt-center", + className: "edu-txt-center font-14", render: (text, record) => ( {record.levelscore === "--" ? - + }}> {record.levelscore} - + : - 90 ? { + 90 ? { "color": '#DD1717', "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 90 ? { + } : parseInt(record.levelscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.levelscore) <= 60 ? { "color": '#747A7F', "text-align": "center" - , "width": "124px" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} } ) @@ -282,35 +259,34 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', - width: "124px", - className: "edu-txt-center", + className: "edu-txt-center font-14", render: (text, record) => ( {record.efficiencyscore === "--" ? + +
未评分
+
}> + }}> {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} } ) @@ -322,16 +298,15 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'number', key: 'number', align: 'center', - width: "84px", - className: "edu-txt-center tabletd", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( { record.number === "--" ? - {record.number} + {record.number} : - {record.number} + {record.number} } @@ -342,15 +317,14 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'name', key: 'name', align: 'center', - className: "edu-txt-center tabletd", - width: "110px", - render: (text, record) => ( + className: "edu-txt-center tabletd font-14", + render: (text, record) => ( { record.name === "--" ? - {record.name} + {record.name} : - {record.name} + {record.name} } @@ -361,29 +335,25 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: 'center', - className: "edu-txt-center tabletd", - width: "175px", - render: (text, record) => ( + className: "edu-txt-center tabletd font-14", + render: (text, record) => ( {record.stduynumber === null ? - -- + }}>-- : record.stduynumber === "" ? - -- + }}>-- : - {record.stduynumber} + }}>{record.stduynumber} } @@ -394,26 +364,23 @@ class Studentshavecompletedthelist extends Component { key: 'classroom', dataIndex: 'classroom', align: 'center', - className: "edu-txt-center tabletd", - width: "120px", - render: (text, record) => ( + className: "edu-txt-center tabletd font-14", + width:"260px", + render: (text, record) => ( {record.classroom === null ? - --: record.classroom === "" ? - --: record.classroom === "" ? + --: - --: + {record.classroom} + }}>{record.classroom} } @@ -424,19 +391,16 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'submitstate', key: 'submitstate', align: 'center', - width: "124px", - className: "edu-txt-center tabletd", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( - {record.submitstate} + }}>{record.submitstate} ) @@ -446,14 +410,13 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', - className: "edu-txt-center tabletd", - width: "236.4px", - render: (text, record) => ( + className: "edu-txt-center tabletd font-14", + render: (text, record) => ( {record.updatetime === "--"? - -- + -- : - {record.updatetime} + {record.updatetime} } ), @@ -463,37 +426,31 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'completion', key: 'completion', align: 'center', - className: "edu-txt-center tabletd", - width: "124px", - render: (text, record) => ( + className: "edu-txt-center tabletd font-14", + render: (text, record) => ( {record.completion === "--" ? - + }}> -- - + : - 90 ? { + 90 ? { "color": '#DD1717', "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 90 ? { + } : parseInt(record.completion) <= 90 ? { "color": '#FF6800', "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 60 ? { + } : parseInt(record.completion) <= 60 ? { "color": '#747A7F', "text-align": "center" - , "width": "124px" - } : { + } : { "color": '#747A7F', "text-align": "center" - , "width": "124px" - }}>{record.completion} + }}>{record.completion} } ) @@ -503,32 +460,27 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'levelscore', key: 'levelscore', align: 'center', - width: "124px", - className: "edu-txt-center tabletd", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( {record.levelscore === "--"? - + }}> -- - + : - 90 ? { + 90 ? { "color": '#DD1717', "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 90 ? { + } : parseInt(record.levelscore) <= 90 ? { "color": '#FF6800', "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.levelscore) <= 60 ? { "color": '#747A7F', "text-align": "center" - , "width": "124px" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} } ) @@ -538,34 +490,33 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', - width: "124px", - className: "edu-txt-center tabletd", + className: "edu-txt-center tabletd 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} } @@ -578,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} } @@ -596,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} } ) @@ -613,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} } @@ -641,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} } @@ -667,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} ) @@ -686,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} } @@ -705,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 ? { @@ -727,7 +679,7 @@ class Studentshavecompletedthelist extends Component { } : { "color": '#747A7F', "text-align": "center", - }}>{record.completion} + }}>{record.completion} } @@ -738,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 ? { @@ -756,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} } @@ -767,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 ? { @@ -788,7 +745,7 @@ class Studentshavecompletedthelist extends Component { } : { "color": '#747A7F', "text-align": "center", - }}>{record.efficiencyscore} + }}>{record.efficiencyscore} } ) @@ -798,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} @@ -825,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} } ) @@ -842,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} } ) @@ -859,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} } ), @@ -876,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} } ) @@ -892,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} ) @@ -913,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} } ), @@ -930,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} } ) @@ -947,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} } ) @@ -964,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 ? { @@ -984,7 +938,7 @@ class Studentshavecompletedthelist extends Component { } : { "color": '#747A7F', "text-align": "center", - }}>{record.efficiencyscore} + }}>{record.efficiencyscore} } ) @@ -994,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} @@ -1009,10 +1149,14 @@ class Studentshavecompletedthelist extends Component { ) }, - ] + ], } // console.log("Studentshavecompletedthelist"); // console.log(props.current_status); + // columnsys 老师列表 + // columnss 学生只能看自己的 未截止页面 + // columnstwo 截止显示自己的 + // columns 截止后显示其他学生 } paginationonChange = (pageNumber) => { @@ -1102,341 +1246,43 @@ 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 ? - 查看 - : - {"--"} - } - - - ) - }, - ] + 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: [ - { - 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 }) } @@ -1445,676 +1291,73 @@ class Studentshavecompletedthelist extends Component { //学生已截止 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, }) } @@ -2367,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, }) } @@ -2775,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, @@ -2784,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, @@ -2961,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, }) } @@ -3108,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, @@ -3116,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, @@ -3314,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, }) } @@ -3481,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, @@ -3490,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, @@ -3697,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 { @@ -3883,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, @@ -4109,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, }) } @@ -4358,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({ @@ -4382,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) @@ -4401,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, }) } @@ -4474,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) { @@ -4505,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); } } @@ -4525,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) => { @@ -4547,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) { @@ -4579,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) } @@ -4606,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); } } //搜索学生 文字输入 @@ -4617,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, }) } @@ -4636,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) @@ -4662,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") { @@ -4715,8 +2357,9 @@ class Studentshavecompletedthelist extends Component { (
+ {/*老师*/}
@@ -4975,7 +2618,6 @@ class Studentshavecompletedthelist extends Component { columns={columnss} pagination={false} loading={false} - onChange={this.TablePaginations} />}
@@ -5048,18 +2690,18 @@ class Studentshavecompletedthelist extends Component {