From d88139c12d7e61dd79bf7c2afb2cc236759617c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 17 Apr 2019 15:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A2=9E=E5=8A=A0=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E5=8A=A0=E8=BD=BD=EF=BC=8C=E2=80=9C=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E9=A2=98=E2=80=9D=E7=BC=96=E8=BE=91=E5=9D=97=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_edit_shixun.html.erb | 117 +++++++++++++----- app/views/exercise/_new_shixun.html.erb | 81 +++++++----- .../_new_shixun_exercise_list.html.erb | 41 ++++-- public/stylesheets/educoder/edu-main.css | 58 ++++++++- 4 files changed, 222 insertions(+), 75 deletions(-) diff --git a/app/views/exercise/_edit_shixun.html.erb b/app/views/exercise/_edit_shixun.html.erb index 4d60a41c..1e8fb088 100644 --- a/app/views/exercise/_edit_shixun.html.erb +++ b/app/views/exercise/_edit_shixun.html.erb @@ -1,35 +1,86 @@ <%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:html => {:id => "update_exercise_question_#{exercise_question.id}"}) do |f|%> -
-

实训题

-

<%= exercise_question.shixun.name %>

-
  • - - - -
    • -
  • - - 关卡名称 - 分值 -
    • - <% exercise_question.exercise_shixun_challenges.each_with_index do |exercise_challenge,index| %> -
  • - - <%= exercise_challenge.challenge.subject %> - - -
    • -
    - <% end %> - -
  • -

    - 温馨提示：[实训题]属于客观题将由系统自动评分 - 保存 - 取消 -

    -
    • -
    + + + + + + + + + + + + + + <%# exercise_question.exercise_shixun_challenges.each_with_index do |exercise_challenge,index| %> + + + + + + + + + + <%# end %> + + + + + + + + + + + + <% end %> + +
    + +
    实训题
    + +
    + + 初级题 + +
    + *分值： 分/题 +
    *大于等于0，且不能大于100
    +
    + +
    + * + 随机出题量： 题 +
    *不能为空
    +
    *必须为正整数
    +
    *不能大于可用题数
    +
    + +
    + 3 + 题可用 +
    + +
    + +
    + + 中级题 + +
    + +
    + + 高级题 + +
    + +
    + + 顶级题 + +
    + +
    \ No newline at end of file diff --git a/app/views/exercise/_new_shixun.html.erb b/app/views/exercise/_new_shixun.html.erb index 1cff068f..389a4b67 100644 --- a/app/views/exercise/_new_shixun.html.erb +++ b/app/views/exercise/_new_shixun.html.erb @@ -3,40 +3,55 @@ <%= form_for(ExerciseQuestion.new, :html => { :multipart => true, :id => "new_exercise_question"}, :url=>create_exercise_question_exercise_path(exercise.id)) do |f| %> -
    -

    实训题

    - - - -

    <%= @shixun.name %>

    -
  • - - -
    • -
  • - - 关卡名称 - 分值 -
    • - <% @shixun.challenges.each_with_index do |challenge, i| %> -
  • - - <%= challenge.subject %> - - -
    • - <% end %> -
  • -

    - 温馨提示：[实训题]属于客观题将由系统自动评分 - 保存 - 取消 -

    -
    • -
    + + + + + + + + + + + + + + + + <%# @shixun.challenges.each_with_index do |challenge, i| %> + + + + + + + + + <%# end %> + + + + + + + + <% end %> + + +
    + +

    实训题

    + +

    + + +

    + +
    + + + <% end %> \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index dac31425..583e4a15 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -149,7 +149,8 @@ a.decoration{text-decoration: underline} .padding20-15{padding: 20px 15px;box-sizing: border-box} .padding20-10{padding: 20px 10px;box-sizing: border-box} .padding20-25{padding: 20px 25px;box-sizing: border-box} - +.padding10{padding: 10px;box-sizing: border-box} +.padding20{padding: 20px;box-sizing: border-box} .padding30{padding: 30px;box-sizing: border-box} .padding30-20{padding: 30px 20px;box-sizing: border-box} .padding30-40{padding: 30px 40px;box-sizing: border-box} @@ -883,3 +884,58 @@ html>body #ajax-indicator { position: fixed; } margin-top: 60px; margin-left: -26px; } +.selecshixun{ + overflow-y: scroll; +} + +.practicalTemp{ + width:1200px; + height:950px; + background:rgba(255,255,255,1); + border:1px solid rgba(238,238,238,1); +} + +.practicalTitlefont{ + font-size:18px; + font-family:MicrosoftYaHei; + font-weight:400; + color:rgba(102,102,102,1); + width: 1200px; + height: 60px; + line-height: 25px; + padding-left: 10px; + border-bottom: 1px solid rgba(238,238,238,1); +} + +.practicalTitle{ + width: 1160px; + padding: 20px; + border-bottom:1px solid rgba(238,238,238,1); +} + +.Titlefont{ + width: 48px; + height: 30px; + font-size: 15px; + font-family: MicrosoftYaHei; + font-weight: 400; + color: rgba(5,16,26,1); +} +.shixun-title-font{ + font-size:16px; + font-family:MicrosoftYaHei; + font-weight:400; + color:#828282; +} + +.colorFF8121{ + color: #FF8121; + font-size: 12px; + text-align: left; + width: 110px; + margin-left: 117px; +} + +.borderFF8121{ + border:1px solid #FF8121 +} \ No newline at end of file