From d56850e32ce5618320fec2f90d47ca13584f5dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 12 Oct 2019 16:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 1046 ++++++++--------- 1 file changed, 523 insertions(+), 523 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 857b5c244..46e90befb 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -31,7 +31,7 @@ import TraineetraininginformationModal from "./TraineetraininginformationModal"; import DownloadMessageysl from '../../modals/DownloadMessageysl'; import Startshixuntask from "../coursesPublic/Startshixuntask"; import ModulationModal from "../coursesPublic/ModulationModal"; -import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal"; +import HomeworkModal from "../coursesPublic/HomeworkModal"; import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal"; import NoneData from '../../../modules/courses/coursesPublic/NoneData'; @@ -210,13 +210,13 @@ class Listofworksstudentone extends Component { title={record.stduynumber} className="maxnamewidth145" style={{ - color:'#9A9A9A', + color:'#9A9A9A', textAlign: "center", width:'145px', - }}>{ + }}>{ record.stduynumber } - + } @@ -327,11 +327,11 @@ class Listofworksstudentone extends Component { // className:'font-14', // render: (text, record) => ( // - // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime} - // + // // ), // }, { @@ -451,8 +451,8 @@ class Listofworksstudentone extends Component { record.submitstate === "未提交" ?-- : this.Viewstudenttraininginformation(record)}>{record.operating} + className="color-blue" + onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating} } @@ -953,15 +953,15 @@ class Listofworksstudentone extends Component { } - // {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } - // + // {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time } + // ) }, @@ -1268,14 +1268,14 @@ class Listofworksstudentone extends Component { 学员在EduCoder做实训花费的时间 }> - {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} - + >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time} + } @@ -1535,7 +1535,7 @@ class Listofworksstudentone extends Component { // console.log("获取作品列表"); // console.log("935"); // debugger - let searchtype=this.props.history.location.search; + let searchtype=this.props.history.location.search; let urll = `/homework_commons/${homeworkid}/works_list.json`; var datasysl = { search: this.state.searchtext, @@ -1589,12 +1589,12 @@ class Listofworksstudentone extends Component { if(result.data.update_score===true){ if(bool===true){ if(searchtype==="?tab=0"){ - try { - this.props.yslslowCheckresults(); - }catch (e) { + try { + this.props.yslslowCheckresults(); + }catch (e) { - } - this.setComputeTimet(); + } + this.setComputeTimet(); } } } @@ -2445,7 +2445,7 @@ class Listofworksstudentone extends Component { if(item.title==="效率分"){ continue }else { - columns2js.push(item); + columns2js.push(item); } } } @@ -2479,7 +2479,7 @@ class Listofworksstudentone extends Component { if(item.title==="分班"){ continue }else{ - columns2js.push(item); + columns2js.push(item); } } } @@ -2794,11 +2794,11 @@ class Listofworksstudentone extends Component { this.setState({ modalname: "立即发布", modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, - OneSelftype: true, + svisible: true, Topval:"学生将立即收到作业", // Botvalleft:"暂不发布", - Botval:``, - starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), + Botval:`本操作只对"未发布"的分班有效`, + starttime: "发布时间:" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), endtime: "截止时间:" + endtime, starttimes:starttime, typs:"start", @@ -2828,7 +2828,7 @@ class Listofworksstudentone extends Component { this.setState({ modalname: "立即截止", modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1, - OneSelftype: true, + svisible: true, Topval:"学生将不能再提交作业", // Botvalleft:"暂不截止", Botval:`本操作只对"提交中"的分班有效`, @@ -2931,7 +2931,7 @@ class Listofworksstudentone extends Component { this.setState({ modalname: undefined, modaltype: undefined, - OneSelftype: false, + svisible: false, Topval: undefined, Topvalright: undefined, Botvalleft: undefined, @@ -2985,31 +2985,31 @@ class Listofworksstudentone extends Component { let url = "/homework_commons/"+homeworkid+"/update_score.json"; axios.get(url).then((response) => { - if(response){ - if(response.data.status===0){ - // if(response.data.message!==undefined){ - // return; - // } + if(response){ + if(response.data.status===0){ + // if(response.data.message!==undefined){ + // return; + // } setTimeout(()=>{ this.setState({ loadingstate: true }) this.Getalistofworks(homeworkid,false); - try { - this.props.showNotification(`${response.data.message}`); - }catch (e) { + try { + this.props.showNotification(`${response.data.message}`); + }catch (e) { - } - try{ - this.props.yslslowCheckresultsNo(); - }catch (e) { + } + try{ + this.props.yslslowCheckresultsNo(); + }catch (e) { - } + } }, 2500); } - // this.props.history.replace( matchurl ); - } + // this.props.history.replace( matchurl ); + } }).catch((error) => { console.log(error) }); @@ -3038,8 +3038,8 @@ class Listofworksstudentone extends Component { // } daochushixunbaogao=()=>{ - let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? "": this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? "":this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?"":this.state.searchtext}` - this.confirmysl(url); + let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}&work_status=${this.state.course_groupyslstwo===undefined ||this.state.course_groupyslstwo===null? "": this.state.course_groupyslstwo}&course_group=${this.state.checkedValuesineinfo===undefined||this.state.checkedValuesineinfo===null? "":this.state.checkedValuesineinfo}&search=${this.state.searchtext===undefined||this.state.searchtext===null?"":this.state.searchtext}` + this.confirmysl(url); } daochuzuoye =() =>{ @@ -3092,105 +3092,105 @@ class Listofworksstudentone extends Component { let {columns,course_groupysls,datajs,isAdmin,homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state; const antIcon = ; - let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; - // console.log("Listofworksstudentone.js"); - // console.log(orders); + let course_is_end = this.props.current_user&&this.props.current_user.course_is_end; + // console.log("Listofworksstudentone.js"); + // console.log(orders); return ( this.props.isAdmin() === true ? -
- {visible === true ? this.saveModulationModal(value, num)} - /> : ""} - - {this.state.showmodel === true ? this.hideshowmodel()} - updatas={() => this.isupdatas()} - /> : ""} - - - {visibles === true ? -
- - this.cancelModulationModels()} - /> - -
- : "" - } - - {/*立即发布*/} - this.getcourse_groupslist(id)} - starttimes={this.state.starttimes} - typs={this.state.typs} - /> - { - homework_status&&homework_status.length===0? -
- -
- : - homework_status&&homework_status.length>0 && homework_status[0]==="未发布"? -
- -
- : -
- - -
- - - + this.cancelModulationModels()} + /> + +
+ : "" + } + + {/*立即发布*/} + this.getcourse_groupslist(id)} + starttimes={this.state.starttimes} + typs={this.state.typs} + /> + { + homework_status&&homework_status.length===0? +
+ +
+ : + homework_status&&homework_status.length>0 && homework_status[0]==="未发布"? +
+ +
+ : +
+ + +
+ + + - {computeTimetype===false?
  • - - + + {computeTimetype===false?
  • + + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异 -
  • :""} - - {/*作品状态GraduationTaskssettinglist*/} -
      -
    • - {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} - - - -
    • - -
    • -
      - {/*{course_is_end===true?"":*/} - {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/} - {/* (this.props.isNotMember()===false?
      */} - {/* 查看最新成绩*/} - {/*
      :""):*/} - {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} - {/* (this.props.isNotMember()===false?
      */} - {/* 查看最新成绩*/} - {/*
      :"")*/} - {/*}*/} - {/*
      }*/} - +
    • :""} + + {/*作品状态GraduationTaskssettinglist*/} +
        +
      • + {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} + + + +
      • + +
      • +
        + {/*{course_is_end===true?"":*/} + {/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/} + {/* (this.props.isNotMember()===false?
        */} + {/* 查看最新成绩*/} + {/*
        :""):*/} + {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* (this.props.isNotMember()===false?
        */} + {/* 查看最新成绩*/} + {/*
        :"")*/} + {/*}*/} + {/*
        }*/} + -
        - 作品状态: - this.notlimiteds()}>不限 - this.funtaskstatust(e, task_status && task_status)} - style={{paddingTop: '4px'}}> - - {task_status === undefined ? "" : task_status.map((item, key) => { - return ( - +
    + 作品状态: + this.notlimiteds()}>不限 + this.funtaskstatust(e, task_status && task_status)} + style={{paddingTop: '4px'}}> + + {task_status === undefined ? "" : task_status.map((item, key) => { + return ( + {item.name} @@ -3297,97 +3297,97 @@ class Listofworksstudentone extends Component { - ) - })} - - {/*请输入姓名或学号搜索*/} - - - - - - {/*分班情况*/} - -
  • - {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : -
    - 分班情况: - this.notlimitedst()}>不限 - this.funtaskstatustwot(e, course_group_info && course_group_info)} - style={{paddingTop: '4px',width:'1017px'}}> - {course_group_info === undefined ? "" : - course_group_info.map((item, key) => { - return ( - + ) + })} + + {/*请输入姓名或学号搜索*/} + + +
  • + + + {/*分班情况*/} + +
  • + {JSON.stringify(course_group_info) === "[]" ? "" : course_group_info === undefined ? "" : course_group_info.length < 2 ? "" : +
    + 分班情况: + this.notlimitedst()}>不限 + this.funtaskstatustwot(e, course_group_info && course_group_info)} + style={{paddingTop: '4px',width:'1017px'}}> + {course_group_info === undefined ? "" : + course_group_info.map((item, key) => { + return ( + {item.group_group_name} ({item.count}) - ) - }) - } - -
    } -
  • + ) + }) + } + +
    } + - + -
    + + { + JSON.stringify(datajs) === "[]" ? + +
    +
    +
    + +

    暂时还没有相关数据哦!

    +
    +
    + +
    + : + +
    + -
    - {datajs === undefined ? "" : } - - - } - - - - { - teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
    - -
    - : "" - } - - } - - : +
    + {datajs === undefined ? "" :
    } + + + } -
    + +
    { - teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ? - // 学生不能查看别人的 -
    - - {visibles === true ? -
    - - + {visibles === true ? +
    + + - this.cancelModulationModels()} - /> -
    - : "" - } + } + + this.cancelModulationModels()} + /> +
    + : "" + } - { - homework_status&&homework_status.length&&homework_status.length===0? -
    - -
    - : - homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"? -
    - -
    - : + { + homework_status&&homework_status.length&&homework_status.length===0? +
    + +
    + : + homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"? +
    + +
    + : -
    -
    +
    +
    - - {computeTimetype===false?
  • - - + + {computeTimetype===false?
  • + + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异 -
  • :""} + :""} - {JSON.stringify(data) !== "[]" ? -
    -
    + {JSON.stringify(data) !== "[]" ? +
    +
    -
    +
    -
    - - {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} - {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":*/} - {/* {computeTimetype===true?*/} - {/* (this.props.isNotMember()===false?*/} - {/* (*/} - {/* teacherdata&&teacherdata.update_score===true?*/} - {/*
    */} - {/* 查看最新成绩*/} - {/*
    */} - {/* :""*/} - {/* )*/} - {/* :"")*/} - {/* :*/} - {/* (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} - {/* this.props.isNotMember()===false?*/} - {/*
    */} - {/* 查看最新成绩*/} - {/*
    */} - {/* :"")*/} - {/* }*/} - {/*
    }*/} - -
    +
    + + {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} + {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":*/} + {/* {computeTimetype===true?*/} + {/* (this.props.isNotMember()===false?*/} + {/* (*/} + {/* teacherdata&&teacherdata.update_score===true?*/} + {/*
    */} + {/* 查看最新成绩*/} + {/*
    */} + {/* :""*/} + {/* )*/} + {/* :"")*/} + {/* :*/} + {/* (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* this.props.isNotMember()===false?*/} + {/*
    */} + {/* 查看最新成绩*/} + {/*
    */} + {/* :"")*/} + {/* }*/} + {/*
    }*/}
    -
    - -
    - {data === undefined ? "" :
    } - +
    + {data === undefined ? "" :
    } + - : -
    -
    -
    - -

    暂时还没有相关数据哦!

    -
    + : +
    +
    +
    + +

    暂时还没有相关数据哦!

    -
    - } -
    +
    + }
    - } + - : - // 学生能查看别人的 -
    - {/*双层*/} - - - {visibles === true ? - this.cancelModulationModels()} - /> : "" - } + } +
    + : + // 学生能查看别人的 +
    + {/*双层*/} + + + {visibles === true ? + this.cancelModulationModels()} + /> : "" + } - { - homework_status&&homework_status.length===0? -
    - -
    - : - homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"? -
    - -
    - : -
    + { + homework_status&&homework_status.length===0? +
    + +
    + : + homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"? +
    + +
    + : +
    -
    - + - {computeTimetype===false?
  • - - + {computeTimetype===false?
  • + + 正在执行成绩计算,完成后将为您自动刷新结果。温馨提示:执行时间因作品数量而异 -
  • :""} + :""} - -
    - {data === undefined ? "" :
    } - - {JSON.stringify(datas) !== "[]" ? -
    -
    +
    + {data === undefined ? "" :
    } + + {JSON.stringify(datas) !== "[]" ? +
    +
    +
    -
    {teacherdata === undefined ? "0" : teacherdata.commit_count === undefined ? "0" : teacherdata.commit_count} @@ -3761,8 +3761,8 @@ class Listofworksstudentone extends Component { style={{color: '#FF6800'}}>{teacherdata.left_time.time}} - -
    - - {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} - {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":*/} - {/* {computeTimetype===true?*/} - - {/* (this.props.isNotMember()===false?*/} - {/* (*/} - {/* teacherdata&&teacherdata.update_score===true?*/} - {/*
    */} - {/* 查看最新成绩*/} - {/*
    :""*/} - {/* )*/} - {/* :""):*/} - {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} - {/* (this.props.isNotMember()===false?
    */} - {/* 查看最新成绩*/} - {/*
    :"")*/} - {/* }*/} - {/*
    }*/} -
    + +
    + + {/*计算成绩时间:{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}*/} + {/* { course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":*/} + {/* {computeTimetype===true?*/} + + {/* (this.props.isNotMember()===false?*/} + {/* (*/} + {/* teacherdata&&teacherdata.update_score===true?*/} + {/*
    */} + {/* 查看最新成绩*/} + {/*
    :""*/} + {/* )*/} + {/* :""):*/} + {/* teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":*/} + {/* (this.props.isNotMember()===false?
    */} + {/* 查看最新成绩*/} + {/*
    :"")*/} + {/* }*/} + {/*
    }*/}
    -
    - -
    - {datas === undefined ? "" :
    } - +
    + {datas === undefined ? "" :
    } - { - teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
    - -
    - : "" - } - : -
    -
    -
    - -

    暂时还没有相关数据哦!

    + { + teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? +
    +
    + : "" + } +
    + : +
    +
    +
    + +

    暂时还没有相关数据哦!

    - } -
    +
    + }
    - } + } + }