Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/views/ec_years/_course_lists.html.erb

@@ -46,13 +46,16 @@
         </label>
       </span>
       <span class="column-11 edu-txt-center">
-        <label class="color-red-dd">
           <% if course.ec_course_targets.count == 0 %>
-          --
+            --
-          <% else  %>
+          <% else %>
-            <%= course.complete_target_count == course.ec_course_targets.count ? "达成" : "未达成" %>
+            <% if course.complete_target_count == course.ec_course_targets.count %>
+                <label class="color-green">达成</label>
+            <% else %>
+                <label class="color-red-dd">未达成</label>
+            <% end %>
+            <%#= course.complete_target_count == course.ec_course_targets.count ? "达成" : "未达成" %>
           <% end %>
-        </label>
       </span>
       <span class="column-10 fl edu-txt-left">
           <% if course_manager || @template_major %>