From 6e6a3181625a226d7b21bb38c6e14f551b55dbd3 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 8 Mar 2019 17:07:55 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=20/*=20=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAitem=20=E5=8D=A0=E6=BB=A1=E5=89=A9=E4=BD=99=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=20*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/ec/ecTitle/ecTitle.css | 11 +++++++++++
 public/react/src/modules/ec/ecTitle/ecTitle.js  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.css b/public/react/src/modules/ec/ecTitle/ecTitle.css
index 402465be..332e6142 100644
--- a/public/react/src/modules/ec/ecTitle/ecTitle.css
+++ b/public/react/src/modules/ec/ecTitle/ecTitle.css
@@ -1,3 +1,14 @@
+#traningNav {
+    display: flex 
+}
+ #traningNav>li {
+    float: none !important;
+}
+ /* 最后一个item 占满剩余空间 */
+#traningNav>li:last-child{
+    flex: 1;
+}
+
 #traningNav>li>.ecTitle {
     width: 24px;
     height: 24px;
diff --git a/public/react/src/modules/ec/ecTitle/ecTitle.js b/public/react/src/modules/ec/ecTitle/ecTitle.js
index e16a8080..0c6d4e7d 100644
--- a/public/react/src/modules/ec/ecTitle/ecTitle.js
+++ b/public/react/src/modules/ec/ecTitle/ecTitle.js
@@ -32,7 +32,7 @@ class EcTitleCourseEvaluations extends Component {
 
                 </div>
 
-                <ul className="clearfix mb0 traningNavs " id="traningNav" style={{display:ecpaths==='none'?"none":"block"}}>
+                <ul className="clearfix mb0 traningNavs " id="traningNav" style={{display:ecpaths==='none'?"none":"flex"}}>
                     <li className={"ecimgs"}>
                         <a className={"ecTitle ecTitles"} >1</a>
                         <a className={"ecTitlefont"} href={schooldata.major_training}>培养目标</a>

From 1208818c9dc1b54546f7b27846196c3317e449ef Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 9 Mar 2019 14:41:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 5e465ece..6bcf7c8e 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -848,7 +848,8 @@ class ManagementsController < ApplicationController
 
     @evaluate_recods_count = @evaluate_recods.count
     @evaluate_recods_pages = Paginator.new @evaluate_recods_count, limit, page
-    @evaluate_recods = @evaluate_recods.includes(:shixun, :user).page(page).per(limit)
+    @evaluate_recods = @evaluate_recods.page(page).per(limit)
+    @evaluate_recods = @evaluate_recods.includes(:shixun, :user)
     respond_to do |format|
       format.js
       format.html

From a3caf72e2496a3556dd07231f18b26b762dddf8c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 9 Mar 2019 14:48:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 6bcf7c8e..ade104e9 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -843,7 +843,7 @@ class ManagementsController < ApplicationController
         # @evaluate_recods = EvaluateRecord.where(user_id: UserExtensions.where(school_id: School.where("name like '%#{search}%'").pluck(:id)).pluck(:user_id))
       end
     else
-      @evaluate_recods = EvaluateRecord.all
+      @evaluate_recods = EvaluateRecord.where("0=0")
     end
 
     @evaluate_recods_count = @evaluate_recods.count

From bc0c8e51710bca195ee774eb6f83b54eaa2ed954 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 9 Mar 2019 14:52:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index ade104e9..04c70e0f 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -836,10 +836,10 @@ class ManagementsController < ApplicationController
 
     if search
       if "u_name" == keyword
-        @evaluate_recods = EvaluateRecord.joins("join users u on evaluate_records.user_id = u.id").where("concat(u.lastname, u.firstname) like '%#{@search}%'")
+        @evaluate_recods = EvaluateRecord.joins("join users u on evaluate_records.user_id = u.id").where("concat(u.lastname, u.firstname) like '%#{search}%'")
         # @evaluate_recods = EvaluateRecord.where(user_id: User.where("concat(lastname, firstname) like '%#{search}%'").pluck(:id))
       else
-        @evaluate_recods = EvaluateRecord.joins("join user_extensions ue on evaluate_records.user_id = ue.user_id").where("ue.school_id in (select id from schools where name like '%#{@search}%')")
+        @evaluate_recods = EvaluateRecord.joins("join user_extensions ue on evaluate_records.user_id = ue.user_id").where("ue.school_id in (select id from schools where name like '%#{search}%')")
         # @evaluate_recods = EvaluateRecord.where(user_id: UserExtensions.where(school_id: School.where("name like '%#{search}%'").pluck(:id)).pluck(:user_id))
       end
     else