调整

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

@@ -1203,14 +1203,14 @@ class GraduationTaskssettinglist extends Component{
 												{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0?<li className="clearfix">
 													<span className="fl mr10 color-grey-8">分班情况：</span>
 
-													<span className="fl mr25">
+													<CheckboxGroup value={course_group} onChange={(e)=>this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
-                           <a  id="graduation_comment_no_limit" className={course_group===null||course_group===undefined?"pl10 pr10 check_on":"pl10 pr10 "} onClick={()=>this.groupgroup([])}>不限</a>
+													 <span className="fl mr25">
-                         </span>
+														 <a  id="graduation_comment_no_limit" className={course_group===null||course_group===undefined?"pl10 pr10 check_on":"pl10 pr10 "} onClick={()=>this.groupgroup([])}>不限</a>
+													 </span>
 
-													<CheckboxGroup value={course_group} onChange={(e)=>this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{ paddingTop: '4px'}}>
 														{taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
 															return(
-																<span key={key}>
+																<span key={key}  className={"mt10"}>
                                 <Checkbox value={item.course_group_id} key={item.course_group_id} className="fl ">{item.group_group_name}
 	                                <span>({item.count})</span>
                                 </Checkbox>

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

@@ -317,15 +317,18 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose = () => {
-			if(this.props.match===undefined){
+			// if(this.props.match===undefined){
-				window.location.href="/";
+			// 	window.location.href="/";
-			}else if(this.props.match.path==="/"){
+			// }else if(this.props.match.path==="/"){
-        this.setState({
+      //   this.setState({
-          isRender: false
+      //     isRender: false
-        })
+      //   })
-      }else{
+      // }else{
-      window.location.href="/";
+      // window.location.href="/";
-      }
+      // }
+			this.setState({
+				isRender: false
+			})
     }
 
     loginEDU=()=>{

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

@@ -534,10 +534,10 @@ submittojoinclass=(value)=>{
 
       <div className="newHeader" id="nHeader"  >
 
-              <LoginDialog
+              {/*<LoginDialog*/}
-                  {...this.state}
+                  {/*{...this.state}*/}
-                  {...this.props}
+                  {/*{...this.props}*/}
-              />
+              {/*/>*/}
 
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}

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

@@ -470,11 +470,10 @@ class Challenges extends Component {
                             </span>
                         </div>
                         <div className="clearfix pl28">
-                          <span className="task-colspan">{item.passed_count}&nbsp;人完成挑战</span>
+													<span className="task-colspan"><span className={"color-orange"}>{item.passed_count}</span>&nbsp;人完成挑战</span>
                           <span
-                            className="task-colspan">{item.playing_count}&nbsp;人正在挑战</span>
+                            className="task-colspan"><span className={"color-orange"}>{item.playing_count}</span>&nbsp;人正在挑战</span>
-                          <span className="task-colspan"><span
+													<span className="task-colspan"><span>完成挑战可获得经验值&nbsp;<span className={"color-orange"}>{item.score}</span></span></span>
-                            className="colspan-grey">经验值&nbsp;{item.score}</span></span>
 
 
                           {/*判断比较复杂 有排第一不能是灰色按钮*/}