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

app/controllers/courses_controller.rb

@@ -27,7 +27,7 @@ class CoursesController < ApplicationController
                                      :attahcment_category_list,:export_member_scores_excel, :duplicate_course,
                                      :switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
-                                    :join_excellent_course, :export_couser_info, :export_member_act_score]
+                                    :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs]
   before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
                                                 :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,

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

@@ -60,7 +60,10 @@ class ShixunWorkReport extends Component {
 			console.log(error)
 		});
 	}
-
+	//打开pdf
+	confpdf = (url) =>{
+		window.open(url);
+	}
 	Downloadcal=()=>{
 		this.setState({
 			DownloadType:false,
@@ -160,7 +163,8 @@ class ShixunWorkReport extends Component {
 						<a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt15 mr20">返回</a>
 						{this.props.isAdmin() ? <a
 							className=" color-blue font-16 fr  ml30 mt15 mr20"
-							onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
+							// onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
+							onClick={()=>this.confpdf(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
 						>导出实训报告数据</a> : ""}
 					</div>