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

app/controllers/ecs/graduation_subitems_controller.rb

@@ -1,5 +1,6 @@
 class Ecs::GraduationSubitemsController < Ecs::BaseController
   def index
-    @graduation_subitems = current_year.ec_graduation_subitems#.reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC')
+    subitems = current_year.ec_graduation_subitems.reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC')
+    @graduation_subitems = subitems.includes(:ec_graduation_requirement)
   end
 end

app/views/ecs/graduation_course_supports/shared/_ec_graduation_subitem.json.jbuilder

@@ -2,5 +2,5 @@ json.extract! ec_graduation_subitem, :id, :position, :content, :ec_graduation_re
 
 json.graduation_requirement_position ec_graduation_subitem.ec_graduation_requirement.position
 
-json.course_supports ec_graduation_subitem.ec_course_supports, partial: 'ec_course_support', as: :ec_course_support
+json.course_supports ec_graduation_subitem.ec_course_supports, partial: 'ecs/graduation_course_supports/shared/ec_course_support', as: :ec_course_support
 json.weights_total ec_graduation_subitem.ec_course_supports.to_a.sum(&:weights)

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

@@ -301,9 +301,8 @@ export function TPMIndexHOC(WrappedComponent) {
 						chinaoocKey:this.state.dataquerys.chinaoocKey,
 					}
 				}
-        axios.get(url,{params:{
+        axios.get(url,{params:
 							datay
-            }
         },
             {
               // withCredentials: true
@@ -366,9 +365,8 @@ export function TPMIndexHOC(WrappedComponent) {
 						chinaoocKey:yslurlobject.chinaoocKey,
 					}
 				}
-				axios.get(url,{params:{
+				axios.get(url,{params:
 							datay
-						}
 					},
 					{
 						// withCredentials: true