diff --git a/public/react/src/common/util/ShareUtil.js b/public/react/src/common/util/ShareUtil.js index a85c37c4a..f0ce13996 100644 --- a/public/react/src/common/util/ShareUtil.js +++ b/public/react/src/common/util/ShareUtil.js @@ -110,7 +110,7 @@ export function configShareForCourses () { var shareData = { title: 'EduCoder - 教学课堂', desc: '自动评测实训任务,支持技能统计,提供教学活动分析报告,减轻教师和助教的辅导压力,免去作业发布和批改的困扰,实时了解学生学习情况,全面提升教师施教效率和水平。', - link: `${host}/courses`, + link: `${host}/classrooms`, imgUrl: window.__testImageUrl || host + '/react/build/images/share_logo_icon.jpg' }; diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index 58aa916c4..a1476125c 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -2763,7 +2763,7 @@ class PollNewQuestbank extends Component { // // let courseId=this.props.match.params.coursesId; // if(courseId===undefined){ - // this.props.history.push("/courses"); + // this.props.history.push("/classrooms"); // }else{ // this.props.history.push(this.props.current_user.first_category_url); // } diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js index 070fa6bb7..228e25334 100644 --- a/public/react/src/modules/courses/signin/component/Teacherentry.js +++ b/public/react/src/modules/courses/signin/component/Teacherentry.js @@ -125,6 +125,15 @@ class Teacherentry extends Component { +
{ isAdmin === true ? @@ -154,13 +163,16 @@ class Teacherentry extends Component { { item.attendance_status? ( - item.attendance_status==="ABSENCE"? + item.attendance_status==="ABSENCE"&&item.attendance_mode!="TEACHER"?
{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}> 签到
- : - item.attendance_status==="NORMAL"? -
+ : item.attendance_status === "LEAVE" ? +
+ 请假 +
+ : item.attendance_status==="NORMAL"? +
正常签到
:"" @@ -175,15 +187,15 @@ class Teacherentry extends Component { { item.attendance_status? item.attendance_status === "NORMAL" ? -
+
正常签到
: item.attendance_status === "LEAVE" ? -
+
请假
: item.attendance_status === "ABSENCE" ? -
+
旷课
: diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 822f7b8fe..e87dcac3d 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -272,13 +272,13 @@ class MessagSub extends Component { return window.open(`/forums/`); case "Watcher" : // 用户个人中心页 :id = item.trigger_user.login - return window.open(`/users/${item.trigger_user.login}/courses`) + return window.open(`/users/${item.trigger_user.login}/classrooms`) case "PraiseTread" : // 这块太复杂 不好处理 return ''; case "Grade" : //个人中心页 :id = item.trigger_user.login - // return window.open(`/users/${item.trigger_user.login}/courses`; + // return window.open(`/users/${item.trigger_user.login}/classrooms`; return ""; case "JoinProject" : //项目详情-申请加入项目审核页 :id = container_id diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 0d3f1d392..1678703d6 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1123,15 +1123,15 @@ class NewHeader extends Component { 注册 :
- +