From 529e50feb2dac2ca44abc696c8e84b24b9203c72 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 27 Jul 2019 16:46:05 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E7=AB=9E=E8=B5=9B-=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E7=9A=84logo=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index f26eb6ab..ab03c203 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 20px; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="width:40px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="width:130px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

From 82c5bac915016d3f843a7d648eb0158b5a42f23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 17:03:28 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/educoder/edu-all.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 373ec3bd..fda0c4b2 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -611,6 +611,11 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
 
 #competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;}
+#competition-header .logoimg{
+    margin-top: 5px;
+    float: left;
+    width: 97px;}
+
 .nav-game{position: relative;}
 .nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}
 .nav-game li a{color:#fff;font-size: 16px;}

From 7537e8e2c9c3736ab26a8541a87c1b96ad55a6a4 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 27 Jul 2019 17:19:10 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E7=AB=9E=E8=B5=9Blogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index ddd8fcad..c3cd42ce 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 20px; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="width:130px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="width:130px;margin-top:0px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

From dad6042e419fae2561336fdf19d4bd36f1023f2a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 17:36:58 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_unlogin_header.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 11aabde9..2efe2128 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -66,12 +66,12 @@
       <div class="edu-menu-list" style="top:60px;width: 240px;">
         <div class="overPart"></div>
         <ul class="fl with50 edu-txt-center pr ul-leftline">
-          <li><%= link_to "新建实训", signin_path, :remote => true %></li>
-          <li><%= link_to "新建实践课程", signin_path, :remote => true %></li>
-          <li><%= link_to "新建项目", signin_path, :remote => true %></li>
+          <li><%= link_to "新建实训", signin_path %></li>
+          <li><%= link_to "新建实践课程", signin_path %></li>
+          <li><%= link_to "新建项目", signin_path %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-          <li><%= link_to "加入课堂", signin_path, :remote => true %></li>
+          <li><%= link_to "加入课堂", signin_path %></li>
 <!--          <li><%#= link_to "加入项目", applied_join_project_path, :remote => true %></li>-->
         </ul>
       </div>

From b75ebe1a2442564dfeda90a2318e33933e93e06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 17:40:25 +0800
Subject: [PATCH 05/13] =?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/views/layouts/_logined_header.html.erb |  8 +++++---
 app/views/layouts/_unlogin_header.html.erb |  9 ++++++---
 public/react/src/modules/tpm/NewHeader.js  | 23 ++++++++++++++++------
 public/stylesheets/educoder/edu-all.css    |  4 ++--
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 5089fb28..3e01f7cb 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,7 +1,9 @@
-<div class="educontent clearfix">
-  <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<div class="educontent">
+
   <div class="head-nav pr">
     <ul id="header-nav">
+      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
@@ -70,7 +72,7 @@
       <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
     </ul>
   </div>
-  <div class="fr head-right">
+  <div class="fr head-right mr10">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon pointer">
       <i class="iconfont icon-sousuo color-white"></i>
     </a>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 17b5ea12..d17c2744 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,8 +1,11 @@
-<div class="educontent clearfix">
-  <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %>
+
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+
+<div class="educontent">
+
   <div class="head-nav pr">
     <ul id="header-nav">
-      <li class="active" style="display: none"><%= link_to "首页", home_path %></li>
+      <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
       <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index b62ab515..d5e601b8 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -352,15 +352,17 @@ class NewHeader extends Component {
 							</div>
 						</div>
 					</Modal>
-          	<div className="educontent clearfix">
+					<a href="/" className={"ml20 fl"}>
+						{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
+					</a>
+          	<div className="educontent">
 			  	{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-			  	<a href="/">
-            {ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
-			  	</a>
+
 			  	<div className="head-nav pr">
 
                     <ul id="header-nav">
                         {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
+											  <li><a href="/">首页</a></li>
                         <li><a href="/paths">实践课程</a></li>
                         <li><a href="/courses">翻转课堂</a></li>
 
@@ -399,7 +401,16 @@ class NewHeader extends Component {
                         <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">交流问答</a></li>
                         <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}</a></li>
                     </ul>
-				    <div className="posi-search" id="posi-search" style={{display: 'none'}}>
+						<style>
+							{
+								`
+								.mar55{
+									margin-right: 55px;
+								}
+								`
+							}
+						</style>
+				    <div className="posi-search mar55" id="posi-search" style={{display: 'none'}}>
 				        <div className="search-all clearfix">
 				          {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
 				          	<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>
@@ -464,7 +475,7 @@ class NewHeader extends Component {
                 </div>
 
 
-			  	<div className="fr head-right">
+			  	<div className="fr head-right mr10">
 				    <a href="javascript:void(0)" id="search-open" className="fl mr30 headIcon">
 				    	{/*"/images/educoder/icon/search.svg"
                              <img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */}
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index fda0c4b2..f9714ee6 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -6,8 +6,8 @@
     float: left;
     width: 97px;
 }
-.head-nav{float: left;width: 920px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
-.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
+.head-nav{float: left;width: 915px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
+.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
 .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
 .head-nav ul#header-nav li a:hover{color: #cccccc;}

From 2c39e2189858dfdd05f347ed0cdb131eca806cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 17:46:52 +0800
Subject: [PATCH 06/13] =?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/views/layouts/_logined_header.html.erb | 3 ++-
 app/views/layouts/_unlogin_header.html.erb | 4 ++--
 public/stylesheets/educoder/edu-all.css    | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 3e01f7cb..60b5c008 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -33,7 +33,8 @@
         </li>
       <% end %>
     </ul>
-    <div class="posi-search" id="posi-search" style="display: none">
+    <div class="posi-search mrf40" id="posi-search" style="
+    display: none">
       <div class="search-all clearfix">
         <div class="fl pr search-clear edu-menu-panel" style="display: none">
           <input type="hidden" id="search_type" value="1">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d17c2744..064adb96 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -31,7 +31,7 @@
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>
-    <div class="posi-search unlogin" id="posi-search" style="display: none" >
+    <div class="posi-search unlogin mrf40" id="posi-search" style="display: none" >
       <div class="search-all clearfix">
         <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
         <div class="fl pr search-clear edu-menu-panel" style="display: none">
@@ -59,7 +59,7 @@
     <a href="/register" class="mr5 color-white">注册</a>
     <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
     </span>
-  <div class="fr head-right">
+  <div class="fr head-right mr10">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon">
       <i class="iconfont icon-sousuo color-white"></i>
     </a>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index f9714ee6..0eafefc0 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3530,4 +3530,8 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 .vertical4{
     vertical-align: -4px;
     margin-right: 0px !important;
+}
+
+.mrf40{
+     margin-right: -40px;
 }
\ No newline at end of file

From 8754a9d7f47e366f8e9d33be9dc4e0f5159aaad9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 18:09:23 +0800
Subject: [PATCH 07/13] =?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/views/layouts/_logined_header.html.erb | 2 +-
 app/views/layouts/_unlogin_header.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 60b5c008..0ce03673 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,4 +1,4 @@
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
 <div class="educontent">
 
   <div class="head-nav pr">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index b5980e3e..9121732b 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,5 +1,5 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
 
 <div class="educontent">
 

From db483126ca4bdd38fcc4dca0e28665e74ce0913f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 18:10:06 +0800
Subject: [PATCH 08/13] b

---
 public/react/src/modules/tpm/NewHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index d5e601b8..af2b7fb6 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -352,7 +352,7 @@ class NewHeader extends Component {
 							</div>
 						</div>
 					</Modal>
-					<a href="/" className={"ml20 fl"}>
+					<a href="/" className={" fl"}>
 						{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
 					</a>
           	<div className="educontent">

From 7e7ba3734e76586292b88cff9d9e31bff0c882c9 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 18:16:47 +0800
Subject: [PATCH 09/13] =?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/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index c3cd42ce..d850637e 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 20px; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="width:130px;margin-top:0px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:0px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

From 5a3aaa6bf1e6e60a29f7a3acb48a860833807635 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 18:19:27 +0800
Subject: [PATCH 10/13] =?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/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index d850637e..3602a011 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 20px; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:0px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:5px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

From 370f34da0220aa7ec42296db6a3c2dc31c49ca11 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 18:20:22 +0800
Subject: [PATCH 11/13] =?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/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index 3602a011..81378705 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,5 +1,5 @@
 <div id="competition-header" class="clearfix">
-  <a href="/" style="margin: 10px 20px; display: inline-block;">
+  <a href="/" style="margin: 10px 0; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
           src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:5px">
   </a>

From 2beeb73610b42cd477f616bc9920e050a11e3652 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 27 Jul 2019 18:21:36 +0800
Subject: [PATCH 12/13] =?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/views/competitions/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb
index 81378705..1f66e525 100644
--- a/app/views/competitions/_header.html.erb
+++ b/app/views/competitions/_header.html.erb
@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 0; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:5px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="margin-top:6px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">

From 6d23fd55045ae3633a39cbd80aba161c12a84435 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sun, 28 Jul 2019 10:44:39 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/competitions_controller.rb | 86 ++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/app/controllers/competitions_controller.rb b/app/controllers/competitions_controller.rb
index 24f02037..e6112539 100644
--- a/app/controllers/competitions_controller.rb
+++ b/app/controllers/competitions_controller.rb
@@ -316,6 +316,92 @@ class CompetitionsController < ApplicationController
           rank = @records.map(&:id).index(team.id)
           team[:rank] = rank.present? ? (rank+1) : 0
         end
+      elsif @competition.identifier == 'gcc-task-2019'
+        if @type == "预赛" || @type == "决赛"
+          if @type == "预赛"
+            # 'nyog9r7c','yugrij4n','48flws5g','bfgau7s6','mfv6zrj7','f398leqr','qwaffs2p','ose7482b','y5wh2ofx'
+            # 预赛的实训id  第一阶段：1185，1197，1195  第二阶段：1202, 1210, 1207  第三阶段：1254，1255，1243
+            shixun1_id = [2303]
+            shixun2_id = [2994, 3012, 3014]
+            shixun3_id = [2944, 2938, 2943]
+          elsif @type == "决赛"
+            # '92b7vt8x','a7fxenvc','wt2xfzny','xa4m9cng','tng6heyf','am5o73er','9fla2zry','fzp3iu4w','qlsy6xb4'
+            # 预赛的实训id  第一阶段：1289，1373，1256  第二阶段：1488, 1453, 1487  第三阶段：1470, 1473, 1408
+            shixun1_id = Shixun.where(:identifier => ['92b7vt8x','a7fxenvc','wt2xfzny']).pluck(:id)
+            shixun2_id = Shixun.where(:identifier => ['xa4m9cng','tng6heyf','am5o73er']).pluck(:id)
+            shixun3_id = Shixun.where(:identifier => ['9fla2zry','fzp3iu4w','qlsy6xb4']).pluck(:id)
+          end
+
+          if @competition.competition_scores.where(:competition_stage_id => @stage.id).count == 0
+            # 三个阶段的开始时间和结束时间
+            s1_time = @stage.competition_stage_sections[0].start_time
+            e1_time = @stage.competition_stage_sections[0].end_time
+            s2_time = @stage.competition_stage_sections[1].start_time
+            e2_time = @stage.competition_stage_sections[1].end_time
+            s3_time = @stage.competition_stage_sections[2].start_time
+            e3_time = @stage.competition_stage_sections[2].end_time
+
+            @records = @competition.competition_teams.includes(:user => [:user_extensions => [:school]])
+            @records.each do |team|
+              user_ids = team.team_members.where(:is_teacher => 0).pluck(:user_id)
+              # 第一阶段的得分和耗时
+              challenges_1 = Challenge.where(:shixun_id => shixun1_id)
+              challenge_rate1 = 0.5
+              result1 = chart_exp_score_pre user_ids, s1_time, e1_time, challenges_1, challenge_rate1
+              score1 = result1[0]
+              time1 = result1[1]
+
+              # 第二阶段的得分和耗时
+              challenge_rate2 = 1.0
+              challenges_2 = Challenge.where(:shixun_id => shixun2_id)
+              result2 = chart_exp_score_pre user_ids, s2_time, e2_time, challenges_2, challenge_rate2
+              score2 = result2[0]
+              time2 = result2[1]
+
+
+              # 第三阶段的得分和耗时
+              challenges_3 = Challenge.where(:shixun_id => shixun3_id)
+              result3 = chart_exp_score_third user_ids, s3_time, e3_time, challenges_3
+              score3 = result3[0]
+              time3 = result3[1]
+
+              team[:s_score] = (score1 + score2 + score3).try(:round, 2)
+              team[:s_spend_time] = time1 + time2 + time3
+
+              # 比赛已截止且未有分数纪录 则创建
+              if Time.now > e3_time && team.competition_scores.where(:competition_id => @competition.id, :competition_stage_id => @stage.id).count == 0
+                CompetitionScore.create(:user_id => team.user_id, :competition_team_id => team.id, :competition_id => @competition.id, :competition_stage_id => @stage.id, :score => team[:s_score], :cost_time => team[:s_spend_time])
+              end
+            end
+          else
+            @records = CompetitionTeam.find_by_sql("SELECT teams.*, cs.score AS s_score, cs.cost_time AS s_spend_time FROM competition_teams teams, competition_scores cs WHERE cs.competition_team_id = teams.`id` AND cs.competition_stage_id = '#{@stage.id}'")
+          end
+        elsif @type == "总排行榜"
+          pre_stage = @competition.competition_stages.where(:name => "预赛").first
+          final_stage = @competition.competition_stages.where(:name => "决赛").first
+          @records = @competition.competition_teams.includes(:user => [:user_extensions => [:school]])
+          @records.each do |team|
+            # 决赛记录
+            f_score = team.competition_scores.where(:competition_stage_id => final_stage.try(:id)).first
+            # 预赛记录
+            p_score = team.competition_scores.where(:competition_stage_id => pre_stage.try(:id)).first
+            team[:s_score] = (f_score.try(:score).to_f * 0.85 + p_score.try(:score).to_f * 0.15).try(:round, 2)
+            team[:s_spend_time] = f_score.try(:cost_time).to_i + p_score.try(:cost_time).to_i
+          end
+        end
+
+        @records = @records.sort do |a, b|
+          [b[:s_score], a[:s_spend_time]] <=> [a[:s_score], b[:s_spend_time]]
+        end
+        current_team_ids = @competition.team_members.where(:user_id => User.current.id).pluck(:competition_team_id).uniq
+        @user_ranks = @records.select{|com_team| current_team_ids.include?(com_team.id)}
+        @records = @records.select{|record| record[:s_score] > 0}
+        @user_ranks.each do |team|
+          rank = @records.map(&:id).index(team.id)
+          team[:rank] = rank.present? ? (rank+1) : 0
+        end
+        records_length = 97
+        @records = @records[0..records_length]
       end
     else
       render_403