From 541ec0340a487a25012e192a3d7cacb54455905f Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Tue, 3 Sep 2019 10:53:31 +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 | 3 +- .../graduation/tasks/GraduationTaskDetail.js | 127 ++++++++++++++---- .../tasks/GraduationTaskssetting.js | 28 ++-- .../tasks/GraduationTaskssettinglist.js | 97 +------------ .../tasks/GraduationTaskssettingquestions.js | 20 +-- 5 files changed, 128 insertions(+), 147 deletions(-) diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index 2da14c3fd..c6f424303 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -578,14 +578,13 @@ class CoursesIndex extends Component{ }> */} - () } > - {/* 修改毕设任务 https://www.trustie.net/issues/19981 */} import('./GraduationTaskssettingquestions'), loading: Loading, }) -//毕设任务列表设置 +//毕设任务设置 const GraduationTaskssetting=Loadable({ loader: () => import('./GraduationTaskssetting'), loading: Loading, }) +//毕设任务列表 +const GraduationTaskslist=Loadable({ + loader: () => import('./GraduationTaskssettinglist'), + loading: Loading, +}) class GraduationTaskDetail extends Component{ constructor(props){ @@ -44,18 +49,36 @@ class GraduationTaskDetail extends Component{ Cancel:undefined, Saves:undefined, Topvalright:undefined, - Botvalleft:undefined + Botvalleft:undefined, + course_groupslist:undefined, + course_groups:undefined, + questionslist:undefined } } - componentDidMount =()=>{ - - } + componentDidMount(){ + this.getdatas() + } + getdatas=()=>{ + const task_Id = this.props.match.params.task_Id; + let url="/graduation_tasks/"+task_Id+".json"; + + axios.get(url).then((result)=>{ + if(result.status===200){ + this.setState({ + questionslist:result.data + }) + + } + }).catch((error)=>{ + console.log(error) + }) + } //返回 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; + // window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; // let courseId = this.props.match.params.coursesId; // if(courseId===undefined){ // this.props.history.push("/courses"); @@ -87,6 +110,36 @@ class GraduationTaskDetail extends Component{ Saves:this.homepublish, }) } + // 确定立即发布 + homepublish=(ids,endtime)=>{ + this.cancelmodel(); + let task_Id=this.props.match.params.task_Id; + const cid = this.props.match.params.coursesId; + // let url = `/courses/${cid}/graduation_tasks/publish_task.json`; + + let url="/courses/"+cid+"/graduation_tasks/publish_task.json" + axios.post(url,{ + task_ids:[task_Id], + group_ids: this.state.course_groupslist, + end_time:endtime, + }).then((response)=>{ + if (response.data.status == 0) { + this.getdatas() + this.props.showNotification(response.data.message); + this.searchValue(); + + this.setState({ + // Modalstopval:response.data.message, + // ModalSave:this.cancelmodel, + // Loadtype:true, + course_groupslist:[], + checkAllValue:false + }) + } + }).catch((error)=>{ + + }) + } // 立即截止 end=()=>{ // this.homeworkstart() @@ -117,11 +170,25 @@ class GraduationTaskDetail extends Component{ }) } + getcourse_groupslist=(id)=>{ + this.setState({ + course_groupslist:id + }) + } + render(){ + + let courseId=this.props.match.params.coursesId; + let category_id=this.props.match.params.category_id; + let task_Id=this.props.match.params.task_Id; + let { tab } = this.props; + let { questionslist } = this.state return(
-
+ { + questionslist && +

- 计算机基础···· + {questionslist.course_name} > - 毕设任务 + {questionslist.graduation_name} > 任务详情

- 测试第一次设置发布时间时截止时间会联动，其它情况不联动 + {questionslist.task_name}

返回
- 任务列表 - 毕设描述 - 设置 + 任务列表 + 毕设描述 + 设置 {/*导出成绩*/} {/*{this.props.isAdmin()?导出成绩:""}*/} @@ -200,35 +267,41 @@ class GraduationTaskDetail extends Component{ {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()?编辑任务:""} + { this.props.isAdmin() ? questionslist.status===1 ? { this.end()} }>立即截止 : "" : "" } + { this.props.isAdmin() ? questionslist.status===0 ? { this.publish()} }>立即发布 : "" : "" } + + { this.props.isAdmin() ? 编辑任务 : "" }
    - () + (props) => () } > + () + } + > - () + (props) => () }>
    + } +
    ) } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 20c9e93d2..ffd9f57e6 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -1064,11 +1064,11 @@ class GraduationTaskssettingapp extends Component{
    -

    + {/*

    {coursename} > 毕设任务 - > + > */} {/*{taskname===""?"":*/} {/**/} @@ -1077,10 +1077,10 @@ class GraduationTaskssettingapp extends Component{ {/**/} {/*}*/} - 任务详情 -

    + {/* 任务详情 +

    */} -
    + {/*

    {taskname}

    @@ -1088,20 +1088,20 @@ class GraduationTaskssettingapp extends Component{ typelist={task_status} /> 返回 -
    +
    */} -
    -
    + {/*
    +
    */} - 任务列表 + {/* 任务列表 毕设描述 设置 + to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置 */} {/*导出*/} - - {this.props.isAdmin()?
  • - 导出 - -
    • :""} - - {/*项目在线质量检测*/} - {taskslistdata.status===1? { this.end()} }>立即截止:""} - {taskslistdata.status===0? { this.publish()} }>立即发布:""} - 编辑任务 - -
    -
    - - - + this.props.isAdmin()?
    -
    - {/*提示*/} - {/**/} -
    • @@ -1384,11 +1297,7 @@ class GraduationTaskssettinglist extends Component{
    : "" } -
    - - -
    -
    : +
    : // 学生列表 this.props.isStudent()||this.props.isNotMember()?
    diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index c40c9aa54..6751837df 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -307,7 +307,7 @@ class GraduationTasksquestions extends Component{ {questionslist&&questionslist?
    -

    + {/*

    {questionslist.course_name} > {questionslist.graduation_name} @@ -323,22 +323,22 @@ class GraduationTasksquestions extends Component{ typelist={questionslist.task_status} /> 返回 -

    +
    */} -
    -
    + {/*
    +
    */} - 任务列表 + {/* 任务列表 毕设描述 设置 + to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置 */} {/*导出成绩*/} {/*{this.props.isAdmin()?导出成绩:""}*/} {/*{this.props.isAdmin()?导出作品附件:""}*/} -