From 14d7d8fa7abb5c8a3c4e26dedb66b62056513f66 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Aug 2017 17:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E7=9A=84=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/syllabuses/edit.html.erb    | 57 +++++++++++++++++++++---
 app/views/syllabuses/new.html.erb     | 63 ++++++++++++++++++++++-----
 public/javascripts/edu/application.js |  4 +-
 public/javascripts/edu/base_edu.js    | 58 +++++++++++++++++-------
 4 files changed, 148 insertions(+), 34 deletions(-)

diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index 53fbade02..62cd1e688 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -17,25 +17,61 @@
             <ul>
               <li class="clearfix mb20">
                 <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业层级&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                <%= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
+                <div class="with80 fl pr" select-for>
+                  <input type="hidden" name="major_level" id="major_level" value="<%= @syllabus.major_level %>">
+                  <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" value="<%= @syllabus.syllabus_major_level %>" readonly placeholder="选择课程所属专业层级"/>
+                  <div class="down-select bor-grey-e user_bg_shadow" id="major_level_option">
+                    <p data-major="3">专科</p>
+                    <p data-major="2">本科</p>
+                    <p data-major="1">研究生</p>
+                  </div>
+                </div>
+                <%#= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
                 <div class="cl"></div>
                 <span class="color-orange fl none" id="major_level_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业层级</span>
               </li>
               <li class="clearfix mb20">
                 <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>学科门类&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                <%= select_tag :discipline_category_id,options_for_select(discipline_category_option(@syllabus.major_level),@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
+                <div class="with80 fl pr" select-for>
+                  <input type="hidden" name="discipline_category_id" id="discipline_category_id" value="<%= @syllabus.discipline_category_id %>">
+                  <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" value="<%= @syllabus.syllabus_discipline_category %>" readonly placeholder="选择课程所属学科门类"/>
+                  <div class="down-select bor-grey-e user_bg_shadow" id="discipline_category_option">
+                    <% DisciplineCategory.where(:major_level => @syllabus.major_level).each do |dis| %>
+                        <p data-discipline-category-id="<%= dis.id %>"><%= dis.name %></p>
+                    <% end %>
+                  </div>
+                </div>
+                <%#= select_tag :discipline_category_id,options_for_select(discipline_category_option(@syllabus.major_level),@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
                 <div class="cl"></div>
                 <span class="color-orange fl none" id="discipline_category_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属学科门类</span>
               </li>
               <li class="clearfix mb20">
                 <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>一级学科&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option(@syllabus.discipline_category_id),@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"}  %>
+                <div class="with80 fl pr" select-for>
+                  <input type="hidden" name="first_level_discipline_id" id="first_level_discipline_id" value="<%= @syllabus.first_level_discipline_id %>">
+                  <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" value="<%= @syllabus.syllabus_first_level_discipline %>" readonly placeholder="选择课程所属一级学科"/>
+                  <div class="down-select bor-grey-e user_bg_shadow" id="first_level_discipline_option">
+                    <% FirstLevelDiscipline.where(:discipline_category_id => @syllabus.discipline_category_id).each do |fir_dis| %>
+                        <p data-first-level-discipline-id="<%= fir_dis.id %>"><%= fir_dis.name %></p>
+                    <% end %>
+                  </div>
+                </div>
+                <%#= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option(@syllabus.discipline_category_id),@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"}  %>
                 <div class="cl"></div>
                 <span class="color-orange fl none" id="first_level_discipline_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属一级学科</span>
               </li>
               <li class="clearfix mb20">
                 <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                <%= select_tag :major_id,options_for_select(syllabus_major_option(@syllabus.first_level_discipline_id),@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
+                <div class="with80 fl pr" select-for>
+                  <input type="hidden" name="major_id" id="major_id" value="<%= @syllabus.major_id %>">
+                  <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" value="<%= @syllabus.syllabus_major %>" readonly placeholder="选择课程所属专业"/>
+                  <div class="down-select bor-grey-e user_bg_shadow" id="syllabus_major_option">
+                    <% Major.where(:first_level_discipline_id => @syllabus.first_level_discipline_id).each do |major| %>
+                        <p data-major_id="<%= major.id %>"><%= major.name %></p>
+                    <% end %>
+                  </div>
+                </div>
+                <%#= select_tag :major_id,options_for_select(syllabus_major_option(@syllabus.first_level_discipline_id),@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
                 <div class="cl"></div>
                 <span class="color-orange fl none" id="major_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业</span>
               </li>
@@ -53,7 +89,18 @@
               </li>
               <li class="clearfix mb20">
                 <label class="panel-form-label label-w20 fl" >课程性质&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                <%= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"}  %>
+                <div class="with80 fl pr" select-for>
+                  <input type="hidden" name="syllabus_type" id="syllabus_type" value="<%= @syllabus.syllabus_type %>">
+                  <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" value="<%= @syllabus.syllabus_type_str %>" readonly placeholder="请选择课程性质"/>
+                  <div class="down-select bor-grey-e user_bg_shadow" id="syllabus_type_option">
+                    <p data-syllabus-type="3">专业选修课</p>
+                    <p data-syllabus-type="2">学科必修课</p>
+                    <p data-syllabus-type="1">公共必修课</p>
+                    <p data-syllabus-type="5">实践选修课</p>
+                    <p data-syllabus-type="4">实践必修课</p>
+                  </div>
+                </div>
+                <%#= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"}  %>
                 <div class="cl"></div>
               </li>
               <li class="clearfix" >
diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb
index 3fa39d91f..f8605e18f 100644
--- a/app/views/syllabuses/new.html.erb
+++ b/app/views/syllabuses/new.html.erb
@@ -18,33 +18,63 @@
         <ul>
           <li class="clearfix mb20">
             <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业层级&nbsp;&nbsp;&nbsp;&nbsp;</label>
-            <%= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
-            <!--公用下拉框-->
-            <!--<div class="with80 fl pr" select-for>
-              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择课程所属专业层级" id="major_level"/>
-              <div class="down-select bor-grey-e user_bg_shadow">
-                <p>环境保护</p><p>环境保护1</p><p>环境保护2</p>
+            <%#= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
+
+            <div class="with80 fl pr" select-for>
+              <input type="hidden" name="major_level" id="major_level" value="0">
+              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择课程所属专业层级"/>
+              <div class="down-select bor-grey-e user_bg_shadow" id="major_level_option">
+                <p data-major="3">专科</p>
+                <p data-major="2">本科</p>
+                <p data-major="1">研究生</p>
               </div>
-            </div>-->
+            </div>
 
             <div class="cl"></div>
             <span class="color-orange fl none" id="major_level_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业层级</span>
           </li>
           <li class="clearfix mb20">
             <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>学科门类&nbsp;&nbsp;&nbsp;&nbsp;</label>
-            <%= select_tag :discipline_category_id,options_for_select(discipline_category_option,@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
+            <div class="with80 fl pr" select-for>
+              <input type="hidden" name="discipline_category_id" id="discipline_category_id" value="0">
+              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择课程所属学科门类"/>
+              <div class="down-select bor-grey-e user_bg_shadow" id="discipline_category_option">
+                <% DisciplineCategory.where(:major_level => 3).each do |dis| %>
+                    <p data-discipline-category-id="<%= dis.id %>"><%= dis.name %></p>
+                <% end %>
+              </div>
+            </div>
+            <%#= select_tag :discipline_category_id,options_for_select(discipline_category_option,@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
             <div class="cl"></div>
             <span class="color-orange fl none" id="discipline_category_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属学科门类</span>
           </li>
           <li class="clearfix mb20">
             <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>一级学科&nbsp;&nbsp;&nbsp;&nbsp;</label>
-            <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
+            <div class="with80 fl pr" select-for>
+              <input type="hidden" name="first_level_discipline_id" id="first_level_discipline_id" value="0">
+              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择课程所属一级学科"/>
+              <div class="down-select bor-grey-e user_bg_shadow" id="first_level_discipline_option">
+                <% FirstLevelDiscipline.where(:discipline_category_id => 27).each do |fir_dis| %>
+                    <p data-first-level-discipline-id="<%= fir_dis.id %>"><%= fir_dis.name %></p>
+                <% end %>
+              </div>
+            </div>
+            <%#= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
             <div class="cl"></div>
             <span class="color-orange fl none" id="first_level_discipline_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属一级学科</span>
           </li>
           <li class="clearfix mb20">
             <label class="panel-form-label label-w20 fl" ><span class="color-orange mr5">*</span>专业名称&nbsp;&nbsp;&nbsp;&nbsp;</label>
-            <%= select_tag :major_id,options_for_select(syllabus_major_option,@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
+            <div class="with80 fl pr" select-for>
+              <input type="hidden" name="major_id" id="major_id" value="0">
+              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="选择课程所属专业"/>
+              <div class="down-select bor-grey-e user_bg_shadow" id="syllabus_major_option">
+                <% Major.where(:first_level_discipline_id => 213).each do |major| %>
+                    <p data-major_id="<%= major.id %>"><%= major.name %></p>
+                <% end %>
+              </div>
+            </div>
+            <%#= select_tag :major_id,options_for_select(syllabus_major_option,@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
             <div class="cl"></div>
             <span class="color-orange fl none" id="major_id_notice" style="margin-left:20%;"><i class="fa fa-exclamation-circle mr5" ></i>请选择课程所属专业</span>
           </li>
@@ -62,7 +92,18 @@
           </li>
           <li class="clearfix mb20">
             <label class="panel-form-label label-w20 fl" >课程性质&nbsp;&nbsp;&nbsp;&nbsp;</label>
-            <%= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"}  %>
+            <div class="with80 fl pr" select-for>
+              <input type="hidden" name="syllabus_type" id="syllabus_type" value="0">
+              <input class="task-height-40 task-form-100 panel-box-sizing pr20 color-grey3" readonly placeholder="请选择课程性质"/>
+              <div class="down-select bor-grey-e user_bg_shadow" id="syllabus_type_option">
+                <p data-syllabus-type="3">专业选修课</p>
+                <p data-syllabus-type="2">学科必修课</p>
+                <p data-syllabus-type="1">公共必修课</p>
+                <p data-syllabus-type="5">实践选修课</p>
+                <p data-syllabus-type="4">实践必修课</p>
+              </div>
+            </div>
+            <%#= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"}  %>
             <div class="cl"></div>
           </li>
           <li class="clearfix" >
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index 0bfc2da66..7ea59866b 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -95,8 +95,8 @@ $(function(){
     },function(){
         $(this).find(".down-select").hide();
     })
-    $("[select-for] .down-select p").on("click",function(){
-        $(this).parents().siblings("input").val($(this).html().trim());
+    $("[select-for] .down-select p").bind("click",function(){
+        $(this).parents().prev("input").val($(this).html().trim());
         $(this).parents(".down-select").hide();
     })
 });
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 99c3f859a..cf57c69d0 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -1,16 +1,23 @@
 $(function(){
-    $("#major_level").on("change", function(){
+    $("#major_level_option p").bind("click", function(){
+        $("#major_level").val($(this).attr("data-major"));
         $.ajax({
             url: '/syllabuses/get_discipline_categories',
             type: 'get',
-            data: {major_level:$("#major_level").val()},
+            data: {major_level:$(this).attr("data-major")},
             success: function(data){
                 if (data.result == 1){
-                    $("#discipline_category_id").html("<option value='0'>选择课程所属学科门类</option>");
-                    $("#first_level_discipline_id").html("<option value='0'>选择课程所属一级学科</option>");
-                    $("#major_id").html("<option value='0'>选择课程所属专业</option>");
+                    $("#discipline_category_id").val(0);
+                    $("#first_level_discipline_id").val(0);
+                    $("#major_id").val(0);
+                    $("#discipline_category_option").html("");
+                    $("#discipline_category_option").prev().val("");
+                    $("#first_level_discipline_option").html("");
+                    $("#first_level_discipline_option").prev().val("");
+                    $("#syllabus_major_option").html("");
+                    $("#syllabus_major_option").prev().val("");
                     for(var i=0; i<data.options.length; i++){
-                        $("#discipline_category_id").append("<option value='" + data.options[i][1] + "'>" + data.options[i][0] + "</option>");
+                        $("#discipline_category_option").append("<p data-discipline-category-id='" + data.options[i][1] + "'>" + data.options[i][0] + "</p>");
                     }
                     $("#major_level_notice").hide();
                 }
@@ -21,17 +28,24 @@ $(function(){
         });
     });
 
-    $("#discipline_category_id").on("change", function(){
+    $("#discipline_category_option").on("click", "p", function(){
+        $(this).parents().prev("input").val($(this).html().trim());
+        $(this).parents(".down-select").hide();
+        $("#discipline_category_id").val($(this).attr("data-discipline-category-id"));
         $.ajax({
             url: '/syllabuses/get_first_level_disciplines',
             type: 'get',
-            data: {discipline_category_id:$("#discipline_category_id").val()},
+            data: {discipline_category_id:$(this).attr("data-discipline-category-id")},
             success: function(data){
                 if (data.result == 1){
-                    $("#first_level_discipline_id").html("<option value='0'>选择课程所属一级学科</option>");
-                    $("#major_id").html("<option value='0'>选择课程所属专业</option>");
+                    $("#first_level_discipline_id").val(0);
+                    $("#major_id").val(0);
+                    $("#first_level_discipline_option").html("");
+                    $("#first_level_discipline_option").prev().val("");
+                    $("#syllabus_major_option").html("");
+                    $("#syllabus_major_option").prev().val("");
                     for(var i=0; i<data.options.length; i++){
-                        $("#first_level_discipline_id").append("<option value='" + data.options[i][1] + "'>" + data.options[i][0] + "</option>");
+                        $("#first_level_discipline_option").append("<p data-first-level-discipline-id='" + data.options[i][1] + "'>" + data.options[i][0] + "</p>");
                     }
                     $("#discipline_category_id_notice").hide();
                 }
@@ -42,16 +56,21 @@ $(function(){
         });
     });
 
-    $("#first_level_discipline_id").on("change", function(){
+    $("#first_level_discipline_option").on("click", "p", function(){
+        $(this).parents().prev("input").val($(this).html().trim());
+        $(this).parents(".down-select").hide();
+        $("#first_level_discipline_id").val($(this).attr("data-first-level-discipline-id"));
         $.ajax({
             url: '/syllabuses/get_major',
             type: 'get',
-            data: {first_level_discipline_id:$("#first_level_discipline_id").val()},
+            data: {first_level_discipline_id:$(this).attr("data-first-level-discipline-id")},
             success: function(data){
                 if (data.result == 1){
-                    $("#major_id").html("<option value='0'>选择课程所属专业</option>");
+                    $("#major_id").val(0);
+                    $("#syllabus_major_option").html("");
+                    $("#syllabus_major_option").prev().val("");
                     for(var i=0; i<data.options.length; i++){
-                        $("#major_id").append("<option value='" + data.options[i][1] + "'>" + data.options[i][0] + "</option>");
+                        $("#syllabus_major_option").append("<p data-major_id='" + data.options[i][1] + "'>" + data.options[i][0] + "</p>");
                     }
                     $("#first_level_discipline_id_notice").hide();
                 }
@@ -62,12 +81,19 @@ $(function(){
         });
     });
 
-    $("#major_id").on("change", function() {
+    $("#syllabus_major_option").on("click", "p", function(){
+        $(this).parents().prev("input").val($(this).html().trim());
+        $(this).parents(".down-select").hide();
+        $("#major_id").val($(this).attr("data-major_id"));
         if ($("#major_id").val() != "0") {
             $("#major_id_notice").hide();
         }
     });
 
+    $("#syllabus_type_option p").bind("click", function(){
+        $("#syllabus_type").val($(this).attr("data-syllabus-type"));
+    })
+
     $("#choose_course_group_submit").live('click', function(){
         if($("#course_group_id").val() == '0'){
             $("#choose_course_group_notice").show();