Merge branch 'develop' into dev_aliyun

app/helpers/export_helper.rb

@@ -851,7 +851,8 @@ module ExportHelper
   def make_zip_name(work, file_name="")
     Rails.logger.info("######################file_name: #{file_name}")
     # name = file_name === "" ? "" : (file_name[0, file_name.rindex('.')]+"_")
-    "#{work&.homework_common.course&.user_group_name(work.user_id)}_#{work&.user&.student_id}_#{work&.user&.real_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
+    course = work&.homework_common.course || work&.graduation_task.course
+    "#{course&.user_group_name(work.user_id)}_#{work&.user&.student_id}_#{work&.user&.real_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
   end
 
   def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])

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

@@ -523,7 +523,7 @@ class GraduationTaskDetail extends Component{
 									导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 									<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
 										<li><a onClick={()=>this.child.confirmysl(`/graduation_tasks/${task_Id}/tasks_list.xlsx`)} className="color-dark">导出成绩</a></li>
-										<li><a onClick={()=>this.child.confirmysl(`/graduation_tasks/${task_Id}/tasks_list.xlsx`)} className="color-dark">导出作品附件</a></li>
+										<li><a onClick={()=>this.child.confirmysl(`/graduation_tasks/${task_Id}/tasks_list.zip`)} className="color-dark">导出作品附件</a></li>
 									</ul>
 								</li>:""}
 								{questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{