|
|
|
|
@ -12,6 +12,7 @@ import ModulationModal from "../../coursesPublic/ModulationModal";
|
|
|
|
|
import AllocationModal from "../../coursesPublic/AllocationModal";
|
|
|
|
|
import Associationmodel from '../../coursesPublic/Associationmodel';
|
|
|
|
|
import AccessoryModal from "../../coursesPublic/AccessoryModal";
|
|
|
|
|
import './Graduationclass.css';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const CheckboxGroup = Checkbox.Group;
|
|
|
|
|
@ -51,6 +52,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
visibles:false,
|
|
|
|
|
DownloadType:false,
|
|
|
|
|
DownloadMessageval:undefined,
|
|
|
|
|
commentstate:null
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -88,13 +90,13 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
course_groupslist:[],
|
|
|
|
|
checkAllValue:false
|
|
|
|
|
})
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state;
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
let {commentstate, task_status, course_group, cross_comment, order, b_order, search} = this.state;
|
|
|
|
|
this.seacthdata(commentstate, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
|
|
|
|
|
this.props.getsonar(teacher_comment, task_status, course_group, cross_comment, search)
|
|
|
|
|
this.props.getsonar(commentstate, task_status, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
|
|
|
|
|
seacthdata=(commentstate,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
|
|
|
|
|
let{page,limit}=this.state;
|
|
|
|
|
|
|
|
|
|
// console.log(teacher_comment,task_status,course_group,cross_comment,order,b_order,search)
|
|
|
|
|
@ -104,7 +106,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
//get 数组
|
|
|
|
|
axios.get(url,{
|
|
|
|
|
params: {
|
|
|
|
|
teacher_comment:teacher_comment===null?undefined:teacher_comment,
|
|
|
|
|
teacher_comment:commentstate===null||commentstate===undefined?undefined:commentstate,
|
|
|
|
|
task_status:task_status===null?undefined:task_status,
|
|
|
|
|
course_group:course_group===null?undefined:course_group,
|
|
|
|
|
cross_comment:cross_comment===null?undefined:cross_comment,
|
|
|
|
|
@ -229,31 +231,56 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
funteachercomment=(list,key)=> {
|
|
|
|
|
// console.log(e.target.value)
|
|
|
|
|
|
|
|
|
|
let asum=undefined
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state;
|
|
|
|
|
if(this.state.teacher_comment!=null&&list.length>0){
|
|
|
|
|
if(this.state.teacher_comment.length>0){
|
|
|
|
|
list.map((item,key)=>{
|
|
|
|
|
this.state.teacher_comment.map((k,y)=>{
|
|
|
|
|
if(item===k){
|
|
|
|
|
list.splice(key, 1)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let listype =list instanceof Array;
|
|
|
|
|
let listype =list instanceof Array;
|
|
|
|
|
if(listype===false){
|
|
|
|
|
this.setState({
|
|
|
|
|
teacher_comment:null,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
loadingstate:true,
|
|
|
|
|
commentstate:null
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
|
|
if(list.length>0){
|
|
|
|
|
list.map((item,key)=>{
|
|
|
|
|
if(key===0){
|
|
|
|
|
asum=item;
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
asum=undefined
|
|
|
|
|
}
|
|
|
|
|
this.setState({
|
|
|
|
|
teacher_comment:list,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
loadingstate:true,
|
|
|
|
|
commentstate:asum,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(list.length===key){
|
|
|
|
|
this.seacthdata(undefined, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(undefined, task_status, course_group, cross_comment, search)
|
|
|
|
|
}else{
|
|
|
|
|
this.seacthdata(list[0], task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(list[0], task_status, course_group, cross_comment, search)
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
this.seacthdata(asum, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(asum, task_status, course_group, cross_comment, search)
|
|
|
|
|
// if(list.length===key){
|
|
|
|
|
// this.seacthdata(undefined, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
// this.props.getsonar(undefined, task_status, course_group, cross_comment, search)
|
|
|
|
|
// }else{
|
|
|
|
|
// this.seacthdata(list[0], task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
// this.props.getsonar(list[0], task_status, course_group, cross_comment, search)
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -261,14 +288,14 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
funcross_comment=(e)=>{
|
|
|
|
|
let {teacher_comment, task_status, course_group, order, b_order, search} = this.state;
|
|
|
|
|
let {teacher_comment, task_status, course_group, order, b_order, search,commentstate} = this.state;
|
|
|
|
|
|
|
|
|
|
this.setState({
|
|
|
|
|
cross_comment:e.target.value===undefined||e.target.value===false?null:e.target.value,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, search)
|
|
|
|
|
this.seacthdata(commentstate, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
inputSearchValue=(e)=>{
|
|
|
|
|
@ -288,24 +315,24 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
|
|
|
|
|
searchValue=()=>{
|
|
|
|
|
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order,search} = this.state;
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order,search,commentstate} = this.state;
|
|
|
|
|
this.setState({
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment, task_status, course_group, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, task_status, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate, task_status, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
funorder = (value, newb_order) => {
|
|
|
|
|
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, b_order, search,order} = this.state;
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, b_order, search,commentstate} = this.state;
|
|
|
|
|
this.setState({
|
|
|
|
|
order: value,
|
|
|
|
|
b_order: newb_order,
|
|
|
|
|
loadingstate: true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, course_group, cross_comment, value, newb_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment, task_status, course_group, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, task_status, course_group, cross_comment, value, newb_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate, task_status, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -313,7 +340,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
funtaskstatus=(checkedValues,key)=>{
|
|
|
|
|
// console.log(checkedValues)
|
|
|
|
|
|
|
|
|
|
let {teacher_comment, course_group, cross_comment, order, b_order, search} = this.state;
|
|
|
|
|
let {teacher_comment, course_group, cross_comment, order, b_order, search,commentstate} = this.state;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -325,8 +352,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
task_status:undefined,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, null, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment, null, course_group, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, null, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate, null, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
// else if(checkedValues.length ===key){
|
|
|
|
|
// // 全部抖选中 自然就是查找全部 就是空
|
|
|
|
|
@ -342,8 +369,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
task_status:checkedValues===key?null:checkedValues,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, checkedValues===key?undefined:checkedValues, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment, checkedValues===key?undefined:checkedValues, course_group, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, checkedValues===key?undefined:checkedValues, course_group, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate, checkedValues===key?undefined:checkedValues, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -352,7 +379,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
// console.log(checkedValues);
|
|
|
|
|
// console.log(key);
|
|
|
|
|
|
|
|
|
|
let {teacher_comment, task_status, cross_comment, order,b_order, search} = this.state;
|
|
|
|
|
let {teacher_comment, task_status, cross_comment, order,b_order, search,commentstate} = this.state;
|
|
|
|
|
|
|
|
|
|
if(JSON.stringify(checkedValues) === "[]"){
|
|
|
|
|
// console.log(checkedValues);
|
|
|
|
|
@ -361,8 +388,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
course_group:undefined,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, null, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment,task_status, null, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, task_status, null, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate,task_status, null, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
// else if(checkedValues.length ===key){
|
|
|
|
|
// // 全部抖选中 自然就是查找全部 就是空
|
|
|
|
|
@ -379,8 +406,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
course_group:checkedValues===key?null:checkedValues,
|
|
|
|
|
loadingstate:true
|
|
|
|
|
})
|
|
|
|
|
this.seacthdata(teacher_comment, task_status, checkedValues===key?undefined:checkedValues, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment,task_status, checkedValues===key?undefined:checkedValues, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate, task_status, checkedValues===key?undefined:checkedValues, cross_comment, order, b_order, search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate,task_status, checkedValues===key?undefined:checkedValues, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -561,7 +588,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
saveModulationModal=(value,num)=>{
|
|
|
|
|
let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state;
|
|
|
|
|
let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search,commentstate}=this.state;
|
|
|
|
|
|
|
|
|
|
let {operationId}=this.state;
|
|
|
|
|
// console.log(value,num)
|
|
|
|
|
@ -572,8 +599,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
}).then((result)=>{
|
|
|
|
|
// console.log(result)
|
|
|
|
|
if(result.data.status===0){
|
|
|
|
|
this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page);
|
|
|
|
|
this.props.getsonar(teacher_comment,task_status, course_group, cross_comment, search)
|
|
|
|
|
this.seacthdata(commentstate,task_status,course_group,cross_comment,order,b_order,search,this.state.page);
|
|
|
|
|
this.props.getsonar(commentstate,task_status, course_group, cross_comment, search)
|
|
|
|
|
this.props.showNotification(result.data.message);
|
|
|
|
|
this.cancelmodel();
|
|
|
|
|
this.setState({
|
|
|
|
|
@ -689,18 +716,18 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
this.setState({
|
|
|
|
|
page: pageNumber,
|
|
|
|
|
})
|
|
|
|
|
let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state;
|
|
|
|
|
this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber);
|
|
|
|
|
this.props.getsonar(teacher_comment,task_status, course_group, cross_comment, search)
|
|
|
|
|
let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search,commentstate}=this.state;
|
|
|
|
|
this.seacthdata(commentstate,task_status,course_group,cross_comment,order,b_order,search,pageNumber);
|
|
|
|
|
this.props.getsonar(commentstate,task_status, course_group, cross_comment, search)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// 确认是否下载
|
|
|
|
|
confirmysl(url){
|
|
|
|
|
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
|
|
|
|
|
let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,commentstate} =this.state;
|
|
|
|
|
|
|
|
|
|
let params ={
|
|
|
|
|
teacher_comment:teacher_comment,
|
|
|
|
|
teacher_comment:commentstate,
|
|
|
|
|
task_status:task_status,
|
|
|
|
|
course_group:course_group,
|
|
|
|
|
cross_comment:cross_comment,
|
|
|
|
|
@ -750,8 +777,8 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
}
|
|
|
|
|
render(){
|
|
|
|
|
|
|
|
|
|
let {coursename,coursesearch,taskname,taskid,taskslistdata,data,page,limit,teacher_comment,task_status,cross_comment,search,loadingstate,
|
|
|
|
|
order, course_group,Modalstype,Modalstopval,ModalCancel,ModalSave,modalname,Modulationtype,operationId,Allocationtype,visibles,
|
|
|
|
|
let { taskslistdata,data,page,limit,teacher_comment,task_status,cross_comment,search,loadingstate,
|
|
|
|
|
course_group,Modalstype,Modalstopval,ModalCancel,ModalSave,modalname,Modulationtype,Allocationtype,visibles,
|
|
|
|
|
visible,
|
|
|
|
|
Topval,
|
|
|
|
|
Topvalright,
|
|
|
|
|
@ -800,7 +827,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
className:'edu-txt-center',
|
|
|
|
|
render: (text, record) => (
|
|
|
|
|
<span>
|
|
|
|
|
<a style={{color:'#9A9A9A'}}>{record.classroom==="未分班"?"--":record.classroom}</a>
|
|
|
|
|
<a style={{color:'#9A9A9A'}} className={"classroomclass"} title={record.classroom==="未分班"?"":record.classroom}>{record.classroom==="未分班"?"--":record.classroom}</a>
|
|
|
|
|
</span>
|
|
|
|
|
),
|
|
|
|
|
}, {
|
|
|
|
|
@ -1348,7 +1375,7 @@ class GraduationTaskssettinglist extends Component{
|
|
|
|
|
<a id="graduation_comment_no_limit" alue={null} className={teacher_comment===null?"pl10 pr10 check_on":"pl10 pr10 "} onClick={this.funteachercomment}>全部</a>
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
|
|
<CheckboxGroup value={teacher_comment} onChange={(e)=>this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}>
|
|
|
|
|
<CheckboxGroup value={teacher_comment} onChange={(e)=>this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}>
|
|
|
|
|
{taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
|
|
|
|
|
return(
|
|
|
|
|
<span key={key}>
|
|
|
|
|
|
