调整

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

@@ -358,6 +358,7 @@ class Coursesleftnav extends Component{
       navid:undefined,
       sandiantype:undefined,
       twosandiantype:undefined,
+			ModalsType:false
     })
 
     let url="/course_modules/"+id+"/hidden_module.json"
@@ -379,12 +380,25 @@ class Coursesleftnav extends Component{
 
   edithidden=(e,id)=>{
     e.stopPropagation();//阻止冒泡
-    this.setState({
+		let {course_modules}=this.props;
-      ModalsType:true,
+
-      Modalstopval:"隐藏后将不再显示此模块，",
+		if(course_modules.length>1){
-      ModalsBottomval:"后续可通过添加模块恢复显示",
+			this.setState({
-      ModalSave:()=>this.edithiddens(id),
+				ModalsType:true,
-    })
+				Modalstopval:"隐藏后将不再显示此模块，",
+				ModalsBottomval:"后续可通过添加模块恢复显示",
+				ModalSave:()=>this.edithiddens(id),
+			})
+		}else{
+			this.setState({
+				ModalsType:true,
+				Modalstopval:"您不能隐藏所有课堂模块，请至少保留",
+				ModalsBottomval:"其中一个模块。",
+				loadtype:true,
+				ModalSave:()=>this.cannerNavmoda(),
+			})
+		}
+
   }
 
   Navmodalnames=(e,id,type,setnavid,name)=>{

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

@@ -135,7 +135,7 @@ class AccessoryModal2 extends Component{
         description:description,
         attachment_ids:newfileList
       }).then((result)=>{
-        console.log(result)
+        // console.log(result)
         if(result.data.status===0){
           this.props.setupdate()
           this.setState({

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

@@ -42,7 +42,7 @@ class Exercisestatisticalresult extends Component {
 				limit:limit
 			}
 		}).then((result) => {
-			console.log(result)
+			// console.log(result)
 
 				this.setState({
 					data:result.data
@@ -85,6 +85,10 @@ class Exercisestatisticalresult extends Component {
 			page:pageNumber
 		})
 
+		debugger
+		$('html').animate({
+			scrollTop: 10
+		}, 1000);
 		this.updatefun(sort,exercise_group_id,pageNumber,limit)
 
 	}
@@ -109,10 +113,10 @@ class Exercisestatisticalresult extends Component {
 							<ul className="clearfix" style={{padding:'20px'}}>
 							<li className="clearfix  mt10">
 								<span className="fl mr10 color-grey-8">分班情况：</span>
-								<span className="fl "><a id="graduation_comment_no_limit"
+								<span className="fl ">
-								                         className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }
+									<a id="graduation_comment_no_limit" className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }>不限</a>
-								>不限</a></span>
+								</span>
-								<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{paddingTop: '4px'}}>
+								<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{width:'87%',paddingTop: '4px'}}>
 									{ data&&data.course_groups.map((item, key) => {
 										return (
 											<span key={key}>

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

@@ -83,7 +83,7 @@ class GraduateTaskItem extends Component{
     axios.post(url,{
       project_id:taskid
     }).then((result)=>{
-      console.log(result)
+      // console.log(result)
       if(result.data.status===0){
         this.setState({
           Modalstype:true,

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

@@ -651,7 +651,7 @@ debugger
                 </Link>
               </WordsBtn> : ""}
 
-              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={()=>this.useBankSuccess()}></UseBank>:""}
+              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess=(checkBoxValues,object_ids)}></UseBank>:""}
             </React.Fragment>
 
           }

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

@@ -77,7 +77,7 @@ class GraduateTopicDetail extends Component{
           url+="student_select_topic.json"
         }
         axios.post((url)).then((result)=>{
-          console.log(result);
+          // console.log(result);
           if(result.data.status == 0){
             this.getDetailList();
             this.props.showNotification(`${result.data.message}`);

public/react/src/modules/courses/new/CoursesNew.js

@@ -118,6 +118,8 @@ class CoursesNew extends Component {
             window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2);
         }
     }
+
+
     handleSubmit = (e) => {
 
         e.preventDefault();
@@ -146,8 +148,22 @@ class CoursesNew extends Component {
 
                 }
 
+								if(values.checkboxgroup.length===0){
+									this.setState({
+										Modalstype:true,
+										Modalstopval:"请您至少添加一个课堂模块，",
+										ModalsBottomval:"否则您将无法新建课堂。",
+										Loadtype:true,
+									   ModalSave:()=>this.cancelmodel(),
+									})
+									return
+								}
+
 
                 if (!err) {
+
+
+
                     // console.log('Received values of form: ', values);
                     let {datatime} = this.state;
                     let url = "/courses/" + coursesId + ".json";

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

@@ -47,7 +47,7 @@ class CommitSummary extends Component{
         // console.log(worksid);
         var  url = `/student_works/${worksid}/commit_des.json`;
         axios.get(url).then((result) => {
-            console.log(result);
+            // console.log(result);
             if (result.status === 200) {
                 // console.log(url)
                 // console.log("提交总结接口")

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

@@ -149,8 +149,8 @@ class Trainingjobsetting extends Component {
         // console.log(homeworkid)
         let url = `/homework_commons/${homeworkid}/settings.json`;
         axios.get(url).then((result) => {
-            console.log(url);
+            // console.log(url);
-            console.log(result);
+            // console.log(result);
             if (result!=undefined) {
                 this.props.Getdataback(result,result.data);
                 // console.log(result.data.code_review)

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

@@ -200,7 +200,7 @@ class Trialapplication extends Component {
 			}
 		}).then((result) => {
 			//验证有问题{"status":1,"message":"success"}
-			console.log(result);
+			// console.log(result);
 
 
 		}).catch((error) => {
@@ -357,7 +357,7 @@ class Trialapplication extends Component {
 			}
 		}).then((result) => {
 			//验证有问题{"status":1,"message":"success"}
-			console.log(result);
+			// console.log(result);
 
 
 		}).catch((error) => {

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

@@ -47,7 +47,7 @@ class DetailCards extends Component{
     this.getPathCardsList();
   }
   onDragEnd = (result, shixunIndex) => {
-    console.log(result)
+    // console.log(result)
 
     // dropped outside the list
     if (!result.destination) {

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

@@ -926,8 +926,8 @@ class TPMBanner extends Component {
                             className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证？</p>
                         </div>
                         <div className="task-popup-submit clearfix">
-                            <a onClick={this.hideForkvisible} className="task-btn fl">否</a>
+                            <a onClick={this.hideForkvisible} className="task-btn fl">取消</a>
-                            <a className="task-btn task-btn-orange fr" onClick={this.tocertification}>是</a>
+                            <a className="task-btn task-btn-orange fr" onClick={this.tocertification}>确定</a>
                         </div>
                     </Modal>
                     {!!shixunsDetails.fork_num &&

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

@@ -518,13 +518,6 @@ debugger
 												>
                             <span className="fl mr30 color-orange pt10">*</span>
 
-                            <style>
-                                {`            
-                                   .ant-select-dropdown{
-                                      top:1796px !important;
-                                    }
-                                `}
-                            </style>
                             <Select style={{width: 120}} className="winput-240-40 fl"
                                     id="challenge_score"
                                     onChange={this.props.status===2?"":this.onshixunsmark}

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

@@ -24,10 +24,7 @@ export default class TpmQuestionEdit extends Component {
 
 
 	render() {
-	  console.log(	this.props.neweditanswerRef)
+
-		console.log(	this.props.neweditanswerRefval)
-		console.log(	this.props.editanswersRef)
-		console.log(	this.props.editanswersRefval)
 		return (
 			<div>
 
@@ -133,17 +130,11 @@ export default class TpmQuestionEdit extends Component {
 					<p className="color-grey-6 font-16 mb30">奖励经验值</p>
 					<div className="clearfix"
 						// onMouseLeave={this.onshixunsmarkss}
+			    id="challenge_score"
 					>
 						<span className="fl mr30 color-orange pt10">*</span>
-						<style>
-							{`
-                                    .ant-select-dropdown{
-                                        top:2295px !important;
-                                    }
-                                    `}
-						</style>
 						<Select style={{width: 120}} className="winput-240-40 fl"
-										id="challenge_score"
+
 										disabled={this.props.status===2?true:false}
 										onChange={this.props.status===2?"":(e)=>this.props.onshixunsansweSelect(e)}
 							// onMouseEnter={this.onshixunsmarks}

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

@@ -138,13 +138,7 @@ export default class TpmQuestionNew extends Component {
 						// onMouseLeave={this.onshixunsmarkss}
 					>
 						<span className="fl mr30 color-orange pt10">*</span>
-						<style>
+		 
-							{`
-							.ant-select-dropdown{
-									top:2295px !important;
-							}
-							`}
-						</style>
 						<Select style={{width: 120}} className="winput-240-40 fl"
 										id="challenge_score"
 										onChange={(e)=>this.props.onshixunsansweSelect(e)}

public/react/src/modules/user/FindPasswordComponent.js

@@ -321,7 +321,7 @@ class LoginRegisterComponent extends Component {
 				type: 2,
 			}
 		}).then((result) => {
-			console.log(result);
+			// console.log(result);
 			if(result){
 				if(result.data.status===-2){
 						console.log(value.length);