From b32f6e3db0d5f1e9b01ef0218c30d93f9e4ebd20 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Tue, 3 Sep 2019 09:25:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/Index.js | 6 +- .../graduation/tasks/GraduationTaskDetail.js | 237 ++++++++++++++++++ .../tasks/GraduationTaskssetting.js | 93 +++---- .../shixunHomework/ShixunhomeWorkItem.js | 8 +- 4 files changed, 296 insertions(+), 48 deletions(-) create mode 100644 public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index 1b1c523c0..2da14c3fd 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -231,7 +231,7 @@ const GraduationTasksquestions= Loadable({ //毕设任务列表 const GraduationTaskssettinglist= Loadable({ - loader: () => import('./graduation/tasks/GraduationTaskssettinglist'), + loader: () => import('./graduation/tasks/GraduationTaskDetail'), loading: Loading, }) @@ -565,7 +565,7 @@ class CoursesIndex extends Component{ {/* 设置毕设任务 https://www.trustie.net/issues/19981 */} - () } @@ -575,7 +575,7 @@ class CoursesIndex extends Component{ () - }> + }> */} import('./GraduationTaskssettingquestions'), + loading: Loading, +}) +//毕设任务列表设置 +const GraduationTaskssetting=Loadable({ + loader: () => import('./GraduationTaskssetting'), + loading: Loading, +}) + +class GraduationTaskDetail extends Component{ + constructor(props){ + super(props); + this.state={ + modalname:undefined, + visible:false, + Topval:undefined, + starttime:undefined, + starttimes:undefined, + typs:undefined, + endtime:undefined, + Cancelname:undefined, + Savesname:undefined, + Cancel:undefined, + Saves:undefined, + Topvalright:undefined, + Botvalleft:undefined + } + } + componentDidMount =()=>{ + + } + + //返回 + goback=()=>{ + // let courseId=this.props.match.params.coursesId; + // let category_id=this.props.match.params.category_id; + // window.location.href="/courses/1309/graduation_tasks/"+category_id; + // let courseId = this.props.match.params.coursesId; + // if(courseId===undefined){ + // this.props.history.push("/courses"); + // }else{ + // this.props.history.push(this.props.current_user.first_category_url); + // } + + // this.props.history.goBack() + this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`); + } + //立即发布 + publish=()=>{ + let starttime= this.props.getNowFormatDates(1,1); + let endtime=this.props.getNowFormatDates(2,1); + // this.homeworkstart() + this.setState({ + modalname:"立即发布", + visible:true, + Topval:"学生将立即收到毕设任务", + // Botvalleft:"点击修改", + // Botval:`本操作只对"未发布"的分班有效`, + starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , + starttimes:this.props.getNowFormatDates(1), + typs:"start", + endtime:endtime, + Cancelname:"暂不发布", + Savesname:"立即发布", + Cancel:this.cancelmodel, + Saves:this.homepublish, + }) + } + // 立即截止 + end=()=>{ + // this.homeworkstart() + this.setState({ + modalname:"立即截止", + visible:true, + Topval:"学生将不能再提交作品", + // Botvalleft:"暂不截止", + // Botval:`本操作只对"提交中"的分班有效`, + Cancelname:"暂不截止", + Savesname:"立即截止", + Cancel:this.cancelmodel, + Saves:this.coursetaskend, + typs:"end", + }) + } + // 取消 + cancelmodel=()=>{ + this.setState({ + Modalstype:false, + Loadtype:false, + visible:false, + Modulationtype:false, + Allocationtype:false, + Modalstopval:"", + ModalCancel:"", + ModalSave:"", + }) + } + + + render(){ + return( +
+
+ this.getcourse_groupslist(id)} + /> + +

+ 计算机基础···· + > + 毕设任务 + > + 任务详情 +

+
+

+ 测试第一次设置发布时间时截止时间会联动，其它情况不联动 +

+ + 返回 +
+
+
+ + 任务列表 + 毕设描述 + 设置 + + {/*导出成绩*/} + {/*{this.props.isAdmin()?导出成绩:""}*/} + {/*{this.props.isAdmin()?导出作品附件:""}*/} + + + {this.props.isAdmin()?
  • + 导出 + +
    • :""} + + {/*项目在线质量检测*/} + {/* {this.props.isAdmin()?questionslist.status===1? { this.end()} }>立即截止:"":""} + {this.props.isAdmin()?questionslist.status===0? { this.publish()} }>立即发布:"":""} */} + { this.end()} }>立即截止 + { this.publish()} }>立即发布 + {this.props.isAdmin()?编辑任务:""} +
    +
    + + + () + } + > + + + () + }> + + +
    +
    + ) + } +} +// CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC)) +export default (GraduationTaskDetail) ; \ No newline at end of file diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 17317d6b2..20c9e93d2 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -50,6 +50,7 @@ class GraduationTaskssettingapp extends Component{ baseonproject:false, minnum:2, maxnum:5, + firstTimes:true, publish_time:null, end_time:null, allowlate:1, @@ -114,6 +115,7 @@ class GraduationTaskssettingapp extends Component{ max_nums: result.data.max_num, task_type: result.data.task_type, baseonproject: result.data.base_on_project, + firstTimes:!result.data.publish_time && !result.data.end_time, publish_time:result.data.publish_time===null||result.data.publish_time=== ""?"":moment(moment(handleDateString(result.data.publish_time))).format("YYYY-MM-DD HH:mm"), end_time:result.data.end_time===null||result.data.end_time=== ""?"":moment(moment(handleDateString(result.data.end_time))).format("YYYY-MM-DD HH:mm"), allowlate: result.data.allow_late, @@ -199,41 +201,43 @@ class GraduationTaskssettingapp extends Component{ maxnum:parseInt(e.target.value) }) } - } - - } onChangeTimepublish= (date, dateString) => { - - - let endtime; - if(date===null){ - this.setState({ - publish_time:null, - end_time:null, - latetime:null - }) - }else{ - - endtime= moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm") - let {allowlate}=this.state; - if(allowlate===true||allowlate===1){ - this.setState({ - publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), - end_time:endtime, - latetime:moment(moment(handleDateString(endtime))).add(1, 'months').format("YYYY-MM-DD HH:mm"), - }) - }else{ - this.setState({ - publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), - end_time:endtime - }) - } - } - + let endtime; + if(date===null){ + this.setState({ + publish_time:null, + end_time:null, + latetime:null + }) + }else{ + let { firstTimes } = this.state; + // 判断是否是第一次设置 + this.setState({ + publish_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), + publishTimetypes:false + }) + if(firstTimes){ + endtime= moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm") + let {allowlate}=this.state; + this.setState({ + firstTimes:undefined + }) + if(allowlate===true||allowlate===1){ + this.setState({ + end_time:endtime, + latetime:moment(moment(handleDateString(endtime))).add(1, 'months').format("YYYY-MM-DD HH:mm"), + }) + }else{ + this.setState({ + end_time:endtime + }) + } + } + } } @@ -245,21 +249,24 @@ class GraduationTaskssettingapp extends Component{ latetime:null }) }else{ - let {allowlate}=this.state; - if(allowlate===true||allowlate===1){ - this.setState({ - end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), - latetime:moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm"), - }) - }else{ + let { firstTimes } = this.state; + this.setState({ + end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), + endTimetypes:false + }) + // 判断是否是第一次设置 + if(firstTimes){ this.setState({ - end_time:moment(moment(handleDateString(dateString))).format("YYYY-MM-DD HH:mm"), + firstTimes:undefined }) + let {allowlate}=this.state; + if(allowlate===true||allowlate===1){ + this.setState({ + latetime:moment(moment(handleDateString(dateString))).add(1, 'months').format("YYYY-MM-DD HH:mm"), + }) + } } - } - - } onChangeTimelatetime=(date, dateString)=>{ @@ -1175,7 +1182,7 @@ class GraduationTaskssettingapp extends Component{ -
    +
    发布时间： @@ -1213,7 +1220,7 @@ class GraduationTaskssettingapp extends Component{ {this.state.publishTimetypesval}
    :""} -
    +
    截止时间： diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index c3170bf3a..96d06442e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -330,7 +330,7 @@ class ShixunhomeWorkItem extends Component{

    - + {/* {discussMessage.author.name} */} { discussMessage.author && {discussMessage.author} } {discussMessage.commit_count===undefined?"":{discussMessage.commit_count} 已交} @@ -357,6 +357,10 @@ class ShixunhomeWorkItem extends Component{ : {discussMessage.status_time} } + { + discussMessage.upper_category_name && {discussMessage.upper_category_name} + } + {/* { discussMessage.replies_count != 0 && {discussMessage.replies_count} 回复 } { discussMessage.praise_num != 0 && {discussMessage.praise_num} 点赞 } @@ -378,7 +382,7 @@ class ShixunhomeWorkItem extends Component{ ` } - {this.props.isAdmin?

    this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}> + {this.props.isAdmin?
    this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"46px","display":"block"}}> 实训详情 {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16"}>重命名:""} {/* 设置*/}