From 216b95a3f8de348d2dfeebe954fbe5031d4ebbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 8 Jan 2020 18:08:52 +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 --- .../modules/courses/boards/BoardsListItem.js | 18 ++++++---- .../courses/busyWork/CommonWorkItem.js | 8 +++-- .../courses/coursesDetail/CoursesLeftNav.js | 2 +- .../tasks/GraduationTaskssettinglist.js | 8 ++--- .../graduation/topics/GraduateTopicItem.js | 4 +-- .../shixunHomework/ShixunhomeWorkItem.js | 33 ++++++++++++------- 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js index db58fb998..78f3aec38 100644 --- a/public/react/src/modules/courses/boards/BoardsListItem.js +++ b/public/react/src/modules/courses/boards/BoardsListItem.js @@ -75,17 +75,21 @@ class BoardsListItem extends Component{ ) : "" } - {canNotLink?"": {} : () => this.onTitleClick(discussMessage)}>查看详情} +
- {(isAdmin || discussMessage.author.login == current_user.login) && - { this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} }>编辑 } - { isAdmin && { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();}}> - { discussMessage.sticky ? '取消置顶' : '置顶' } } + {(isAdmin || discussMessage.author.login == current_user.login) && + { this.props.toEditPage(this.props.match.params.coursesId, this.props.match.params.boardId, discussMessage.id )} }>编辑 } + + { isAdmin && { debugger; onSticky(discussMessage); e.cancelBubble = true; e.stopPropagation();}}> + { discussMessage.sticky ? '取消置顶' : '置顶' } } + + {canNotLink?"": {} : () => this.onTitleClick(discussMessage)}>查看详情} +
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 10321142b..21c396fe6 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -227,6 +227,10 @@ class CommonWorkItem extends Component{ // isStudent &&
  • + {} : () => this.onItemClick(item)} + >查看详情 + { // item.work_status && item.work_status.indexOf('关联项目') != -1 && @@ -277,9 +281,7 @@ class CommonWorkItem extends Component{ item.work_status && item.work_status.indexOf('查看作品') != -1 && this.props.toWorkDetailPage(this.props.match.params, item.homework_id, item.work_id)}>查看作品 } - {} : () => this.onItemClick(item)} - >查看详情 +
    • }

    diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index adb6518ff..16e8a1576 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -531,7 +531,7 @@ class Coursesleftnav extends Component{ if(result!=undefined){ if(result.data.status===0){ // window.location.reload() - this.updasaveNavmoda() + // this.updasaveNavmoda() // notification.open({ message:"提示", diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 62d0bbef2..9fa993ea6 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -257,10 +257,10 @@ class GraduationTaskssettinglist extends Component{ } - - this.seacthdata(list.length===0?undefined:list[0], task_status, course_group, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(list.length===0?undefined:list[0], task_status, course_group, cross_comment, search) - // if(list.length===key){ + let newvalue=list.length===0?undefined:parseInt(list[0]) + this.seacthdata(newvalue, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + this.props.getsonar(newvalue, 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{ diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js index b75598636..524e7d208 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js @@ -134,13 +134,13 @@ class GraduateTopicItem extends Component{ } { isStudent && data.user_selected == true && discussMessage.user_topic_status==0 && - chooseTopic(`${discussMessage.id}`,index,true)} style="blue" className="font-16"> + chooseTopic(`${discussMessage.id}`,index,true)} style="blue" className="font-16 mr20"> 取消选题 } { isStudent && data.user_selected==false && (discussMessage.user_topic_status == null || discussMessage.user_topic_status == 2) && - chooseTopic(`${discussMessage.id}`,index,false)} style="blue" className="font-16"> + chooseTopic(`${discussMessage.id}`,index,false)} style="blue" className="font-16 mr20"> 选题 } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 88e60a98f..19ad9d5cf 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -357,7 +357,7 @@ class ShixunhomeWorkItem extends Component{ color:#fff !important; } .newhomepagePostSettingname{ - width: 274px !important; + width: 205px !important; } .newwidthSettin{ width:255px !important; @@ -365,16 +365,22 @@ class ShixunhomeWorkItem extends Component{ ` } - {this.props.isAdmin?this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?"homepagePostSetting newhomepagePostSettingname":"homepagePostSetting homepagePostSettingbox":"homepagePostSetting newwidthSettin"} style={{"right":"-2px","top":"6px","display":"block"}}> - {discussMessage&&discussMessage.shixun_status>1?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情:""} + + + {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/} + + + + + {this.props.isAdmin?this.stopPro(event)} className={discussMessage&&discussMessage.shixun_status>1?this.props.isAdminOrCreator()?" newhomepagePostSettingname fr":" homepagePostSettingbox fr":" newwidthSettin fr"} style={{"right":"-2px","top":"6px","display":"block"}}> {discussMessage&&discussMessage.shixun_status>1?实训详情: - 实训详情 + 实训详情 } - {discussMessage&&discussMessage.shixun_status>1?"":this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20">查看详情} - {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue font-16 fontweight400"}>重命名:""} + + {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue font-16 fontweight400 "}>重命名:""} {/* 设置*/} - 设置 + 设置 :""} @@ -393,13 +399,18 @@ class ShixunhomeWorkItem extends Component{ :"":"":"":"" } + { this.props.isAdmin?this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">查看详情:""} + + { + this.props.isStudent? this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr mt2">查看详情:"" + } - {this.props.isStudent===true?this.props.course_identity===5? - this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} - className="btn colorblue colorblue font-16 mr20 fr mt2">查看详情 - :"":"" + { + this.props.isNotMember===true? this.props.discussMessage.private_icon===true?"" + :this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} className="btn colorblue font-16 fontweight400 mr20 fr">查看详情:"" } +