fix

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

@@ -403,10 +403,6 @@ class ShixunWorkReport extends Component {
 						{this.props.isAdmin() ?<a
 							className=" color-blue font-14 fr  ml20 mt15"
 							onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
-						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:
-							parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a
-								className=" color-blue font-14 fr  ml20 mt15"
-								onClick={() => this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
 						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:
 							parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a
 								className=" color-blue font-14 fr  ml20 mt15"
@@ -541,6 +537,8 @@ class ShixunWorkReport extends Component {
 									   	 </p>
 
 									</div>
+
+								</div>
 							</div>
               <ConclusionEvaluation
 	              data={data}
@@ -716,4 +714,3 @@ class ShixunWorkReport extends Component {
 
 export default ShixunWorkReport;
 
-

public/react/src/modules/courses/statistics/Statistics.js

@@ -422,11 +422,7 @@ class Statistics extends Component{
 			{
 				this.props.isAdmin()===true?
 					// 这里是文件下载 不能替换路由
-<<<<<<< HEAD
-					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/classrooms/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
-=======
 					<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
->>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
 					:""
 			}
 		</React.Fragment>;

public/react/src/modules/ecs/subroute/ecStudentList/EcStudentList.js

@@ -126,10 +126,6 @@ class EcStudentList extends Component {
                 console.log(error);
             });
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
 
 
     windowsgoblack = () => {

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

@@ -430,7 +430,7 @@ class LoginDialog extends Component {
       console.log(error)
     })
 
-  };
+  })};
   setNotcompleteds = () => {
     this.setState({
       Notcompleteds: true,

public/react/src/modules/modals/Modals.js

@@ -59,7 +59,6 @@ class Modals extends Component {
                 }
               </div>
             }
-          </div>
         </Spin>
       </Modal>
     )