Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/ecs/reach_criteria_controller.rb

@@ -1,4 +1,4 @@
-class ReachCriteriaController < Ecs::BaseController
+class Ecs::ReachCriteriaController < Ecs::BaseController
   before_action :check_major_manager_permission!, only: [:create]
 
   def create

app/controllers/ecs/reach_evaluations_controller.rb

@@ -1,7 +1,7 @@
 class Ecs::ReachEvaluationsController < Ecs::BaseController
 
   def show
-    preload = { ec_graduation_subitems: { ec_course_support: [:ec_course, :ec_graduation_requirement_calculation] } }
+    preload = { ec_graduation_subitems: { ec_course_supports: [:ec_course, :ec_graduation_requirement_calculation] } }
     @graduation_requirements = current_year.ec_graduation_requirements.includes(preload)
 
     respond_to do |format|

app/controllers/games_controller.rb

@@ -431,6 +431,7 @@ class GamesController < ApplicationController
   # params[:status] 1: 目录树点击的请求 0：正常自动加载
   # 返回参数status ： -1 系统统一报错提示；-3 需要轮训重试，带retry参数；-4 立即重试
   def rep_content
+    raise("666")
     challenge_path = @game.challenge.try(:path)
     if challenge_path.blank?
       tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -28,6 +28,16 @@ class Fileslistitem extends Component{
     }
 
     showfiles=(list)=>{
+			if(this.props.checkIfLogin()===false){
+				this.props.showLoginDialog()
+				return
+			}
+
+			if(this.props.checkIfProfileCompleted()===false){
+				this.props.showProfileCompleteDialog()
+				return
+			}
+
     	if(list.is_history_file===false){
 				// this.props.DownloadFileA(list.title,list.url)
 				//window.location.href=list.url;
@@ -217,7 +227,9 @@ class Fileslistitem extends Component{
                         {
                        this.props.isNotMember===true?
 												 discussMessage.is_lock === true ?
-                                <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
+															 <Tooltip  title={"私有属性，非课堂成员不能访问"}  placement="bottom">
+																 <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.title}</span>
+															 </Tooltip>
                                 :<a
 														 onClick={()=>this.showfiles(discussMessage)}
 														 title={discussMessage.title}

public/react/src/modules/courses/Resource/index.js

@@ -113,6 +113,9 @@ class Fileslists extends Component{
 
   updadatalist=(id)=>{
     // this.seactall(id)
+		if(this.props.user&&this.props.user.login=== ""||this.props.user&&this.props.user.login=== null||this.props.user&&this.props.user.login=== undefined){
+
+		}else{
 			let coursesId=this.props.match.params.coursesId;
 			let url="/courses/"+coursesId+"/attahcment_category_list.json";
 			axios.get(url, {
@@ -139,6 +142,8 @@ class Fileslists extends Component{
 
 			})
 		}
+
+  }
   updatafiled=()=>{
 		if(this.props.match.params.main_id){
 			this.seactall();

public/react/src/modules/courses/boards/BoardsListItem.js

@@ -10,6 +10,16 @@ class BoardsListItem extends Component{
     }
   }
   onTitleClick = (discussMessage) => {
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
     const isAdminOrStudent = this.props.isAdminOrStudent();
     if (!isAdminOrStudent && discussMessage.is_public == false) {
       // 没有权限访问
@@ -47,15 +57,16 @@ class BoardsListItem extends Component{
           </a>
           <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
             <h6>
-              <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" 
-                style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter'), maxWidth: '700px' }}
+							<Tooltip title={canNotLink?"私有属性，非课堂成员不能访问":`${discussMessage.subject.length > 40 ? discussMessage.subject : ''}`} placement="bottom">
+								<a  className="panel-list-title hide fl mt5 color-dark font-bd pointer"
+									style={{ fontWeight: 'bold', cursor: (canNotLink ? 'poninter' : 'poninter'), maxWidth: '700px' }}
 									onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
-                title={`${discussMessage.subject.length > 40 ? discussMessage.subject : ''}`}
 								>{discussMessage.subject}</a>
+							</Tooltip>
               { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
               {
                 
-                 discussMessage.is_public == false ? (<Tooltip title={`${isAdminOrStudent ? '私有属性' : '私有属性，非课堂成员不能访问'}`}>
+                 discussMessage.is_public == false ? (<Tooltip title={`${isAdminOrStudent ? '私有属性' : '私有属性，非课堂成员不能访问'}`} placement="bottom">
                   <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                  </Tooltip>) : ""
               }

public/react/src/modules/courses/busyWork/CommonWorkItem.js

@@ -16,6 +16,17 @@ class CommonWorkItem extends Component{
     }
   }
   onItemClick = (item) => {
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
 		const isStudent = this.props.isStudent()
     if (isStudent) {
       this.props.toWorkQuestionPage(this.props.match.params, item.homework_id)
@@ -144,15 +155,15 @@ class CommonWorkItem extends Component{
               }
               <div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
                 <p className="clearfix mb20">
-                  <a  title={item.name}
-                      className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'default' : 'poninter'}}
+									<Tooltip title={ canNotLink ? "私有属性，非课堂成员不能访问" : item.name} placement="bottom" >
+										<span className="fl font-16 font-bd mt2 comnonwidth580 pointer" style={{cursor: canNotLink ? 'poninter' : 'poninter'}}
 												onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
-                  >{item.name}</a>
-                  
+										>{item.name}</span>
+									</Tooltip>
               {/* 只有非课堂成员且作业是私有的情况下才会为true */}
                   {
                     item.private_icon===true ? 
-                    (<Tooltip title={ isAdminOrStudent ? "私有属性" : "私有属性，非课堂成员不能访问"}>
+                    (<Tooltip title={ isAdminOrStudent ? "私有属性" : "私有属性，非课堂成员不能访问"} placement="bottom" >
                       <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
                      </Tooltip>) : ""
                   }
@@ -182,7 +193,7 @@ class CommonWorkItem extends Component{
 									{item.uncommit_count===undefined?"":<span className="mr20 fl">{item.uncommit_count} 未交</span>}
                   {
                     item.status_time!="" && 
-                    <Tooltip title={ item.status.indexOf('提交中') != -1 ? '提交剩余时间' : 
+                    <Tooltip placement="bottom" title={ item.status.indexOf('提交中') != -1 ? '提交剩余时间' :
                         item.status.indexOf('补交中') != -1 ? '补交剩余时间' : 
                         item.status.indexOf('申诉中') != -1 ? '申诉剩余时间' : 
                         item.status.indexOf('匿评中') != -1 ? '匿评剩余时间' : 

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -1045,10 +1045,7 @@ class Coursesleftnav extends Component{
                     })
 
                 : course_modules===undefined?"":course_modules.map((item,key)=>{
-						        if(key===this.props.indexs){
-						        	console.log(key)
-											console.log(this.props.indexs)
-										}
+
                return(
                  <div key={key}>
                    {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}

public/react/src/modules/courses/exercise/ExerciseListItem.js

@@ -51,6 +51,21 @@ class ExerciseListItem extends Component{
 				Loadtype:false
 			})
 	  }
+
+	toDetailPage=(url)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
+		this.props.history.push(url);
+	}
     render(){
         let{item,checkBox,index}=this.props;
         let {coursesId,Id}=this.props.match.params
@@ -96,20 +111,22 @@ class ExerciseListItem extends Component{
 
                         {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
                         {
-                            this.props.isAdmin()? <Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
+                            this.props.isAdmin()? <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer"
 																											title={item.exercise_name}
-                                                      to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
+                                                      onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
                         }
 
 												{
 													this.props.isStudent()?
-														<Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
+														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
 												}
 
                         {
                         this.props.isNotMember()? item.lock_status === 0 ?
-                                <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :														<Link className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
+													<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
+                                <span className="fl mt3 font-16 font-bd color-dark comnonwidth580 pointer" title={item.exercise_name}>{item.exercise_name}</span>
+													</Tooltip>
+														:	<a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name}  onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
                         }
 
                         {

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -133,6 +133,21 @@ class GraduateTaskItem extends Component{
 	setupdate=()=>{
 		this.props.funlist
 	}
+
+	toDetailPage=(url)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
+		this.props.history.push(url);
+	}
   render(){
     let {
         Modalstype,
@@ -215,20 +230,22 @@ class GraduateTaskItem extends Component{
             <h6>
 
               {
-                this.props.isAdmin?<Link to={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list"}
+                this.props.isAdmin?<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
 																			title={discussMessage.name}
-                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
               {
-                this.props.isStudent? <Link to={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list"}
+                this.props.isStudent? <a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
 																				 title={discussMessage.name}
-                                           className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                           className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
               {
             this.props.isNotMember===true?this.props.discussMessage.private_icon===true?
-                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-             :<a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
+							<Tooltip  title={"私有属性，非课堂成员不能访问"}  placement="bottom">
+                  <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer" >{discussMessage.name}</span>
+							</Tooltip>
+             :<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
 								 title={discussMessage.name}
 								 className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -1169,9 +1169,11 @@ class GraduationTaskssettingapp extends Component{
                 <div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl36">
                   <div className={" font-16 color-dark h20 mb20"}>评分设置 </div>
                   <div className={"font-16 h20 mb20"}>最终成绩组成 <span className={"font-14 color-grey-c"}>（取各教师最终评分的平均分）</span></div>
+									<Tooltip placement="bottom" title={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?"正在交叉评阅，不可取消":"":"":""}>
 										<Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
 															disabled={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?true:false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
 										</Checkbox>
+									</Tooltip>
                   {crosscomment===true?<div>
                   <div className={"h20 mb30 ml30 mt20 ml87"}>
                     <span>开始时间：</span>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -40,7 +40,7 @@ class GraduationTaskssettinglist extends Component{
 			task_status:undefined,
 			cross_comment:null,
 			search:null,
-			order:"updated_at",
+			order:"update_time",
 			b_order:"desc",
 			course_group:undefined,
 			loadingstate:true,
@@ -92,6 +92,7 @@ class GraduationTaskssettinglist extends Component{
 
 	seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
      let{page,limit}=this.state;
+
 		// console.log(teacher_comment,task_status,course_group,cross_comment,order,b_order,search)
 		let task_Id=this.props.match.params.task_Id;
 		let url="/graduation_tasks/"+task_Id+"/tasks_list.json";
@@ -106,7 +107,7 @@ class GraduationTaskssettinglist extends Component{
 				order:order===null?undefined:order,
 				b_order:b_order===null?undefined:b_order,
 				search:search===null?undefined:search,
-				page:pages===null?undefined:page,
+				page:pages,
 				limit:20,
 			},
 			paramsSerializer: function(params) {
@@ -281,8 +282,6 @@ class GraduationTaskssettinglist extends Component{
 	funtaskstatus=(checkedValues,key)=>{
 		// console.log(checkedValues)
 
-		console.log(checkedValues);
-
 		let {teacher_comment, course_group, cross_comment, order, b_order, search} = this.state;
 
 
@@ -599,7 +598,7 @@ class GraduationTaskssettinglist extends Component{
 		this.cannerassocition();
 		let {taskslistdata}=this.state;
 		let url = "/graduation_tasks/"+taskslistdata.task_id+"/graduation_works/cancel_relate_project.json";
-		console.log(url)
+
 		axios.get(url).then((result)=>{
 
 			if(result.data.status===0){
@@ -655,8 +654,7 @@ class GraduationTaskssettinglist extends Component{
 
 	/// 确认是否下载
 	confirmysl(url){
-		debugger;
-		console.log(1);
+
 		let  {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state;
 
 		let params ={
@@ -958,7 +956,7 @@ class GraduationTaskssettinglist extends Component{
 
 		}
 
-		console.log(this.props.questionslist.status)
+
 		return(
 			<React.Fragment>
 
@@ -1221,10 +1219,10 @@ class GraduationTaskssettinglist extends Component{
 													{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
 														<p>
 															<a data-remote="true" class="color-grey-6 font-12">
-															{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
+															{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
 															<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
 														<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
-															<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
+															<li onClick={(e)=>this.funorder("update_time")}><a data-remote="true">更新时间</a>
 															</li>
 															<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>
 															</li>
@@ -1415,10 +1413,10 @@ class GraduationTaskssettinglist extends Component{
 																	</span>
 																	 <div className="fr color-grey-6 edu-menu-panel">
 																		<p><a data-remote="true">
-																			{order==="updated_at"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序</a><i
+																			{order==="update_time"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序</a><i
 																			className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
 																		<ul className="edu-menu-list">
-																			<li onClick={(e)=>this.funorder("updated_at")} className={order==="updated_at"?"none":""}><a data-remote="true">时间</a>
+																			<li onClick={(e)=>this.funorder("update_time")} className={order==="update_time"?"none":""}><a data-remote="true">时间</a>
 																			</li>
 																			<li onClick={(e)=>this.funorder("work_score" )} className={order==="work_score"?"none":""}><a  data-remote="true">成绩</a>
 																			</li>

public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js

@@ -15,6 +15,17 @@ class GraduateTopicItem extends Component{
     this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/edit`);
   }
   toDetailPage=(topicId)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
     let courseId=this.props.match.params.coursesId;
     this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/detail`);
   }
@@ -71,7 +82,9 @@ class GraduateTopicItem extends Component{
             <h6>
               {
                 isNotMember?
-                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+									<Tooltip  title={ discussMessage.private_icon===true?"私有属性，非课堂成员不能访问":discussMessage.name}  placement="bottom">
+               		   <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.name}</span>
+									</Tooltip>:""
 
               }
               {

public/react/src/modules/courses/poll/PollListItem.js

@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import Tooltip from 'material-ui/Tooltip';
+import {Tooltip} from 'antd';
 import {Link} from 'react-router-dom';
 import moment from 'moment';
 import CoursesListType from '../coursesPublic/CoursesListType';
@@ -15,6 +15,20 @@ class PollListItem extends Component{
   constructor(props){
     super(props);
   }
+	toDetailPage=(url)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
+		this.props.history.push(url);
+	}
   render(){
     let{item,checkBox,courseType,index}=this.props;
     let {coursesId}=this.props.match.params;
@@ -37,12 +51,16 @@ class PollListItem extends Component{
         }
         <div className="flex1 pr">
           <p className="clearfix mb30">
-            { canNotLink ? <a className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px", "cursor": "default"}} title={item.polls_name}>{item.polls_name}</a> :
-                <Link to={`/courses/${coursesId}/polls/${item.id}/detail`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</Link>
+            { canNotLink ?
+							<Tooltip  title={courseType.user_permission == 0?"私有属性，非课堂成员不能访问":item.polls_name}  placement="bottom">
+							<span className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} >{item.polls_name}</span>
+							</Tooltip>
+								:
+                <a onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a>
             }
             {
               item.lock_status === 0 ? 
-              <Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}>
+              <Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}  placement="bottom">
                 <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
               </Tooltip>
               :""

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -143,6 +143,22 @@ class ShixunhomeWorkItem extends Component{
       ModalsRenametype:false,
     })
   }
+
+	hrefjumpskip=(url)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
+		this.props.history.push(url);
+
+	}
   render(){
     let {
         Modalstype,
@@ -294,23 +310,25 @@ class ShixunhomeWorkItem extends Component{
 
               {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
-                this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}
+                this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
                                          title={discussMessage.name}
-                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
               {
-                this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+                this.props.isStudent? <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
                                             title={discussMessage.name}
-                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
-									<span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                 : <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+									<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
+											<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.name}</span>
+									</Tooltip>
+										: <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
                          title={discussMessage.name}
-                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
+                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
 

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -137,7 +137,7 @@ class Trainingjobsetting extends Component {
     componentDidMount() {
         console.log("Trainingjobsetting");
         console.log("componentDidMount");
-        this.getTrainingjobsetting();
+        this.getTrainingjobsetting(true);
         let query = this.props.location.pathname;
         const type = query.split('/');
         this.setState({
@@ -165,7 +165,7 @@ class Trainingjobsetting extends Component {
     // }
 
     // 获取数据地方
-    getTrainingjobsetting = () => {
+    getTrainingjobsetting = (bool) => {
         // console.log("getTrainingjobsetting")
         var homeworkid = this.props.match.params.homeworkid;
         // console.log(homeworkid)
@@ -293,6 +293,14 @@ class Trainingjobsetting extends Component {
                     code_review:result.data.code_review
                 })
                 this.props.Getdataback(result,result.data);
+
+                if(bool===true){
+                    if(this.props.isAdmin() !== undefined){
+                        if(this.props.isAdmin() === true){
+                            this.editSettings(result);
+                        }
+                    }
+                }
             }
         })
 
@@ -1592,7 +1600,7 @@ class Trainingjobsetting extends Component {
                         description:result.data.message
                     });
                     this.homeworkhide();
-                    this.getTrainingjobsetting();
+                    this.getTrainingjobsetting(false);
                 }
 
             }
@@ -1623,7 +1631,7 @@ class Trainingjobsetting extends Component {
                     //     message:"提示",
                     //     description:response.data.message
                     // });
-								  	this.getTrainingjobsetting();
+								  	this.getTrainingjobsetting(false);
                     this.homeworkhide()
                 }
             })
@@ -1814,7 +1822,7 @@ class Trainingjobsetting extends Component {
                 if(moment(datas.data.late_time,"YYYY-MM-DD HH:mm")<=moment()){
                     endtime=false;
                 }
-                if(datas.data.allowreplenishment === false){
+                if(datas.data.allow_late === false){
                     whethertopays=false;
                 }
 
@@ -1829,15 +1837,16 @@ class Trainingjobsetting extends Component {
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
                             work_efficiencys:true,
-                            unifiedsetting:datas.data.unifiedsetting,
+                            unifiedsetting:datas.data.unified_setting,
                             latedeductiontwo:20,
                         });
                         //均分比例
+                        // result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ?
                         try {
-                            if(datas.data.proportion==="均分比例"){
+                            if(datas.data.shixun_evaluation === 0){
                                 this.Equalproportion(20);
 
-                            }else if(datas.data.proportion==="经验值比例"){
+                            }else if(datas.data.shixun_evaluation === 1){
                                 this.Empiricalvalueratio(20);
 
                             }
@@ -1853,9 +1862,9 @@ class Trainingjobsetting extends Component {
                             flagPageEditstwo:releasetime,
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
-                            unifiedsetting:datas.data.unifiedsetting,
+                            unifiedsetting:datas.data.unified_setting,
                         });
-                        if(datas.data.work_efficiencys===true){
+                        if(datas.data.work_efficiency===true){
                             this.setState({
                                 completionefficiencyscore:true,
                             })
@@ -1873,9 +1882,9 @@ class Trainingjobsetting extends Component {
                         flagPageEditstwo:releasetime,
                         flagPageEditsthrees:deadline,
                         flagPageEditsfor:endtime,
-                        unifiedsetting:datas.data.unifiedsetting,
+                        unifiedsetting:datas.data.unified_setting,
                     });
-                    if(datas.data.work_efficiencys===true){
+                    if(datas.data.work_efficiency===true){
                         this.setState({
                             completionefficiencyscore:true,
                         })
@@ -1886,7 +1895,7 @@ class Trainingjobsetting extends Component {
                     }
                 }
 
-                if(datas.data.proportion === "自定义分值"){
+                if(datas.data.shixun_evaluation === 2){
                     this.setState({
                         boolUnitetwoname:"自定义分值",
                         boolUnitetwo: false,
@@ -1920,7 +1929,7 @@ class Trainingjobsetting extends Component {
             unit_e_tip: "",
         })
         this.refs.targetElementTrainingjobsetting.scrollIntoView();
-        this.getTrainingjobsetting();
+        this.getTrainingjobsetting(false);
     }
 
     rulesCheckInfo=(rules)=>{

public/react/src/modules/login/LoginDialog.js

@@ -400,7 +400,11 @@ class LoginDialog extends Component {
     handleDialogClose = () => {
 
 			if(this.props.match===undefined){
-				window.location.href="/";
+				// window.location.href="/";
+				this.setState({
+					isRender: false
+				})
+				this.props.Modifyloginvalue();
 			}else{
         this.setState({
           isRender: false

public/react/src/modules/paths/PathDetail/DetailCards.js

@@ -3,7 +3,6 @@ import {getImageUrl} from 'educoder';
 import {Tooltip,Modal,Icon,Spin,message} from 'antd';
 import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
 import DetailCardsEditAndEdit from './DetailCardsEditAndEdit';
-import AccountProfile from"../../user/AccountProfile";
 import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import axios from 'axios';
 import { DragDropContext ,  Draggable, Droppable} from 'react-beautiful-dnd';
@@ -201,10 +200,8 @@ class DetailCards extends Component{
 			return
 		}
 
-		if(this.props.current_user&&this.props.current_user.profile_completed===false){
-			this.setState({
-				AccountProfiletype:true
-			})
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
 			return
 		}
 
@@ -308,16 +305,11 @@ class DetailCards extends Component{
 			startshixunCombattype:false
 		})
 	}
-	hideAccountProfile=()=>{
-		this.setState({
-			AccountProfiletype:false
-		})
-	}
+
 
 	render(){
     let { pathCardsList,
       dropid,
-			AccountProfiletype,
       idsum,
       pathCardsedittype,
       pathlistedit,
@@ -339,11 +331,7 @@ class DetailCards extends Component{
    // console.log("zzz"+this.props.MenuItemsindextype)
     return(
       <div>
-				{AccountProfiletype===true?<AccountProfile
-					hideAccountProfile={()=>this.hideAccountProfile()}
-					{...this.props}
-					{...this.state}
-				/>:""}
+
 
         <Modals
           modalsType={Modalstype}

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -5,7 +5,6 @@ import SendPanel from "./sendPanel.js";
 import { getImageUrl } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
-import AccountProfile from"../../user/AccountProfile";
 import OpenCourse from './OpenCourse';
 import Jointheclass from '../../modals/Jointheclass';
 import './DetailTop.css';
@@ -30,7 +29,7 @@ class DetailTop extends Component{
 			Pathcourseid:undefined,
 			OpenCourseTypes:false,
 			putappointmenttype:false,
-			getappointmenttype:false
+			getappointmenttype:false,
     }
   }
 	componentDidMount(){
@@ -250,7 +249,7 @@ class DetailTop extends Component{
 			return
 		}
 
-		if(this.props.current_user&&this.props.current_user.profile_completed===false){
+		if(this.props.checkIfProfileCompleted()===false){
 			this.props.showProfileCompleteDialog()
 			return
 		}
@@ -269,10 +268,8 @@ class DetailTop extends Component{
 			return
 		}
 
-		if(this.props.current_user&&this.props.current_user.profile_completed===false){
-			this.setState({
-				AccountProfiletype:true
-			})
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
 			return
 		}
 
@@ -336,14 +333,10 @@ class DetailTop extends Component{
 		})
 	}
 
-	hideAccountProfile=()=>{
-		this.setState({
-			AccountProfiletype:false
-		})
-	}
+
 	render(){
     let{detailInfoList}=this.props;
-    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,AccountProfiletype}=this.state;
+    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype}=this.state;
     const radioStyle = {
       display: 'block',
       height: '30px',
@@ -373,11 +366,7 @@ class DetailTop extends Component{
 		return(
 
 			<div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}>
-				{AccountProfiletype===true?<AccountProfile
-					hideAccountProfile={()=>this.hideAccountProfile()}
-					{...this.props}
-					{...this.state}
-				/>:""}
+
 
         <Modals
           modalsType={Modalstype}

public/react/src/modules/tpm/TPMBanner.js

@@ -167,7 +167,7 @@ class TPMBanner extends Component {
 				this.props.showLoginDialog()
 				return
 			}
-			if(this.props.current_user&&this.props.current_user.profile_completed===false){
+			if(this.props.checkIfProfileCompleted()===false){
 				this.setState({
 					AccountProfiletype:true
 				})
@@ -390,7 +390,7 @@ class TPMBanner extends Component {
 				return
 			}
 
-    	if(this.props.current_user&&this.props.current_user.profile_completed===false){
+    	if(this.props.checkIfProfileCompleted()===false){
 				this.setState({
 					AccountProfiletype:true
 				})

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -228,7 +228,7 @@ class Challenges extends Component {
 		}
 
 
-		if(this.props.current_user&&this.props.current_user.profile_completed===false){
+		if(this.props.checkIfProfileCompleted()===false){
 			this.setState({
 				AccountProfiletype:true
 			})