From d89cb40a704b5fcb3d231794ceb898891efbe065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Mar 2020 17:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/new/CoursesNew.js | 2 +- .../react/src/modules/courses/new/Goldsubject.js | 2 +- .../courses/signin/component/Teacherentry.js | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 836ae3bb5..12f4341e0 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -933,7 +933,7 @@ class CoursesNew extends Component { > {getFieldDecorator("checkboxgroup", { initialValue: [ - "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video" + "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group","video","attendance" ], })( <Checkbox.Group style={{ marginTop: "10px"}}> diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js index fd82d0f12..3cd707284 100644 --- a/public/react/src/modules/courses/new/Goldsubject.js +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -989,7 +989,7 @@ class Goldsubject extends Component { {getFieldDecorator("checkboxgroup", { initialValue: [ - "announcement","online_learning","shixun_homework","common_homework", + "announcement","online_learning","shixun_homework","common_homework","attendance" ], })( <Checkbox.Group style={{ marginTop: "10px"}}> diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js index f3aa4c297..b8887c391 100644 --- a/public/react/src/modules/courses/signin/component/Teacherentry.js +++ b/public/react/src/modules/courses/signin/component/Teacherentry.js @@ -35,8 +35,8 @@ class Teacherentry extends Component { return ( <React.Fragment> <div className={index===0?"ws100s edu-back-white ": "ws100s edu-back-white mt20"}> - <div className="ws100s teacherentrydiv "> - <p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou":"ws100s teachedivp ymaxnamewidthdivp"} onClick={isAdmin?()=>this.props.qiandaoxiangq(true,item.id):""}> + <div className="ws100s teacherentrydiv" onClick={isAdmin?(e)=>{e.stopPropagation();this.props.qiandaoxiangq(true,item.id)}:""}> + <p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou color-blue":"ws100s teachedivp ymaxnamewidthdivp"} > { item.name } @@ -95,18 +95,18 @@ class Teacherentry extends Component { isAdmin === true ? this.props.defaultActiveKey === "1" ? <div className="ws100s xaxisreverseorder"> - <div className="jiezhis h40s xiaoshou" onClick={()=>this.props.thisEnd(item.id)}>截止</div> - <div className="shanchu h40s xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div> + <div className="jiezhis h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisEnd(item.id)}}>截止</div> + <div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div> </div> : item.edit_auth === true ? <div className="ws100s xaxisreverseorder"> - <div className="jiezhis h40s xiaoshou" onClick={()=>this.props.Signinnamestypes(item.id,true,item.name)}>编辑</div> - <div className="shanchu h40s xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div> + <div className="jiezhis h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signinnamestypes(item.id,true,item.name)}}>编辑</div> + <div className="shanchu h40s xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div> </div> : <div className="ws100s xaxisreverseorder"> - <div className="jiezhis h40s color-reds xiaoshou" onClick={()=>this.props.thisdelete(item.id)}>删除</div> + <div className="jiezhis h40s color-reds xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.thisdelete(item.id)}}>删除</div> </div> : ( @@ -116,7 +116,7 @@ class Teacherentry extends Component { item.attendance_status? ( item.attendance_status==="ABSENCE"? - <div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}> + <div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}> 签到 </div> :