Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
cxt 2017-09-07 10:25:47 +08:00
parent e30cbff41c 45af957661
commit d24630e17d
19 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/games_controller.rb
View File

@ -156,12 +156,13 @@ class GamesController < ApplicationController
shixun_tomcat = Redmine::Configuration['shixun_tomcat']
uri = "#{shixun_tomcat}/bridge/game/getWaitingTime"
params = {:tpiID => "#{@myshixun.id}"}
resubmit = @_params['resubmit']
res = uri_exec uri, params
if (res && res['code'] != 0)
@message = "实训云平台繁忙（繁忙等级：94）"
raise("实训云平台繁忙（繁忙等级：94）")
end
render :json => {:result => "success", :onRun => res['onRun'], :waitNum => res['waitNum'], :waitingTime => res['waitingTime'] }
render :json => {:result => "success", :onRun => res['onRun'], :waitNum => res['waitNum'], :waitingTime => res['waitingTime'], :resubmit => resubmit }
#render :json => {:result => "success", :onRun => 1, :waitNum => 12, :waitingTime => 546 }
rescue Exception => e
render :json => {:result => "failed"}

2
app/views/challenges/_content_list.html.erb
View File

@ -1,4 +1,4 @@
<div class="task-pm-box mt20 mb20">
<div class="task-pm-box mt20 mb20 box_bg_shandow">
<div class="panel-header clearfix" style="height: 40px;border-bottom:0px;">
<h3 class="fl mt5 shixun_title">全部任务</h3>
<% if @challenges.count != 0 %>

2
app/views/challenges/index.html.erb
View File

@ -10,7 +10,7 @@
<% if @shixun.status == 1 && (User.current.manager_of_shixun?(@shixun) || User.current.admin?) %>
<div class="alert alert-orange mb15 mt15">正在等待管理员的审核。如果需要编辑更新，请先撤销发布</div>
<% end %>
<div class="task-pm-box mt20">
<div class="task-pm-box mt20 box_bg_shandow">
<div class="panel-header">
<h3 class="shixun_title" style="height:40px;line-height:40px;">简介</h3>
</div>

1
app/views/games/_code_actions.html.erb
View File

