From bbf694b5bbf9eef4a5af8179aba50efe2b5c7b3d Mon Sep 17 00:00:00 2001 From: XuCheng642 <287102909@qq.com> Date: Fri, 14 Jul 2017 15:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 8 ++ app/views/layouts/base_management.html.erb | 9 +- app/views/managements/depart.html.erb | 74 ++++++++++ app/views/managements/departments.html.erb | 76 +++++++++++ .../managements/departments_part.html.erb | 101 ++++++++++++++ app/views/managements/shixuns.html.erb | 128 +++++++++--------- app/views/managements/unit.html.erb | 93 +++++++++++++ config/routes.rb | 3 + public/stylesheets/css/edu-admin.css | 16 ++- 9 files changed, 441 insertions(+), 67 deletions(-) create mode 100644 app/views/managements/depart.html.erb create mode 100644 app/views/managements/departments_part.html.erb create mode 100644 app/views/managements/unit.html.erb diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index f2a621d66..1c0f8d9d4 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -10,7 +10,15 @@ class ManagementsController < ApplicationController def departments end + def departments_part + end + def depart + + end + def unit + + end # 0 全部；1 活动的； 2 已注册； 3 锁定 def users status = params[:user_status].nil? ? 0 : params[:user_status].to_i diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index 65653d717..8b0cf8ad7 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -28,8 +28,11 @@ <%= link_to "实训+", shixuns_managements_path, :class => "edu-admin-nav-a" %>
  • 竞赛+
    • -
  • - <%= link_to "单位", departments_managements_path, :class => "edu-admin-nav-a" %> +
  • 单位 +
  • 用户
  • 工程认证+
    • diff --git a/app/views/managements/depart.html.erb b/app/views/managements/depart.html.erb new file mode 100644 index 000000000..c40d2ba34 --- /dev/null +++ b/app/views/managements/depart.html.erb @@ -0,0 +1,74 @@ +
    + + 搜索 + 清除 + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号部门名称单位名称创建于
    1计算机学院中国科学近代物理研究所2018-02-02 10:02 修改
    1计算机学院中国科学近代物理研究所2018-02-02 10:02 修改
    1计算机学院中国科学近代物理研究所2018-02-02 10:02 修改
    + diff --git a/app/views/managements/departments.html.erb b/app/views/managements/departments.html.erb index e69de29bb..1dd1573e2 100644 --- a/app/views/managements/departments.html.erb +++ b/app/views/managements/departments.html.erb @@ -0,0 +1,76 @@ +
    + + 创建 + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号部门名称用户数已认证职业创建于
    1计算机学院20032018-02-02 10:02 修改
    1计算机学院20032018-02-02 10:02 修改
    1计算机学院20032018-02-02 10:02 修改
    + diff --git a/app/views/managements/departments_part.html.erb b/app/views/managements/departments_part.html.erb new file mode 100644 index 000000000..714fe141e --- /dev/null +++ b/app/views/managements/departments_part.html.erb @@ -0,0 +1,101 @@ +
    + + 新建单位 + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号单位名称地区详细地址用户数部门数创建于
    1中国科学院近代物理研究所北京市海淀区湖北省武汉市武汉纺织大学322018-02-02 10:02 修改
    1中国科学院近代物理研究所北京市海淀区湖北省武汉市武汉纺织大学322018-02-02 10:02 修改
    1中国科学院近代物理研究所北京市海淀区湖北省武汉市武汉纺织大学322018-02-02 10:02 修改
    1中国科学院近代物理研究所北京市海淀区湖北省武汉市武汉纺织大学322018-02-02 10:02 修改
    + diff --git a/app/views/managements/shixuns.html.erb b/app/views/managements/shixuns.html.erb index d72709279..cc9a48ec3 100644 --- a/app/views/managements/shixuns.html.erb +++ b/app/views/managements/shixuns.html.erb @@ -1,64 +1,64 @@ - -
    - <%= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %> -
    - - - -
  • - 搜索 - 清除 -
    • - <% end %> -
    -
    - <%= render :partial => "managements/shixun_list" %> -
    -
    - + +
    + <%= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %> +
    + + + +
  • + 搜索 + 清除 +
    • + <% end %> +
    +
    + <%= render :partial => "managements/shixun_list" %> +
    +
    + diff --git a/app/views/managements/unit.html.erb b/app/views/managements/unit.html.erb new file mode 100644 index 000000000..7c13594d3 --- /dev/null +++ b/app/views/managements/unit.html.erb @@ -0,0 +1,93 @@ +
    + + 搜索 + 清除 + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号单位名称地区详细地址申请者创建于
    1山西省云城市临猗县白沙空间省会花园小区178号山西省运城市山西省云城市临猗县白沙空间省会花园小区178号胡莎莎2018-02-02 10:02 修改
    1山西省云城市临猗县白沙空间省会花园小区178号山西省运城市山西省云城市临猗县白沙空间省会花园小区178号胡莎莎2018-02-02 10:02 修改
    1山西省云城市临猗县白的空间省会花园小区178号山西省运城市山西省云城市临猗县的空间省会花园小区178号胡莎莎2018-02-02 10:02 修改
    1山西省云城市临猗县白沙空间省会花园小区178号山西省运城市山西省云城市临猗县的空间省会花园小区178号胡莎莎2018-02-02 10:02 修改
    + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index a763e7d05..0414b18cc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -142,6 +142,9 @@ RedmineApp::Application.routes.draw do match 'users_authorization_cancel' get 'update_webssh' get 'departments' + get 'departments_part' + get 'depart' + get 'unit' end end # Enable Grack support diff --git a/public/stylesheets/css/edu-admin.css b/public/stylesheets/css/edu-admin.css index d0ef32e90..56dad83b8 100644 --- a/public/stylesheets/css/edu-admin.css +++ b/public/stylesheets/css/edu-admin.css @@ -123,4 +123,18 @@ a:hover.edu-admin-nav-a,.active a.edu-admin-nav-a{color: #5faee3;} .edu-dropdown-menu p{height: 35px;line-height: 35px;} .ex_container{margin-bottom: 20px;} -.table_Name_text{text-align: left;display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;height: 39px;width: 370px;line-height: 39px;-webkit-box-orient: vertical;} \ No newline at end of file +.table_Name_text{text-align: left;display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;height: 39px;width: 370px;line-height: 39px;-webkit-box-orient: vertical;} + +/*管理员单位列表页面*/ +.id{ width: 9%;} +.number,.job_num,.editor,.c_time{ width: 15%;} +.part{ width: 30%;} +.r6{margin-right: 65px} +/*管理员单位列表部门页面*/ +.xlogo,.xeditor{width: 7%} +.xadd,.xpart{width: 24%;overflow: hidden;} +.eud-pointer{width: 10%} +.xregion{width: 9%;vertical-align: top;padding-top: 4px} +.xuser-num,.xpart-num{width: 5%} +.mt10{margin-top: 10px} +.edu-txt-left{ text-align: left;} \ No newline at end of file