Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_local

app/views/exercise/_edit_shixun.html.erb

@@ -181,6 +181,13 @@
 
 
 
+
+
+
+
+
+
+
 <script type="text/javascript">
     $(function(){
         //保存

app/views/exercise/_new_shixun.html.erb

@@ -111,6 +111,7 @@
 
       <% end %>
 
+
     </div>
 <% end %>
 <script type="text/javascript">

app/views/exercise/_show_shixun.html.erb

@@ -1,31 +1,94 @@
 <div class="question_item_con font-14 user_bg_shadow bor-grey-e mb20 pt15">
   <div class="clearfix pl15 pr15">
-    <p class="fl font-15">第<%= exercise_question.question_number %>题:<span class="color-orange03 ml10">[实训题]</span><span class="ml10"><%= exercise_question.question_score %></span>分</p>
-    <% if @exercise.exercise_status == 1 %>
-        <p class="fr exam_operator font-18">
-          <%= link_to '实训详情', shixun_path(exercise_question.shixun), :target => "_blank", :class => "mr5 white-btn orange-btn" %>
-          <% if exercise_question.question_number < @exercise.exercise_questions.count %>
-              <a href="<%= update_question_num_exercise_path(@exercise, :ques_id => exercise_question.id, :opr => 'down') %>" data-remote="true" class="down_question"><i data-tip-down="下移" class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>
-          <% end %>
-          <% unless exercise_question.question_number == 1 %>
-              <a href="<%= update_question_num_exercise_path(@exercise, :ques_id => exercise_question.id, :opr => 'up') %>" data-remote="true" class="up_question"><i data-tip-down="上移" class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>
-          <% end %>
-          <a href="javascript:void(0)" class="add_question" onclick="insert_SHIXUN(<%=exercise_question.id%>,this);"><i data-tip-down="向下插入简答题" class="fa fa-plus-circle mr10 color-orange05"></i></a>
-          <a href="javascript:void(0)" onclick="delete_confirm_box('<%= delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number) %>', '确定要删除该题目吗？')"><i data-tip-down="删除" class="fa fa-times-circle mr10 color-orange05"></i></a>
-          <a href="javascript:void(0)" onclick="exQuestionEdit(<%= exercise_question.id%>, <%= exercise_question.question_type %>);"><i data-tip-down="编辑" class="fa fa-pencil color-orange05"></i></a>
-        </p>
-    <% end %>
-  </div>
-  <p class="pl15 pr15 mb10"><%= exercise_question.shixun.name %></p>
-  <div class="pl15 pr15 justify upload_img table_maxWidth break_word"><%= exercise_question.question_title.html_safe %></div>
-  <div class="pl15 pr15 pt10 pb10 bor-top-greyE">
-    <% exercise_question.exercise_shixun_challenges.each_with_index do |exercise_challenge,index| %>
-        <li class="clearfix">
-          <span class="fl">第<%= index + 1 %>关</span>
-          <span class="fl task-hide ml20" style="display: block; max-width: 80%"><%= exercise_challenge.challenge.subject %></span>
-          <span class="fl ml20" style="display: block;"><%= exercise_challenge.question_score %>分</span>
+<!--    <p class="fl font-15">第<%#= exercise_question.question_number %>题:<span class="color-orange03 ml10">[实训题]</span><span class="ml10"><%#= exercise_question.question_score %></span>分</p>-->
+    <%# if @exercise.exercise_status == 1 %>
+<!--        <p class="fr exam_operator font-18">-->
+          <%#= link_to '实训详情', shixun_path(exercise_question.shixun), :target => "_blank", :class => "mr5 white-btn orange-btn" %>
+          <%# if exercise_question.question_number < @exercise.exercise_questions.count %>
+<!--              <a href="<%#= update_question_num_exercise_path(@exercise, :ques_id => exercise_question.id, :opr => 'down') %>" data-remote="true" class="down_question"><i data-tip-down="下移" class="fa fa-arrow-circle-down mr10 color-orange05"></i></a>-->
+          <%# end %>
+          <%# unless exercise_question.question_number == 1 %>
+<!--              <a href="<%#= update_question_num_exercise_path(@exercise, :ques_id => exercise_question.id, :opr => 'up') %>" data-remote="true" class="up_question"><i data-tip-down="上移" class="fa fa-arrow-circle-up mr10 color-orange05"></i></a>-->
+          <%# end %>
+<!--          <a href="javascript:void(0)" class="add_question" onclick="insert_SHIXUN(<%#=exercise_question.id%>,this);"><i data-tip-down="向下插入简答题" class="fa fa-plus-circle mr10 color-orange05"></i></a>-->
+<!--          <a href="javascript:void(0)" onclick="delete_confirm_box('<%= delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number) %>', '确定要删除该题目吗？')"><i data-tip-down="删除" class="fa fa-times-circle mr10 color-orange05"></i></a>-->
+<!--          <a href="javascript:void(0)" onclick="exQuestionEdit(<%#= exercise_question.id%>, <%#= exercise_question.question_type %>);"><i data-tip-down="编辑" class="fa fa-pencil color-orange05"></i></a>-->
+<!--        </p>-->
+    <%# end %>
+<!--  </div>-->
+<!--  <p class="pl15 pr15 mb10"><%#= exercise_question.shixun.name %></p>-->
+<!--  <div class="pl15 pr15 justify upload_img table_maxWidth break_word"><%#= exercise_question.question_title.html_safe %></div>-->
+<!--  <div class="pl15 pr15 pt10 pb10 bor-top-greyE">-->
+    <%# exercise_question.exercise_shixun_challenges.each_with_index do |exercise_challenge,index| %>
+<!--        <li class="clearfix">-->
+<!--          <span class="fl">第<%#= index + 1 %>关</span>-->
+<!--          <span class="fl task-hide ml20" style="display: block; max-width: 80%"><%#= exercise_challenge.challenge.subject %></span>-->
+<!--          <span class="fl ml20" style="display: block;"><%#= exercise_challenge.question_score %>分</span>-->
+<!--        </li>-->
+    <%# end %>
+
+    <div class="user_bg_shadow bor-grey-e mb20 answer_Temp edu-back-white practicalTemp" id="answer_Temp">
+
+      <div class="fl mt15 font-16 mb10 padding10 practicalTitlefont">
+        <span class="colorFF8121s">[实训题]</span>（100分）
+        <!--       试卷列表不展示三个按钮-->
+        <i data-tip-down="编辑" class="fa fa-pencil color-orange05 fr mr10"></i>
+        <i data-tip-down="删除" class="fa fa-times-circle mr10 color-orange05 fr"></i>
+        <i data-tip-down="向下插入实训题" class="fa fa-plus-circle mr10 color-orange05 fr"></i>
+      </div>
+
+
+      <ul class="fl" id="ul">
+        <li id="0">
+          <div class="fl font-16 mb10 practicalTitle">
+
+            <span class="Titlefont">初级题</span>
+
+            <div class="fr mr40 shixun-title-font">
+              分值：10 分/题
+            </div>
+
+            <div class="fr mr40 shixun-title-font width200">
+              随机出题量：2
+            </div>
+
+          </div>
+
+          <div class="fl  mb10 shixunsbox" id="shixunsbox0">
+
+            <div>
+              <a class="shixunsboxfont">命令加密ZPI压缩文件解压</a>
+              <span class="shixundelect">
+                       <a  class="white-btn orange-btn fr mr20 mt3" onclick="">+&nbsp;实训详情</a>
+                </span>
+
+            </div>
+
+            <div>
+              <a class="shixunsboxfont">命令加密ZPI压缩文件解压</a>
+              <span class="shixundelect">
+                     <a  class="white-btn orange-btn fr mr20 mt3" onclick="">+&nbsp;实训详情</a>
+                </span>
+            </div>
+
+            <div>
+              <a class="shixunsboxfont">命令加密ZPI压缩文件解压</a>
+              <span class="shixundelect">
+                     <a  class="white-btn orange-btn fr mr20 mt3" onclick="">+&nbsp;实训详情</a>
+                </span>
+            </div>
+
+          </div>
         </li>
-    <% end %>
+
+
+      </ul>
+
+    </div>
+
+
+
+
   </div>
 </div>
 

public/stylesheets/educoder/edu-main.css

@@ -1019,4 +1019,12 @@ html>body #ajax-indicator { position: fixed; }
     font-weight:400;
     color:rgba(255,104,0,1);
     margin: 0 auto;
+}
+
+.width200{
+    width:200px;
+}
+
+.colorFF8121s{
+    color:#FF8121;
 }