Merge branches 'dev_new_shixunsrepository' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

app/controllers/student_works_controller.rb

@@ -529,7 +529,7 @@ class StudentWorksController < ApplicationController
     @echart_data = student_efficiency(@homework, @work)
     @myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }
     @myself_consume = @echart_data[:consume_list].find { |item| item.last == @user.id }
-    filename_ = "#{@user&.student_id}_#{@user&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
+    filename_ = "#{@homework.course&.user_group_name(@work.user_id)}_#{@user&.student_id}_#{@user&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
     filename = filename_.strip.tr("+/", "-_")
     stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
     if params[:export].present? && params[:export]

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

@@ -734,7 +734,7 @@ background:rgba(204,204,204,0.2) !important;
 														}
 													`}
 												</style>
-												<Breadcrumb separator="|" className={"mt5"}>
+                        { excellent===true&&this.props.isAdminOrStudent()===false?"":<Breadcrumb separator="|" className={"mt5"}>
 
 													<Breadcrumb.Item className={"pointer"}>
 														<Tooltip getPopupContainer={trigger => trigger.parentNode}  visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
@@ -766,7 +766,7 @@ background:rgba(204,204,204,0.2) !important;
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
 													}</Breadcrumb.Item>
 
-												</Breadcrumb>
+												</Breadcrumb>}
 
                         {/*<li className={"mt7 teachersbox"}  >*/}
                           {/*<Link to={"/courses/"+this.props.match.params.coursesId+"/teachers"}>*/}

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

@@ -375,9 +375,7 @@ export function TPMIndexHOC(WrappedComponent) {
 				});
 
 			}
-      /**
+    
-        课堂权限相关方法，暂时写这里了 ----------------------------------------END
-      */
       fetchUser = () => {
         let url = `/users/get_user_info.json`
         let courseId;