diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb
index 6897ef6b5..299ba1aa5 100644
--- a/app/views/homework_attach/_history.erb
+++ b/app/views/homework_attach/_history.erb
@@ -19,7 +19,7 @@
               <div class="ping_discon" style="width: 85%;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span>
+                  <span><%= link_to journal.user, user_path(journal.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= journal.created_on %></span>
                   <div class="cl"></div>
                   <p><%= textilizable journal.notes%></p>
                 </div>
diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
new file mode 100644
index 000000000..7e2bf8eee
--- /dev/null
+++ b/app/views/homework_attach/_jour.html.erb
@@ -0,0 +1,24 @@
+<div class="ping_C">
+  <div class="ping_dispic"><a target="_blank" href="#"><%= image_tag(url_to_avatar(jour.user))  %></a></div>
+  <div class="ping_discon">
+    <div class="ping_distop">
+      <span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
+      <div class="cl"></div>
+      <p><%= textilizable jour.notes%></p>
+    </div>
+    <div class="ping_disfoot">
+      <% ids = 'project_respond_form_'+ jour.id.to_s%>
+      <span>
+                <%= link_to l(:label_projects_feedback_respond),'',
+                            {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{jour.user.name}: '); $('##{ids} textarea') ;return false;"}
+                %>
+        <% if jour.user==User.current|| User.current.admin? %>
+                    <%= link_to(l(:label_bid_respond_delete), {:controller => 'homework_attach', :action => 'destroy_jour', :object_id => jour, :user_id => jour.user},
+                                :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
+                <% end %>
+             </span>
+    </div>
+
+  </div>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb
index 28b1cc0e8..b23c98823 100644
--- a/app/views/homework_attach/_show.html.erb
+++ b/app/views/homework_attach/_show.html.erb
@@ -1,3 +1,5 @@
+<% reply_allow = JournalsForMessage.create_by_user? User.current %>
+
 <script type="text/javascript" language="javascript">
       //<!CDATA[
       function g(o){return document.getElementById(o);}
@@ -49,11 +51,19 @@
     </p>
 
     <div class="ping_star">
-      <%= l(:label_work_rating) %>：
-      <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
+      <% if @is_comprehensive_evaluation == 3 %>
+
+      <% elsif  @is_comprehensive_evaluation == 2 %>
+          <%= l(:label_work_rating) %>：
+          <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
+      <% elsif @is_comprehensive_evaluation == 1%>
+          <%= l(:label_work_rating) %>：
+          <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
+      <% end %>
+
     </div>
     <div class="cl"></div>
-    <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
+    <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %>
     <!-- <textarea id="ta_msg_content" name="content" placeholder="最多250个字"></textarea>
     <a href="#" class="ping_sub">提交评论</a> -->
     <div class="cl"></div>
@@ -63,127 +73,31 @@
     <div id="ping_tb_" class="ping_tb_">
       <ul>
         <li id="ping_tb_4" class="ping_normaltab" onmouseover="i:HoverLi(4);">
-          <%= l(:label_teacher_comments) %>（<span class="c_red">30</span>）</li>
+          <%= l(:label_teacher_comments) %>（<span class="c_red"><%= @comprehensive_evaluation.count == 0 ? 0:1 %></span>）</li>
         <li id="ping_tb_5" class="ping_normaltab" onmouseover="i:HoverLi(5);">
-          <%= l(:label_anonymous_comments) %>（<span class="c_red">30</span>）</li>
+          <%= l(:label_anonymous_comments) %>（<span class="c_red"><%= @anonymous_comments.count %></span>）</li>
         <li id="ping_tb_3" class="ping_hovertab" onmouseover="x:HoverLi(3);">
-          <%= l(:label_responses) %>（<span class="c_red">30</span>）</li>
+          <%= l(:label_responses) %>（<span class="c_red"><%= @jours.count %></span>）</li>
       </ul>
     </div>
     <div class="cl"></div>
     <div class="ping_ctt">
       <div class="ping_dis" id="tbc_03">
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就说明你写框架写多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-
-          </div>
-          <div class="cl"></div>
-        </div>
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就说明你写框架写多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-            <div class="cl"></div>
-            <div class="recall">
-              <div class="recall_head"><a href="#" target="_blank"><img src="images/225905790.jpg" width="30" height="30"></a></div>
-              <div class="recall_con">
-                <a href="#">jack</a>&nbsp;回复&nbsp;<a href="#">jack</a>:
-                <p>我们尽快修复，此问题已发现原因，测试后我们尽快上线。谢谢反馈！！</p>
-                <span style="float:left; color:#a6a6a6;">2014-10-31</span>
-                <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-              </div>
-              <div class="cl"></div>
-            </div>
-            <div class="recall">
-              <div class="recall_head"><a href="#" target="_blank"><img src="images/225905790.jpg" width="30" height="30"></a></div>
-              <div class="recall_con">
-                <a href="#">jack</a>&nbsp;回复&nbsp;<a href="#">jack</a>:
-                <p>我们尽快修复，此问题已发现原因，测试后我们尽快上线。谢谢反馈！！</p>
-                <span style="float:left; color:#a6a6a6;">2014-10-31</span>
-                <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-              </div>
-              <div class="cl"></div>
-            </div>
-
-
-          </div>
-          <div class="cl"></div>
-        </div>
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就说明你写框架写多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-
-
-          </div>
-          <div class="cl"></div>
-        </div>
-
+        <% @jours.each do |jour| %>
+            <%= render :partial => 'homework_attach/jour',:locals => {:jour => jour} %>
+        <% end %>
       </div><!--全部评论end-->
 
       <div class="ping_undis" id="tbc_04">
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-
-
-          </div>
-          <div class="cl"></div>
-        </div>
-
+         <% if  @comprehensive_evaluation.count > 0 %>
+            <%= render :partial => 'homework_attach/jour',:locals => {:jour => @comprehensive_evaluation.first} %>
+         <% end %>
       </div>
       <div class="ping_undis" id="tbc_05">
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-
-
-          </div>
-          <div class="cl"></div>
+        <%= @anonymous_comments.each do |jour| %>
+            <%= render :partial => 'homework_attach/jour',:locals => {:jour => jour} %>
+        <% end %>
       </div>
-        <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46"></a></div>
-          <div class="ping_discon">
-            <div class="ping_distop">
-              <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;">gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;">2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
-              <div class="cl"></div>
-              <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，多了，或者</p>
-            </div>
-            <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
-
-
-          </div>
-          <div class="cl"></div>
-        </div>
 
     </div>
 
diff --git a/app/views/homework_attach/_showjour.html.erb b/app/views/homework_attach/_showjour.html.erb
index 529767138..215767a19 100644
--- a/app/views/homework_attach/_showjour.html.erb
+++ b/app/views/homework_attach/_showjour.html.erb
@@ -64,15 +64,15 @@
                   <%= l(:label_bids_published_ago) %>
                 </span>
               <% ids = 'project_respond_form_'+ journal.id.to_s%>
-              <span>
+            <span>
                 <%= link_to l(:label_projects_feedback_respond),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
                 %>
-                <% if journal.user==User.current|| User.current.admin? %>
+              <% if journal.user==User.current|| User.current.admin? %>
                     <%= link_to(l(:label_bid_respond_delete), {:controller => 'homework_attach', :action => 'destroy_jour', :object_id => journal, :user_id => journal.user},
                                 :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
                 <% end %>
-                </span>
+             </span>
             </span>
             <div style="clear: both;"></div>
             <div id='<%= ids %>' class="respond-form">