From 0670a440c54a81fc259986fbada200e06980c04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 10:07:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 0ca2c8af8..0046afb19 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1006,6 +1006,7 @@ class Trainingjobsetting extends Component { this.state.latedeductiontwo=20; this.setState({ completionefficiencyscore: e.target.checked, + work_efficiencys:e.target.checked, latedeductiontwo: 20, }) //均分比例 @@ -1022,6 +1023,7 @@ class Trainingjobsetting extends Component { this.state.latedeductiontwo=0; this.setState({ completionefficiencyscore: e.target.checked, + work_efficiencys:e.target.checked, latedeductiontwo: 0, }) //均分比例 From 72e0efaf5a37235568be511566f309bdeaf338a8 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, 23 Sep 2019 10:12:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=91=E8=AF=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/paths/PathDetail/DetailTop.js | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index d42de474b..c6c2f1a75 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -626,30 +626,36 @@ class DetailTop extends Component{ border-radius: 4px; line-height: 46px !important; } - .lineHeight0{ - line-height: 0px; + .lineHeight1{ + line-height: 1px; } .font153{ font-size: 14px; font-weight: 400; color: rgba(153,153,153,1); - line-height: 14px; margin-left: 30px; } .absolutewidth{ position: absolute; - top: -21px; + top: 19px; right: 71px; } .relativewidth{ position: relative; width: 100%; } + .padding040{ + padding: 0 43px; + } + .mt26{ + margin-top:26px; + } + ` } - {this.props.courses===undefined||this.props.courses.length===0?"":
  • + {this.props.courses===undefined||this.props.courses.length===0?"":
  • {/* @@ -659,27 +665,32 @@ class DetailTop extends Component{ return(
    + {applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + this.props.detailInfoList&&this.props.detailInfoList.has_participate===false? + getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名: + 预约报名成功:""} + {/*{item.course_status.status===0?
    即将开课
    :""}*/} {item.course_status.status===1?
    {item.course_status.time}
    :""} {item.course_status.status===2&&item.course_identity<6?
    已结束
    :""} {/*
    已结束
    */} {item.course_status.status===0? - item.course_identity<5? + item.course_identity<5? 进入课堂 - :item.course_identity<6?
    报名成功
    - :this.JoinnowCourse(item.course_id)}>立即报名:""} + :item.course_identity<6?
    报名成功
    + :this.JoinnowCourse(item.course_id)}>立即报名:""} {item.course_status.status===1? - item.course_identity<5? + item.course_identity<5? 进入课堂 - :item.course_identity<6? + :item.course_identity<6? 立即学习 - :this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入:""} + :this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入:""} {item.course_status.status===2? - item.course_identity<6? + item.course_identity<6? 进入课堂 - :
    已结束
    :""} + :
    已结束
    :""}
    )})} @@ -687,15 +698,27 @@ class DetailTop extends Component{
    • } + + {applypath===false?"":this.state.MenuItemskey===this.props.courses.length?
    :""} - {applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + {applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true? + 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人 + 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课 + {/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/} + {/*getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名:*/} + {/*预约报名成功}*/} + + :""} + + {applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true? 当前预约报名人数：{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}人 当预约报名人数达到 {this.props.detailInfoList&&this.props.detailInfoList.student_count} 人时即将开课 {this.props.detailInfoList&&this.props.detailInfoList.has_participate===false? getappointmenttype===true?预约报名成功:this.putappointment()}>期待开课并预约报名: 预约报名成功} - :""} + :"":""} + } From 438eceed42f8580c24bb86ff422b406b8398cb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 23 Sep 2019 10:27:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- public/react/src/modules/user/usersInfo/InfosBanner.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 064a482c9..992c77fac 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -865,7 +865,7 @@ submittojoinclass=(value)=>{
  • 我的实训项目
  • 我的实践课程
  • 我的开发项目
    • -
  • 我的众包
    • + {/*
  • 我的众包
    • */}
  • 客户管理
    • diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js index 5e79a9b2b..23037f360 100644 --- a/public/react/src/modules/user/usersInfo/InfosBanner.js +++ b/public/react/src/modules/user/usersInfo/InfosBanner.js @@ -111,11 +111,11 @@ class InfosBanner extends Component{ onClick={() => this.setState({moduleName: 'projects'})} to={`/users/${username}/projects`}>开发项目 -
  • - this.setState({moduleName: 'package'})} - to={`/users/${username}/package`}>众包 -
    • + {/*
  • */} + {/* this.setState({moduleName: 'package'})}*/} + {/* to={`/users/${username}/package`}>众包*/} + {/*
    • */} {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) &&