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

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

@@ -152,7 +152,7 @@ function buildColumns(that, student_works) {
         <span>
           {project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`} 
               target={ project_info.id == -1 ? '' : "_blank" }
-              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
+              className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name}
           >{project_info.name}</a>}
         </span>
       ),
@@ -749,6 +749,9 @@ class CommonWorkList extends Component{
                 border-bottom: none;
               }
               .studentTable .ant-table-tbody { background: '#F1F9FF' }
+              .studentTable table, .stageTable table{
+                font-size: 13px !important;
+              }
             `}</style>
             { isStudent &&StudentData===undefined?"":StudentData===undefined?"":
               <Table

public/react/src/modules/courses/coursesPublic/PathModal.js

@@ -288,17 +288,19 @@ class PathModal extends Component{
                           <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
                             <li className="fl with40 newtaskhide">
                               <Checkbox
-                                id={"shixun_input_"+item.subject_id} value={item.subject_id}
+                                id={"shixun_input_"+item.subject_id}
+																value={item.subject_id}
+																key={item.subject_id}
                                 className="task-hide edu-txt-left newtaskhide"
                                 style={{"width":"280px"}}
                                 name="shixun_homework[]"
                               >
-                                <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.subject_name}</label>
+                                <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.subject_name}>{item.subject_name}</label>
                               </Checkbox>
                             </li>
                             <li className="fl with30 edu-txt-left task-hide pl40">{item.shixun_count}</li>
                             <li className="fl with10 paddingl10">{item.myshixun_count}</li>
-                            <Tooltip title="查看详情">
+                            <Tooltip title="新窗口查看详情">
                             <li className="fr with10"><a className="color-blue" href={"/paths/"+item.subject_id} target="_blank">详情</a></li>
                             </Tooltip>
                           </div>

public/react/src/modules/courses/members/modal/AddTeacherModal.js

@@ -283,11 +283,12 @@ class AddTeacherModal extends Component{
                     <p className="clearfix mb7" key={candidate.id}>
                       <Checkbox className="fl" value={candidate.id} ></Checkbox>
                       <span className="fl with25">
+                      {/* "color":"#4c4c4c" */}
                         <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
                           <label className="task-hide fl" style={{"maxWidth":"208px;"}}
                           >
                               <a href={`/users/${candidate.login}`} target="_blank" 
-                                style={{"color":"#4c4c4c"}}
+                                style={{}}
                               >{candidate.name}</a>
                           </label>
                         </ConditionToolTip>

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -308,7 +308,7 @@ class ShixunWorkModal extends Component{
 						}
 						<div className={"clearfix"}>
 							<Checkbox checked={onChangetype} onChange={this.onChange} className={"ml10"}>{onChangetype===true?"清除":"全选"}</Checkbox>
-							<span>有效作品都为0</span>
+							{/*<span>有效作品都为0</span>*/}
 						</div>
 
 						<div className="clearfix mt30 edu-txt-center mb10">

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -216,7 +216,8 @@ export default class TPMevaluation extends Component {
 				position: response.data.position,	//int	关卡位置，导航栏中的第几关
 				scorevalue:response.data.test_set_score,
 				markvalue:response.data.test_set_average,
-				web_route:response.data.web_route
+				web_route:response.data.web_route,
+				has_web_route:response.data.has_web_route
 			})
 			this.evaluationoninputvalueonload();
 			if(response.data.power===false){
@@ -780,7 +781,8 @@ export default class TPMevaluation extends Component {
 			web_route,
 			scorevalue,
 			markvalue,
-			scoretype
+			scoretype,
+			has_web_route
 		} = this.state;
 
 		let tab1url="/shixuns/" + shixunId + "/challenges/"+checkpointId+"/editcheckpoint";
@@ -987,7 +989,7 @@ export default class TPMevaluation extends Component {
 						</div>
 					</div>
 
-					{pathoptionvalue===4&&web_route!=null?<div className="edu-back-white mb10 clearfix">
+					{pathoptionvalue===4&&web_route!=null||pathoptionvalue===4&&has_web_route===true?<div className="edu-back-white mb10 clearfix">
 						<div className="padding40-20">
 							<p className="color-grey-6 font-16 mb20">Web路由</p>
 							<div className="df">