From 70913640b713905bcb23f41a969fbb9c3d6164df Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Mon, 9 Sep 2019 17:26:43 +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 | 2 +- .../courses/busyWork/CommonWorkPost.js | 1 - .../graduation/tasks/GraduateTaskItem.js | 2 +- .../graduation/tasks/GraduationTaskDetail.js | 15 +-- .../tasks/GraduationTasksSubmitedit.js | 9 +- .../tasks/GraduationTasksSubmitnew.js | 1 - .../tasks/GraduationTaskssetting.js | 8 +- .../tasks/GraduationTaskssettinglist.js | 2 + .../tasks/GraduationTaskssettingquestions.js | 101 ++---------------- .../courses/members/modal/AddTeacherModal.js | 9 +- 10 files changed, 39 insertions(+), 111 deletions(-) diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index de437bbe1..74e074d67 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -534,7 +534,7 @@ class CoursesIndex extends Component{ > {/* 修改作品 */} - () } diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index ed96914de..ce552fa50 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -131,7 +131,6 @@ class CommonWorkPost extends Component{ let coursesId=this.props.match.params.coursesId; window.location.href="courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; - // window.location.href="/courses/"+coursesId+"/graduation/graduation_tasks/"+workId+"/"+workId+"/works/edit"; } handleSubmit=(e) => { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index f3b98f927..671966c5d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -318,7 +318,7 @@ class GraduateTaskItem extends Component{ {item==="修改作品"? - 修改作品 + 修改作品 :""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index 2c74547af..ab5869a1e 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -255,6 +255,7 @@ class GraduationTaskDetail extends Component{ avisible:false }) } + bindRef = ref => { this.child = ref } ; render(){ @@ -391,17 +392,17 @@ class GraduationTaskDetail extends Component{ {this.props.isAdmin()?
  • 导出
    • :""} {questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{ return( - + {item==="提交作品"?提交作品:""} {item==="补交作品"?补交作品:""} - {item==="修改作品"?修改作品:""} - {item==="查看作品"?查看作品 :""} + {item==="修改作品"?修改作品:""} + {item==="查看作品"?查看作品 :""} {item==="创建项目"?创建项目:""} {item==="关联项目"?关联项目:""} {item==="取消关联"?取消关联:""} @@ -428,13 +429,13 @@ class GraduationTaskDetail extends Component{ () + (props) => () } > () + (props) => () }> diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 36ab0fbeb..7d2ec7173 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -496,7 +496,8 @@ class GraduationTasksSubmitedit extends Component{ Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist,shixunsreplace} =this.state; let courseId=this.props.match.params.coursesId; - let category_id=this.props.match.params.category_id; + let task_Id=this.props.match.params.coursesId; + // let category_id=this.props.match.params.category_id; let work_Id=this.props.match.params.work_Id const uploadProps = { width: 600, @@ -570,7 +571,7 @@ class GraduationTasksSubmitedit extends Component{ {/*>*/} 毕设任务 > - 任务详情 + 任务详情 > {/**/} {/*{workslist&&workslist.task_name}*/} @@ -580,7 +581,7 @@ class GraduationTasksSubmitedit extends Component{

    -

    {workslist&&workslist.task_name}

    +

    { workslist && workslist.task_name }

    返回
    @@ -768,7 +769,7 @@ class GraduationTasksSubmitedit extends Component{
    {item.user_name}
    {item.group_name}
    {item.student_id}
    -
    {item.commit_status===false?已提交 :""}
    +
    {item.commit_status===true?已提交 :""}
    ) })} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 4f9093709..be29d45a4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -81,7 +81,6 @@ class GraduationTasksSubmitnew extends Component{ let coursesId=this.props.match.params.coursesId; window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; - // window.location.href="/courses/"+coursesId+"/graduation/graduation_tasks/"+task_Id+"/"+workId+"/works/edit"; } handleSubmit=(e) => { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 95d7a64cd..5bf7830d4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -155,7 +155,11 @@ class GraduationTaskssettingapp extends Component{ let tab = this.props.tab; this.props.setTab && this.props.setTab(tab); - + try{ + this.props.triggerRef(this) + }catch(e){ + + } } @@ -846,6 +850,8 @@ class GraduationTaskssettingapp extends Component{ } /// 确认是否下载 confirmysl(url){ + debugger; + console.log(3); axios.get(url + '?export=true' ).then((response) => { if(response === undefined){ return diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 047946a6e..3733c2b51 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -646,6 +646,8 @@ class GraduationTaskssettinglist extends Component{ /// 确认是否下载 confirmysl(url){ + debugger; + console.log(1); let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state; let params ={ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 4df756d8c..ff455b59d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -35,7 +35,12 @@ class GraduationTasksquestions extends Component{ let tab = this.props.tab; this.props.setTab && this.props.setTab(tab); - this.getdatas() + this.getdatas(); + try{ + this.props.triggerRef(this) + }catch(e){ + + } } getdatas=()=>{ const task_Id = this.props.match.params.task_Id; @@ -204,6 +209,8 @@ class GraduationTasksquestions extends Component{ /// 确认是否下载 confirmysl(url){ + debugger; + console.log(2); axios.get(url + '?export=true').then((response) => { if(response === undefined){ return @@ -299,82 +306,6 @@ class GraduationTasksquestions extends Component{ /> {questionslist&&questionslist?
    - - {/*

    - {questionslist.course_name} - > - {questionslist.graduation_name} - > - 任务详情 -

    - -
    -

    - {questionslist.task_name} -

    - - 返回 -
    */} - - - {/*
    -
    */} - - {/* 任务列表 - 毕设描述 - 设置 */} - - {/*导出成绩*/} - {/*{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.props.isAdmin()?编辑任务:""} -
    -
    */} - - -

    @@ -390,22 +321,6 @@ class GraduationTasksquestions extends Component{ }

    - {/*{questionslist&&questionslist.attachments.map((item,key)=>{*/} - {/*return(*/} - {/*
    */} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.title}*/} - {/**/} - {/*{item.filesize}*/} - - {/*
    */} - {/*)*/} - - {/*})}*/}
    diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js index b397f7838..dbcd587eb 100644 --- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js +++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js @@ -109,6 +109,11 @@ class AddTeacherModal extends Component{ checkBoxValues: [] }) } + this.setState({ + name:undefined, + graduationGroup:undefined, + courseGroup:undefined + }) } onSendOk = () => { @@ -281,7 +286,7 @@ class AddTeacherModal extends Component{ { candidates && candidates.map( candidate => { return (

    - + {/* "color":"#4c4c4c" */} 12 }> @@ -299,7 +304,7 @@ class AddTeacherModal extends Component{ - +

    )