diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 68222f8bd..af9896b01 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -8,6 +8,11 @@
         getTime(total_seconds);
     });
     function getTime(total_seconds) {
+        start_time = new Date($("#start_time").html());
+        end_time = start_time + 60*60*<%=exercise.time %>;
+        now = new Date();
+        //start = new Date(start_time);
+        //end_time = start_time;
         var total_seconds = total_seconds - 1;
         var hours = total_seconds / 60 / 60;
         var hoursRound = Math.floor(hours);
@@ -27,8 +32,9 @@
   <div class="resources">
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
+      <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
       <div class="fontGrey2">
-        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
+        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
         <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
         <span class="fr">剩余时长：<span class="c_red" id="rest_hours"></span>&nbsp;小时&nbsp;<span class="c_red" id="rest_minutes"></span>&nbsp;分钟&nbsp;<span class="c_red" id="rest_seconds"></span>&nbsp;秒</span>
       </div>
@@ -36,17 +42,16 @@
       <div class="cl"></div>
       <div class="cl"></div>
     </div>
-    <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
-    <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
-    <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1").shuffle %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2").shuffle %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3").shuffle %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
       <% mc_question_list.each_with_index do |exercise_question, list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= list_index+1%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
@@ -100,8 +105,7 @@
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= list_index + 1 %>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
@@ -155,8 +159,7 @@
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= list_index + 1%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                 </div>
                 <div class="cl"></div>
                 <div>
@@ -173,7 +176,7 @@
                               },
                               success: function (data) {
                                   var dataObj = eval(data);
-//                                obj.value = dataObj.text;
+                                  obj.value = dataObj.text;
                               }
                           });
 
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 8a723d75c..9ce136667 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -24,12 +24,11 @@
     <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
-      <% mc_question_list.each do |exercise_question| %>
+      <% mc_question_list.each_with_index do |exercise_question, list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
                     <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %>
                         √
@@ -62,12 +61,11 @@
     </div>
     <div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">多选题</h3>
-      <% mcq_question_list.each do |exercise_question| %>
+      <% mcq_question_list.each_wtih_index do |exercise_question, list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
                     <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %>
                         √
@@ -100,12 +98,11 @@
     </div>
     <div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">填空题</h3>
-      <% single_question_list.each do |exercise_question| %>
+      <% single_question_list.each_with_index do |exercise_question,list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
                   <span class="ml15 c_red">
                     <% if exercise_question.exercise_standard_answers.first.exercise_choice_id == exercise_question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{User.current.id}.first.exercise_choice_id ") %>
                         √
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index b803519ce..606b14aae 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -22,12 +22,12 @@
     <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
-      <% mc_question_list.each do |exercise_question| %>
+      <% mc_question_list.each_with_index do |exercise_question, list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %><br />
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
                   标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
                 </div>
                 <div class="cl"></div>
@@ -54,12 +54,12 @@
     </div>
     <div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">多选题</h3>
-      <% mcq_question_list.each do |exercise_question| %>
+      <% mcq_question_list.each_with_index do |exercise_question, index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %><br />
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
                   标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
                 </div>
                 <div class="cl"></div>
@@ -86,12 +86,12 @@
     </div>
     <div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">填空题</h3>
-      <% single_question_list.each do |exercise_question| %>
+      <% single_question_list.each_with_index do |exercise_question, list_index| %>
           <div id="poll_questions_<%= exercise_question.id%>">
             <div id="show_poll_questions_<%= exercise_question.id %>">
               <div>
-                <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-                  <%= exercise_question.question_title %><br />
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
                   标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
                 </div>
                 <div class="cl"></div>