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

app/controllers/graduation_tasks_controller.rb

@@ -149,6 +149,7 @@ class GraduationTasksController < ApplicationController
         else
           respond_to do |format|
             format.xlsx{
+              set_export_cookies
               graduation_work_to_xlsx(@work_excel,@task,current_user)
               task_export_name_ = "#{current_user.real_name}_#{@course.name}_#{@task.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
               render xlsx: "#{task_export_name_.strip}",template: "graduation_tasks/tasks_list.xlsx.axlsx",locals: {table_columns:@head_cells_column, task_users:@task_cells_column}

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

@@ -120,9 +120,9 @@ class ExerciseNewCommon extends Component{
   componentDidMount = () => {
     this.fetchExercise()
   }
-  handleSubmit = (e) => {
+  // handleSubmit = (e) => {
-    
+  //
-  }
+  // }
   onSaveExercise = () => {
     const { exercise_name, exercise_description } = this.state;
     const exercise_id = this.props.match.params.Id
@@ -472,7 +472,9 @@ class ExerciseNewCommon extends Component{
               ></div>
               
             </div>}
-            {this.state.editMode && <Form {...formItemLayout} onSubmit={this.handleSubmit}>
+            {this.state.editMode && <Form {...formItemLayout}
+																					// onSubmit={this.handleSubmit}
+						>
               <div className="formBlock" style={{paddingBottom: '2px',borderBottom:"none"}}>
                 <Form.Item
                   label="试卷标题"

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

@@ -411,7 +411,7 @@ class Testpapersettinghomepage extends Component{
                                 </div>
 
                                 {
-                                    isAdmin  === true &&Commonheadofthetestpaper && Commonheadofthetestpaper.user_permission.user_commit_counts>0?
+                                    isAdmin  === true &&Commonheadofthetestpaper && Commonheadofthetestpaper.user_permission.user_commit_counts>0&&Commonheadofthetestpaper.exercise_status===2?
                                       <a className="fr color-blue font-16 mt20 mr20" onClick={this.Ecerciseacallagain}>打回重做</a>:""
                                 }
 

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -218,7 +218,7 @@ class Bullsubdirectory extends Component{
 		const {getFieldDecorator} = this.props.form;
 		// console.log("Bullsubdirectory");
 		// console.log(this.props.isAdmin());
-		// console.log(this.props.yslbool);
+    //  console.log(this.props);
 		return(
 			<React.Fragment  >
 				<div >
@@ -274,7 +274,7 @@ class Bullsubdirectory extends Component{
 															</div>
 															<div id="MakedownHTML"className="markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"   dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
 														</div>
-														<div className="bor-bottom-greyE mr25 ml25"></div>
+														{parseInt(this.props&&this.props.informs.length)===parseInt(this.props&&this.props.index+1)?"":<div className="bor-bottom-greyE mr25 ml25"></div>}
 													</div>
 													:
 													<div  className="edu-back-white ">

public/react/src/modules/courses/gradinforms/Eduinforms.js

@@ -493,7 +493,7 @@ class Eduinforms extends Component{
 														<div  className="edu-back-white ">
 															{ informs&&informs.map((item, index) => {
 																return (
-																	<Bullsubdirectory {...this.state} {...this.props}  key={index} yslbool={yslbool} id={item.id} myname={item.name} mydescription={item.description}
+																	<Bullsubdirectory {...this.state} {...this.props}  key={index} index={index} yslbool={yslbool} id={item.id} myname={item.name} mydescription={item.description}
 																										getyslbooltrue={()=>this.getyslbooltrue()}
 																										getyslboolfalse={()=>this.getyslboolfalse()}
 																										getinputdata={()=>this.getinputdata()} ></Bullsubdirectory>