@ -180,6 +180,7 @@
timeID = setInterval(function(){
$.ajax({
url: '<%= get_waiting_time_myshixun_game_path(@game, :myshixun_id => @myshixun) %>',
data:{resubmit:data.resubmit},
async: false,
success: function(data){
console.log(data);

2
app/views/layouts/base_shixun.html.erb
View File

@ -24,7 +24,7 @@
<div id="shixun_top">
<%= render :partial => 'shixuns/shixun_top' %>
</div>
<div class="task-header-nav" style="background: #fff">
<div class="task-header-nav box_bg_shandow" style="background: #fff">
<ul class="task-header-navs clearfix">
<li><a href="<%= shixun_challenges_url(@shixun) %>" class="<%= params[:action] == "index" ? "active" : "" %>" id="shixun_tab">实训</a></li>
<li><a href="<%= propaedeutics_shixun_path(@shixun) %>" class="<%= params[:action] == "propaedeutics" ? "active" : "" %>" >背景知识</a></li>

2
app/views/repositories/_shixun_dir_list.html.erb
View File

@ -1,5 +1,5 @@
<div class="autoscroll">
<table class="list entries mt5" id="browser" style="table-layout: fixed;">
<table class="list entries mt5 box_bg_shandow" id="browser" style="table-layout: fixed;">
<% unless @path.blank? %>
<tbody>
<tr style="border: 1px solid #DDD; border-bottom:none;">

2
app/views/repositories/shixun_show.html.erb
View File

@ -9,7 +9,7 @@
</p>
</div>
<div class="repository_con" style="line-height:1.9;">
<ul class="clearfix pro-top-info mb10">
<ul class="clearfix pro-top-info mb10 box_bg_shandow">
<li style="width: 459px;"><i class="icon-time mr5 c_grey02 f16 fb"></i>
<%=link_to "#{choise_commit_count(@changesets_all_count, @g_project.commit_count.to_i)}",
{:action => 'commits', :path => to_path_param(@path), :id => @shixun, :repository_id => @repository.identifier_param,

2
app/views/shixuns/_form.html.erb
View File

@ -1,6 +1,6 @@
<%= stylesheet_link_tag '/editormd/css/editormd' %>
<%= javascript_include_tag '/editormd/editormd' %>
<div class="edu-con-bg01 user_bg_shadow mb20" style="padding:30px 0;">
<div class="edu-con-bg01 mb20" style="padding:30px 0;">
<div class="ml30 mr30">
<div>
<ul>

9
app/views/shixuns/_shixun_list.html.erb
View File

@ -1,4 +1,11 @@
<ul class="nav_check_item clearfix">
<li class="fl <%= @order == 'myshixun_count' ? 'check_nav' : "" %>">
<%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
<li class="fl <%= @order == 'created_at' ? 'check_nav' : "" %>" id="nav_check_item_2">
<%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
</ul>
<div class="task-index-list clearfix mb20 mh320">
<% if @shixuns.blank? %>
<div style="background: #fff;padding-bottom: 15px;" class="user_bg_shadow">

2
app/views/shixuns/collaborators.html.erb
View File

@ -1,4 +1,4 @@
<div class="task-pm-content white_bg" style="margin-top:20px;">
<div class="task-pm-content white_bg box_bg_shandow mb20" style="margin-top:20px;">
<div class="clearfix task-partner-list">
<a class="fl"><%= image_tag(url_to_avatar(@shixun.owner), :width => 60, :height => 60, :class => 'panel-list-img mr15 mt5') %></a>
<ul class="fl font-12 color-grey">

22
app/views/shixuns/index.html.erb
View File

@ -179,17 +179,7 @@
</form>
<div id="shixun_list_content">
<ul class="nav_check_item clearfix">
<li class="fl <%= @order == 'myshixun_count' ? 'check_nav' : "" %>">
<%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
<li class="fl <%= @order == 'created_at' ? 'check_nav' : "" %>">
<%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
</ul>
<div id="shixun_list_content_2">
<%= render "shixun_list" %>
</div>
</div>
</div>
</div>
@ -197,6 +187,12 @@
<%= render :partial => 'layouts/public_left_info' %>
<style>body{background: #FFFFFF}</style><!--后续需要删除-->
<script>
$("#nav_check_item_1").click(function(){
<%=@order == 'myshixun_count'%>
});
$("#nav_check_item_2").click(function(){
<%=@order == 'created_at'%>
});
function searchToggle(obj, evt){
var container = $(obj).closest('.search-wrapper');
@ -265,11 +261,7 @@
},function(){
$(this).find("ul").hide();
});
//最新和最热的切换
// $(".nav_check_item li").click(function(){
// $(".nav_check_item li").removeClass("check_nav");
// $(this).addClass("check_nav");
// });
//选择查询条件
$(".course-nav-row_item").on('click', 'input', function(event){
$(this).parent("li").siblings("li").removeClass("check_on");

7
app/views/shixuns/new.html.erb
View File

@ -1,9 +1,12 @@
<div class="task-pm-content" >
<div class="task-pm-content " >
<p class="mb10 mt10"><i class="fa fa-map-marker mr5 color-grey" ></i>
<a href="<%= user_path(User.current) %>"><%= User.current.show_name %></a> > <a href="<%= shixuns_path %>">全部实训</a> > 新建实训
</p>
<div class="edu-con-top user_bg_shadow">
<div class="box_bg_shandow">
<div class="edu-con-top">
<p class="ml15 color-grey">新建实训</p>
</div>
<%= render :partial => 'form' %>
</div>
</div>

4
app/views/shixuns/propaedeutics.html.erb
View File

@ -6,8 +6,8 @@
width: 96%;
}
</style>
<div class="task-pm-content mb20" >
<div class="task-pm-box mt20">
<div class="task-pm-content mb20 " >
<div class="task-pm-box mt20 box_bg_shandow">
<div class="panel-header clearfix">
<h3 class="shixun_title fl mt5">背景知识</h3>
<% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>

2
app/views/shixuns/search.js.erb
View File

@ -1,2 +1,2 @@
$("#shixun_course_search").html("<%= escape_javascript( render :partial => 'shixuns/shixun_course_search') %>");
$("#shixun_list_content_2").html('<%= escape_javascript( render :partial => 'shixuns/shixun_list') %>');
$("#shixun_list_content").html('<%= escape_javascript( render :partial => 'shixuns/shixun_list') %>');

8
app/views/shixuns/settings.html.erb
View File

@ -2,11 +2,11 @@
<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js',
'/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%>
<div class="task-pm-content mb20">
<div class="task-pm-content mb20 box_bg_shandow">
<div class="task-pm-box mt20">
<div class="tab_content clearfix" >
<ul id="tab_nav">
<li id="tab_nav_1" class="tab_hover" onclick="HoverLi(1);">
<ul id="tab_nav" class="nav_check_item" style="background:#fff;">
<li id="tab_nav_1" class="tab_hover_setting" onclick="HoverLi(1);">
<a href="javascript:void(0);" class="tab_type">实训</a>
</li>
<li id="tab_nav_2" onclick="HoverLi(2);">
@ -43,7 +43,7 @@
g('tab_con_'+i).className='undis';
}
g('tab_con_'+n).className='dis';
g('tab_nav_'+n).className='tab_hover';
g('tab_nav_'+n).className='tab_hover_setting';
}
function close_waring_frame(){
$("#warning_frame").hide();

8
app/views/subjects/edit.html.erb
View File

@ -4,10 +4,11 @@
<%= link_to User.current.show_name, user_path(User.current) %> &gt; <%= link_to "实训路径", subjects_path() %>
&gt; <span>编辑实训路径</span>
</p>
<div class="edu-con-top user_bg_shadow">
<div class="box_bg_shandow">
<div class="edu-con-top ">
<span class="ml15 color-grey font-16">编辑实训路径</span>
</div>
<div class="edu-bg createmain mb20 pt30 user_bg_shadow">
<div class="edu-bg createmain mb20 pt30 ">
<%= labelled_form_for @subject do |f| %>
<li class="clearfix pt20">
<label class="panel-form-label label fl"><span class="color-orange">*</span>&nbsp;名称</label>
@ -40,4 +41,5 @@
</li>
<% end %>
</div>
</div>
</div>
</div>

8
app/views/subjects/new.html.erb
View File

@ -4,10 +4,11 @@
<%= link_to User.current.show_name, user_path(User.current) %> &gt; <%= link_to "实训路径", subjects_path() %>
&gt; <span>新建实训路径</span>
</p>
<div class="edu-con-top user_bg_shadow">
<div class="box_bg_shandow">
<div class="edu-con-top">
<span class="ml15 color-grey3 font-16">新建实训路径</span>
</div>
<div class="edu-bg createmain mb20 pt30 user_bg_shadow">
<div class="edu-bg createmain mb20 pt30 ">
<%= labelled_form_for @subject do |f| %>
<li class="clearfix pt20">
<label class="panel-form-label label fl"><span class="color-orange">*</span>&nbsp;名称</label>
@ -44,4 +45,5 @@
</li>
<% end %>
</div>
</div>
</div>
</div>

2
app/views/subjects/show.html.erb
View File

@ -74,7 +74,7 @@
<% if is_modify.blank? %>
<%= link_to "模拟实战", shixun_exec_shixun_path(shixun), :class => "task-btn task-btn-green ", :style=>"display: none", :id => "shixun_operation", :target => "_blank" %>
<% else %>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(@myshixun) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation">模拟实战</a>
<a class="task-btn task-btn-green" onclick="sure_box_redirect('<%= myshixun_reset_myshixun_path(myshixun) %>', '实训已经更新啦，系统正在为您重置');" style = "display: none" id = "shixun_operation">模拟实战</a>
<% end %>
<% end %>
<% end %>

4
public/stylesheets/css/taskstyle.css
View File

@ -48,7 +48,9 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
#tab_nav li {float:left; padding:0 30px;text-align:center;height: 40px;line-height: 40px; }
#tab_nav li a{font-size:14px; }
.tab_hover {border-bottom:1px solid #fff; background: #fff;}
.tab_hover_setting{background:#FC7033;}
.tab_hover a{ color:#29bd8b;}
.tab_hover_setting a{color:#fff;}
.undis {display:none;}
.dis {display:block;}
.tab-info{ }
@ -78,7 +80,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
.task-header-info h2 a,.task-header-info h2{ font-weight: normal;color:#fff;}
a.task-header-name{ max-width:200px;}
.task-header-title{ display: block; max-width:750px;word-wrap: break-word;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
.task-header-nav{ width: 100%;min-width:1200px; height:50px;box-shadow:0px 0px 8px #ccc;}
.task-header-nav{ width: 100%;min-width:1200px; height:50px;}
.task-header-navs{ width: 1200px; margin: 0 auto;}
.task-header-navs li{ float: left;}
.task-header-navs li a{ display: block; height: 50px; padding:0 50px; color:#666; text-align: center; font-size: 16px; line-height: 50px;}