From 255d7e07bcbd8f2ad2d615c56a13543573ae7381 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 25 Apr 2016 18:54:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E6=96=97=E6=96=B0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/organizations_helper.rb | 27 +- app/views/layouts/base_org2.html.erb | 437 +++++++++--------- app/views/organizations/_org_content.html.erb | 259 +++++++++++ .../organizations/_subfield_list.html.erb | 4 +- 4 files changed, 498 insertions(+), 229 deletions(-) create mode 100644 app/views/organizations/_org_content.html.erb diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 03a61a65f..6db9b15a0 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -67,15 +67,15 @@ module OrganizationsHelper option1 << "1" type << option1 option2 = [] - option2 << "左中一" + option2 << "中一" option2 << "2" type << option2 option3 = [] - option3 << "左中二" + option3 << "中二" option3 << "3" type << option3 option4 = [] - option4 << "左中下" + option4 << "中下" option4 << "4" type << option4 option5 = [] @@ -97,4 +97,25 @@ module OrganizationsHelper type end + def subfield_list_type subfield + case subfield.to_i + when 1 + resulet = "左上" + when 2 + resulet = "中一" + when 3 + resulet = "中二" + when 4 + resulet = "中下" + when 5 + resulet = "左下" + when 6 + resulet = "右上" + when 7 + resulet = "右中" + when 8 + resulet = "右下" + end + end + end diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index a605b8d4e..710d6dd02 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -83,7 +83,7 @@
<%= render :partial => 'organizations/org_logined_header' %>
- @@ -125,240 +125,229 @@ <% end %>
- - - - - - - - - - - - - -
-
- -
-
- + <% @subfield_content.each do |field| %> + <% if field.status.to_i == 1 %> +
+ + - - -
- -
-

业界动态更多

-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-

2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

-
-
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
- -

北斗开放实验室迎湖南省省直机关领导调研参观

- 2016-04-08 -
-
-
-
-
- - -
-

北斗资源更多

-
-
- -

仪器资源

-
- 测试服务 - 开放日 - 仪器共享 - 定制测试 -
- 更多 -
-
- -

数据资源

-
- 仿真数据 - 实测数据 - 测试场景 - 定制测试 -
- 更多 -
-
- -

专家资源

-
- 人才培养 - 技术咨询 - 学术活动 - 教学教材 - 专家库 -
- 更多 -
-
- -

研究资源

-
- 微小课题 - 开源代码 - 辅助工具 - 技术共享 -
- 更多 -
-
-
-
- - -
-

合作伙伴更多

-
-
    -
  • - - -
    • -
  • - - -
    • -
-
-
-
<
-
>
-
-
-
-
- + +
+
+
+ + + + +
+
+ + +
+ + +
+ <% elsif field.status.to_i == 2 %> +
+

业界动态更多

+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+

2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......

+
+
+ <% elsif field.status.to_i == 3 %> +
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+ +

北斗开放实验室迎湖南省省直机关领导调研参观

+ 2016-04-08 +
+
+
+
+
+ <% elsif field.status.to_i == 4 %> +
+

北斗资源更多

+
+
+ +

仪器资源

+
+ 测试服务 + 开放日 + 仪器共享 + 定制测试 +
+ 更多 +
+
+ +

数据资源

+
+ 仿真数据 + 实测数据 + 测试场景 + 定制测试 +
+ 更多 +
+
+ +

专家资源

+
+ 人才培养 + 技术咨询 + 学术活动 + 教学教材 + 专家库 +
+ 更多 +
+
+ +

研究资源

+
+ 微小课题 + 开源代码 + 辅助工具 + 技术共享 +
+ 更多 +
+
+
+
+ <% elsif field.status.to_i == 5 %> +
+

合作伙伴更多

+
+
    +
  • + + +
    • +
  • + + +
    • +
+
+
+
<
+
>
+
+
+
+
+ <% end %> + <% end %>
- - - +
-
-

最新活动展示更多

-
- -

北斗第二次工作会议在北京召议在北京召开议在北京召开开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -

北斗第二次工作会议在北京召开

- 2016-04-08 -
-
- -
-

关注北斗

-
- -

卫星导航仿真与测试开放实验室
扫一扫 关注我！

-
-
-
- -
- -
+ <% @subfield_content.each do |field| %> + <% if field.status.to_i == 6 %> +
+

最新活动展示更多

+
+ +

北斗第二次工作会议在北京召议在北京召开议在北京召开开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ +

北斗第二次工作会议在北京召开

+ 2016-04-08 +
+
+ <% elsif field.status.to_i == 7 %> +
+

关注北斗

+
+ +

卫星导航仿真与测试开放实验室
扫一扫 关注我！

+
+
+
+ <% elsif field.status.to_i == 8 %> +
+ +
+ <% end %> + <% end %>
-
diff --git a/app/views/organizations/_org_content.html.erb b/app/views/organizations/_org_content.html.erb new file mode 100644 index 000000000..afcbffd02 --- /dev/null +++ b/app/views/organizations/_org_content.html.erb @@ -0,0 +1,259 @@ + +<% if is_default_field?(field) %> + <% case field.name %> + <% when 'course' %> + <% if field.status.to_i == 1 %> + + <% elsif field.status.to_i == 2 %> + + <% elsif field.status.to_i == 3 %> + + <% elsif field.status.to_i == 4 %> + + <% elsif field.status.to_i == 5 %> + + <% elsif field.status.to_i == 6 %> + + <% end %> +
+ <% if field.status == 0 %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @course_acts.nil? %> + <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> +
+ <% else %> +
+

课程动态

+ <% if @course_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + + +
+ <% end %> +
+ <% when 'project' %> +
+ <% if field.status == 0 %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + <% unless @project_acts.nil? %> + <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %> + <% end %> +
    + <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
    +
+
+ <% end %> + +
+ <% else %> +
+

项目动态

+ <% if @project_acts.blank? %> + +
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %> + +
+
+ <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+ <% end %> +
+ <% end %> +<% else %> + <% if field.field_type == "Post" %> <%# 讨论类型 %> + <% org_subfield = OrgSubfield.find(field.id) %> + <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %> + <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %> + <%# message_ats = get_message_org(@organization.id, field.id) %> + <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %> +
+ <% if field.status == 0 %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+
    + + <% org_acts.first(3).each do |act| %> + <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> +
    +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+
+ <% end %> + +
+ <% else %> +
+

<%= field.name %>

+ <% if org_acts.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% else %> +
+ <% org_acts.each do |act| %> + <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %> + <% end %> + +
+
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> + <% end %> +
+ <% end %> + +
+
+ <% end %> +
+ <% elsif field.field_type == "Resource" %> + <% org_attachs = get_attach_org2(field) %> +
+
+

<%= field.name %>

+ <% if org_attachs.blank? %> + +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% else %> +
+ <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %> + +
+ +
+ <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% else %> + <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <% else %> + <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank" %> + <% end %> + <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %> +
+ <% end %> + +
+
+
+ + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 2c679eb3d..7db41cba5 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -27,7 +27,7 @@ 默认 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option, @@ -63,7 +63,7 @@ 列表 <% else %> <%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %> -
+
<%= select( :name,:group_id, subfield_status_option,