Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/ecs/reach_criteria_controller.rb

@@ -1,4 +1,4 @@
-class ReachCriteriaController < Ecs::BaseController
+class Ecs::ReachCriteriaController < Ecs::BaseController
   before_action :check_major_manager_permission!, only: [:create]
 
   def create

app/controllers/games_controller.rb

@@ -431,6 +431,7 @@ class GamesController < ApplicationController
   # params[:status] 1: 目录树点击的请求 0：正常自动加载
   # 返回参数status ： -1 系统统一报错提示；-3 需要轮训重试，带retry参数；-4 立即重试
   def rep_content
+    raise("666")
     challenge_path = @game.challenge.try(:path)
     if challenge_path.blank?
       tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")

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

@@ -1837,7 +1837,7 @@ class Trainingjobsetting extends Component {
                             flagPageEditsfor:endtime,
                             completionefficiencyscore:true,
                             work_efficiencys:true,
-                            unifiedsetting:datas.data.unifiedsetting,
+                            unifiedsetting:datas.data.unified_setting,
                             latedeductiontwo:20,
                         });
                         //均分比例
@@ -1862,9 +1862,9 @@ class Trainingjobsetting extends Component {
                             flagPageEditstwo:releasetime,
                             flagPageEditsthrees:deadline,
                             flagPageEditsfor:endtime,
-                            unifiedsetting:datas.data.unifiedsetting,
+                            unifiedsetting:datas.data.unified_setting,
                         });
-                        if(datas.data.work_efficiencys===true){
+                        if(datas.data.work_efficiency===true){
                             this.setState({
                                 completionefficiencyscore:true,
                             })
@@ -1882,9 +1882,9 @@ class Trainingjobsetting extends Component {
                         flagPageEditstwo:releasetime,
                         flagPageEditsthrees:deadline,
                         flagPageEditsfor:endtime,
-                        unifiedsetting:datas.data.unifiedsetting,
+                        unifiedsetting:datas.data.unified_setting,
                     });
-                    if(datas.data.work_efficiencys===true){
+                    if(datas.data.work_efficiency===true){
                         this.setState({
                             completionefficiencyscore:true,
                         })