diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index a09db6308..94ced56fd 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -532,7 +532,7 @@ class HomeworkCommonsController < ApplicationController # 如果该发布规则 没有已发布的分班则需判断发布时间 tip_exception("发布时间不能早于等于当前时间") if setting[:publish_time] <= strf_time(Time.now) && group_settings.group_published.count == 0 - tip_exception("截止时间不能早于等于当前时间") if setting[:end_time] <= strf_time(Time.now) + tip_exception("截止时间不能早于等于当前时间") if setting[:end_time] <= strf_time(Time.now) && group_settings.none_end.count > 0 tip_exception("截止时间不能早于发布时间") if setting[:publish_time] > setting[:end_time] tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && setting[:end_time] > strf_time(@course.end_date.end_of_day) diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index d17837411..ea98747cc 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -174,7 +174,7 @@ class CCommentItem extends Component{ //
{item.content} {item.user_info.user_name}
// src={getImageUrl(`images/${item.image_url}`)} - const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url; + const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `edu_user/anony.png` : item.user_info.user_image_url; return (
diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js index 2190ac001..c7333824d 100644 --- a/public/react/src/modules/courses/exercise/Exercisesetting.js +++ b/public/react/src/modules/courses/exercise/Exercisesetting.js @@ -713,6 +713,7 @@ class Exercisesetting extends Component{ course_group={course_group} flagPageEdit={flagPageEdit} rulesCheckInfo={(info)=>this.rulesCheckInfo(info)} + Commonheadofthetestpaper > }
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index 1398e18c1..c848e8bb0 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -475,7 +475,7 @@ class Testpapersettinghomepage extends Component{ } { - parseInt(tab[0])==3 ? :"" + parseInt(tab[0])==3 ? :"" }
@@ -483,4 +483,4 @@ class Testpapersettinghomepage extends Component{ } } -export default Testpapersettinghomepage; \ No newline at end of file +export default Testpapersettinghomepage; diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js index df3b06f99..90ec27cce 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js +++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js @@ -478,7 +478,24 @@ class PollDetailTabForthRules extends Component{ {rule.p_timeflag===undefined?r > 0&&rule.publish_time===null? this.removeRules(`${r}`)}> - :"": + :( + this.props.Commonheadofthetestpaper? + (this.props.Commonheadofthetestpaper.exercise_status===1&&r > 0? + + this.removeRules(`${r}`)}> + + :"") + :this.props.teacherdatapage? + ( + this.props.teacherdatapage.homework_status[0]==="未发布"&&r > 0? + + this.removeRules(`${r}`)}> + + :"" + ): + + "" + ): r > 0 && rule.p_timeflag == false ? this.removeRules(`${r}`)}> diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index d8440ed45..5073a6e9c 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -354,7 +354,7 @@ class ShixunHomeworkPage extends Component { {parseInt(tab) === 0 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""} {parseInt(tab) === 1 ? this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}>:""} {parseInt(tab) === 2 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""} - {parseInt(tab) === 3 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""} + {parseInt(tab) === 3 ? this.Getdataback(jobsettingsdata, teacherdata)}>:""} diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 1c218b734..0a76ae339 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -2503,6 +2503,7 @@ class Trainingjobsetting extends Component { + this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?
@@ -129,8 +129,8 @@ class SiderBar extends Component {
-
- ); + :"" + ); } } diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 7b665ba0a..ef54b0ada 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -677,7 +677,10 @@ export function TPMIndexHOC(WrappedComponent) { {...this.state} {...this.dialogObj} />:""} - + {/* 注释掉了1440 影响到了手机屏幕的展示 */}