From f9fa3ebcc22b5351b81f07303eb30badf1f9763a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:01:02 +0800 Subject: [PATCH] Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagChat.js # public/react/src/modules/message/js/Messagerouting.js --- .../react/src/modules/message/js/MessagSub.js | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index c44685361..cb2d18105 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -116,94 +116,94 @@ class MessagSub extends Component{ if(item.tiding_type==="Apply"){ if(item.auth_type===1){ //系统管理页面 - return window.location.href="/managements/identity_authentication"; + return window.open("/managements/identity_authentication"); } if(item.auth_type===2){ //系统管理页面 - return window.location.href="/managements/professional_authentication"; + return window.open("/managements/professional_authentication") } } if(item.tiding_type ==="System"){ // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") } case "CancelUserAuthentication" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "CancelUserProCertification" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "ApplyAddDepartment" : if(item.tiding_type==="Apply"){ //部门审批 - return window.location.href="/managements/depart"; + return window.open("/managements/depart") } if(item.tiding_type==="System"){ // 账号管理页/account/profile - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAddSchools" : if(item.tiding_type==="Apply"){ // 单位审批 - return window.location.href=" /managements/unit"; + return window.open(" /managements/unit") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAction" : switch (item.parent_container_type) { case "ApplyShixun" : if(item.tiding_type==="Apply"){ - return window.location.href="/managements/shixun_authorization"; + return window.open("/managements/shixun_authorization") } if(item.tiding_type==="System"){ // 实训详情页 :identifier = identifier - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) } case "ApplySubject" : if(item.tiding_type==="Apply"){ // 实训课程发布 - return window.location.href="/managements/subject_authorization"; + return window.open("/managements/subject_authorization") } if(item.tiding_type==="System"){ // 实践课程详情页 :identifier = identifier - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.identifier}`) } case "TrialAuthorization" : if(item.tiding_type==="Apply"){ // 试用授权页面 - return window.location.href="/managements/trial_authorization"; + return window.open("/managements/trial_authorization") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } } case 'JoinCourse' : // 课堂详情页 :id = - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'StudentJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'DealCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'TeacherJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'Course' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'ArchiveCourse' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case "Shixun" : - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) case "Subject" : // 实践课程详情页 :id = container_id - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.identifier}`) case "JournalsForMessage" : switch (item.parent_container_type) { case "Principal" : @@ -214,219 +214,219 @@ class MessagSub extends Component{ //学生作业页 homework = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } return ''; case "GraduationTopic" : // 毕业目标页 parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case "StudentWorksScore" : //学生作业页 if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "Memo" : // 交流问答页 :id = parent_container_id - return window.location.href="/forums/categories/all?order=newest"; + return window.open("/forums/categories/all?order=newest") case "Watcher" : // 用户个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + return window.open(`/users/${item.trigger_user.login}/courses`) case "PraiseTread" : // 这块太复杂 不好处理 return ''; case "Grade" : //个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + // return window.open(`/users/${item.trigger_user.login}/courses`; case "JoinProject" : //项目详情-申请加入项目审核页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ReporterJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'DealProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ManagerJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case "Poll": switch (item.parent_container_type) { case "CommitPoll" : // 课堂id belong_container_id //课堂-学生已提交问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) default : // 课堂-问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) } case "Exercise" : switch (item.parent_container_type) { case "CommitExercise": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) case "ExerciseScore": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) default : // 课堂-试卷列表详情 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/exercises/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}`) } case 'StudentGraduationTopic' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'DealStudentTopicSelect' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'GraduationTask' : //课堂-毕业任务页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWork" : //课堂-毕业xx页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWorkScore" : // 课堂-毕业xx页 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`) case "HomeworkCommon" : switch (item.parent_container_type) { case "AnonymousCommentFail" : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "HomeworkPublish" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "AnonymousAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } default : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "StudentWork" : //课堂-作业 :id = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScoresAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "ChallengeWorkScore" : return ''; case "SendMessage" : // /managements/mirror_repository - return window.location.href=`/managements/mirror_repository`; + return window.open(`/managements/mirror_repository`) case "Journal" : //项目Issue页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/issues?remote=true`; + return window.open(`/projects/${item.parent_container_id}/issues?remote=true`) case "Issue" : //项目Issue页 :id = container_id - return window.location.href=`/projects/${item.container_id}/issues?remote=true`; + return window.open(`/projects/${item.container_id}/issues?remote=true`) case "PullRequest" : // 项目pull request页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/pull_requests`; + return window.open(`/projects/${item.parent_container_id}/pull_requests`) case "Department" : //账号管理页 - return window.location.href=`/account/profile`; + return window.open(`/account/profile`) case "Library" : if (item.tiding_type === 'Apply') { // /managements/library_applies - return window.location.href=`/managements/library_applies`; + return window.open(`/managements/library_applies`) } if(item.tiding_type === 'System'){ //教学案例详情 :id = container_id - return window.location.href=`/moop_cases/${item.container_id}`; + return window.open(`/moop_cases/${item.container_id}`) } case "ProjectPackage" : if(item.tiding_type==="Destroyed_end"){ @@ -434,15 +434,15 @@ class MessagSub extends Component{ }else { // if (item.tiding_type === 'Apply') { // ///managements/project_package_applies - // return window.location.href=`/managements/project_package_applies`; + // return window.open(`/managements/project_package_applies`; // } // if(item.tiding_type === 'System'){ //众包详情 :id = container_id - return window.location.href=`/crowdsourcing/${item.container_id}`; + return window.open(`/crowdsourcing/${item.container_id}`) // } } default : - return window.location.href="/"; + return window.open("/") } }