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

app/views/layouts/_logined_header.html.erb

@@ -53,6 +53,9 @@
       <li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li>
       <li><%= link_to '我的实训课程', user_path(User.current, :type => 'a_path') %></li>
       <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
+
+      <li><a>客户管理</a></li>
+
       <% if User.current.department_members.count > 0 %>
         <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>
       <% end %>

app/views/managements/_users_list.html.erb

@@ -0,0 +1,42 @@
+<p class="clearfix edu-back-white">
+  <span class="column-No">序号</span>
+  <span class="column-2">单位名称</span>
+  <span class="column-2">教师</span>
+  <span class="column-2">学生</span>
+  <span class="column-2">课堂</span>
+  <span class="column-2">发布实训</span>
+  <span class="column-2">实训报告</span>
+  <span class="column-2 fr">使用详情</span>
+</p>
+<ul class="minH-560 edu-back-white pb20 courselist">
+    <li class="clearfix bor-bottom-greyE" id="major_list">
+      <span class="column-No major_index">1</span>
+      <span class="column-2">国防科技大学</span>
+      <span class="column-2">22</span>
+      <span class="column-2">
+        33
+      </span>
+      <span class="column-2">
+        44
+      </span>
+      <span class="column-2">
+        55
+      </span>
+      <span class="column-2">
+        66
+      </span>
+      <span class="column-2 fr">
+          <a href="" class="color-blue">查看</a>
+      </span>
+    </li>
+
+
+</ul>
+<div class="educontent edu-txt-center mb80 mt20">
+  <div class="inline pages_user_show">
+    <ul>
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+    </ul>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/managements/users_list.html.erb

@@ -0,0 +1,86 @@
+<div id="Auth_main">
+  <div class="educontent clearfix edu-back-white bor-bottom-greyE">
+    <div class="padding20-30">
+<!--      <p class="mb20"><span class="font-18 mr20">管理员</span><span class="font-12 color-grey-9"></span></p>-->
+<!--      <ul class="clearfix managerPanels">-->
+
+<!--          <a class="fl relative">-->
+<!--            <img alt="头像" class="radius" height="48" src="https://www.educoder.net/images/avatars/User/6?1543479003" width="48" />-->
+<!--            <i class="iconfont icon-shanchudiao userimg color-grey-9" ></i>-->
+<!--            <span class="color-black">达达老师</span>-->
+<!--          </a>-->
+
+<!--          <a class="fl relative">-->
+<!--            <i class="iconfont icon-tianjiafangda useradd color-grey-9"></i>-->
+<!--          </a>-->
+
+<!--      </ul>-->
+
+<!--      <ul  class="clearfix managerPanels">-->
+<!--        <a class="fl font-16 padding5-20 block mr30 navItem active color-blue"><span class="fl">实训回复</span></a>-->
+<!--      </ul>-->
+
+    </div>
+
+  </div>
+
+
+
+
+  <div class="educontent mb30">
+
+    <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
+        <span class="fl font-12 mt5">
+          <span class="color-orange-tip mr3" id="search_major_count"><%= @obj_count %></span>
+          <span class="color-grey-9">个检索结果（<span id="all_major_count"><%= @major_count %></span> 单位）</span>
+        </span>
+        <div class="fr" id="pollingPanel">
+          <input type="text" name="search" placeholder="请输入单位名称搜索" />
+          <a href="javascript:void(0)" onclick="submit_search_major()"><i class="iconfont icon-sousuo font-16 color-grey-9"></i></a>
+        </div>
+    </div>
+
+    <div class="ListTableLine ListTableLines" id="school_major_list">
+        <%= render :partial => "department_list" %>
+    </div>
+  </div>
+
+</div>
+
+<script>
+    $(function(){
+
+        $(".MajorName i").click(function(){
+            $(this).parents(".MajorName").remove();
+        });
+
+        $("#school_major_list").on("click", ".addMajorManager", function(){
+            if($("#major_managers_"+$(this).attr("data-major-id")).children("span").length < 5){
+                var html="<%= escape_javascript(render :partial => "ecs/authList_addUnit") %>";
+                pop_box_new(html,572,500);
+                $("#object_id").val($(this).attr("data-major-id"));
+                $("#object_type").val('major');
+                $("input[name='school']").val('<%= @school.name %>');
+            } else {
+                notice_box("只能配置5个专业管理员");
+            }
+        });
+
+        $("#pollingPanel").on("keydown", "input[name='search']", function(e){
+            // 兼容FF和IE和Opera
+            var theEvent = e || window.event;
+            var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+            if (code == 13) {
+                //回车执行查询
+                submit_search_major()
+            }
+        });
+    });
+
+
+        function submit_search_major(){
+            $.get('/ecs/department?school_id=<%= @school.id %>',
+                 { search: $("input[name='search']").val().trim()});
+        }
+
+</script>