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

app/controllers/add_school_applies_controller.rb

@@ -1,5 +1,5 @@
 class AddSchoolAppliesController < ApplicationController
-  before_action :require_login, :check_auth
+  before_action :require_login
 
   def create
     school = CreateAddSchoolApplyService.call(current_user, create_params)

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

@@ -1017,6 +1017,7 @@ class Listofworksstudentone extends Component {
 				view_report: result.data.view_report,
 				allow_late:result.data.allow_late,
 				loadingstate: false,
+				computeTimetype:true,
 			})
 			this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
 

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

@@ -1698,14 +1698,14 @@ class Trainingjobsetting extends Component {
             if(rules[i].course_group_id instanceof Array ){
                 datas.push({
                     group_id:rules[i].course_group_id,
-                    publish_time: moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
-                    end_time:moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
+                    publish_time:rules[i].publish_time===undefined||rules[i].publish_time===null||rules[i].publish_time===""?"": moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
+                    end_time:rules[i].end_time===undefined||rules[i].end_time===null||rules[i].end_time===""?"": moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
                 });
             }else {
                 datas.push({
                     group_id:[rules[i].course_group_id],
-                    publish_time: moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
-                    end_time:moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
+                    publish_time: rules[i].publish_time===undefined||rules[i].publish_time===null||rules[i].publish_time===""?"": moment(rules[i].publish_time).format('YYYY-MM-DD HH:mm') ,
+                    end_time:rules[i].end_time===undefined||rules[i].end_time===null||rules[i].end_time===""?"": moment(rules[i].end_time).format('YYYY-MM-DD HH:mm') ,
                 });
             }