From a43a8d8322646fb56a18c58347c321ba970a5c5b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 24 May 2019 09:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_partner_controlManage.html.erb | 28 ++++ app/views/cooperates/_partner_item.html.erb | 144 +++++++++++++++--- app/views/cooperates/partner_list.html.erb | 27 ++-- .../_partner_customer_list.html.erb | 3 +- .../managements/_partner_main_div.html.erb | 13 +- app/views/managements/partners.html.erb | 2 +- public/assets/iconfont/iconfont.css | 20 ++- public/stylesheets/educoder/edu-all.css | 11 +- 8 files changed, 204 insertions(+), 44 deletions(-) create mode 100644 app/views/cooperates/_partner_controlManage.html.erb diff --git a/app/views/cooperates/_partner_controlManage.html.erb b/app/views/cooperates/_partner_controlManage.html.erb new file mode 100644 index 00000000..10bb7fd4 --- /dev/null +++ b/app/views/cooperates/_partner_controlManage.html.erb @@ -0,0 +1,28 @@ +

+ 2个权限组 + + 新增权限组 + +

+
+

+ 管理者 + (访问权限范围:客户列表中的全部客户) +

+
+ +
+
\ No newline at end of file diff --git a/app/views/cooperates/_partner_item.html.erb b/app/views/cooperates/_partner_item.html.erb index b94c7926..e3776422 100644 --- a/app/views/cooperates/_partner_item.html.erb +++ b/app/views/cooperates/_partner_item.html.erb @@ -1,34 +1,96 @@ -

+

序号 - 单位名称 - 教师 - 学生 - 课堂 - 发布实训 - 实训报告 + 单位名称 + 权限控制 + 教师 + 学生 + 课堂 + 发布实训 + 实训报告 最新课堂动态时间 - 使用详情 + 使用详情

@@ -38,4 +100,44 @@
- \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/views/cooperates/partner_list.html.erb b/app/views/cooperates/partner_list.html.erb index 06cc0910..91fe2363 100644 --- a/app/views/cooperates/partner_list.html.erb +++ b/app/views/cooperates/partner_list.html.erb @@ -1,26 +1,33 @@ -
-
- +
+ + <% if false %>
- - <%= @obj_count %> - 个检索结果(<%= @all_count %> 单位) - + + <%= @obj_count %> + 个检索结果(<%= @all_count %> 单位) +
-
+
<%= render :partial => "partner_item" %>
-
- + <% end %> + <%= render :partial => "partner_controlManage" %>