From 9348cc9c241a3bf0a2dfeb0163e3bd6b2008d970 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 30 Dec 2015 15:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_title.html.erb | 6 ++++++
 app/views/student_work/_evaluation_work.html.erb  | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 7398dbee1..1e006a6a6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -13,6 +13,12 @@
     时间
   </li>
 
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30">
+        系统
+      </li>
+  <% end%>
+
   <li class="hworkList50 hworkH30 fb mr10 ml10">
     我的评分
   </li>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index db680cbec..e65d4f267 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -75,6 +75,13 @@
   </li>
 
   <!-- 成绩 -->
+  <% if @homework.homework_type == 2%>
+      <!-- 系统评分 -->
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
+        <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+      </li>
+  <% end%>
+
   <% my_score = student_work_score(student_work,User.current) %>
   <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>