diff --git a/app/controllers/exercise_answers_controller.rb b/app/controllers/exercise_answers_controller.rb
index 3fc27c8f2..e5d67b2d7 100644
--- a/app/controllers/exercise_answers_controller.rb
+++ b/app/controllers/exercise_answers_controller.rb
@@ -110,7 +110,7 @@ class ExerciseAnswersController < ApplicationController
elsif @exercise_user.commit_status == 1
normal_status(-1,"已提交/已结束的试卷不允许修改！")
else
- if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + (@exercise.time.to_i + 1).minutes) < Time.now))
+ if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
objective_score = calculate_student_score(@exercise,current_user)[:total_score]
subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
total_score = objective_score + subjective_score
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 28c011434..f2e8508f0 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -783,7 +783,7 @@ class ExercisesController < ApplicationController
# 首页批量或单独 立即截止，截止时间为当前时间
def end_exercise
- sleep(1)
+
ActiveRecord::Base.transaction do
begin
check_ids = Exercise.where(id:params[:check_ids])
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 062390f1e..2d0271a23 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -536,7 +536,7 @@ class NewShixunModel extends Component{
className="fl task-hide edu-txt-left mt3"
name="shixun_homework[]"
>
-
@@ -588,13 +588,19 @@ class NewShixunModel extends Component{
}
`}
-
+ {this.props.type==='shixuns'?
{item.author_name}
{item.author_school_name}
难度系数：{item.level}
学习人数：{item.study_count}
-
-
+ :
+
+ {item.author_name}
+ {item.author_school_name}
+ 学习人数：{item.myshixuns_count}
+ 章节：{item.stage_count}
+ 实训：{item.shixuns_count}
+ }
{item.subjects===undefined?"":item.subjects.length===0?"":this.ItsCourse(item.subjects)}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index abd40784a..0a7cf509d 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -451,9 +451,9 @@ class GraduationTaskDetail extends Component{
:""}
{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==="创建项目"?创建项目:""}
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 41fc89dbd..88613513c 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -493,7 +493,7 @@ class MessagSub extends Component {
//belong_container_id course的id
return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`);
default :
- return window.open("/")
+ return
}
}
@@ -575,7 +575,16 @@ class MessagSub extends Component {
boolps = false;
}
}
-
+ if (item.container_type === "DeleteCourse") {
+ if (item.tiding_type === "System") {
+ boolps = false;
+ }
+ }
+ if (item.container_type === "DeleteCourseMember") {
+ if (item.tiding_type === "System") {
+ boolps = false;
+ }
+ }
return (