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

app/controllers/myshixuns_controller.rb

@@ -4,7 +4,7 @@ class MyshixunsController < ApplicationController
   skip_before_filter :verify_authenticity_token, :only => [:training_task_status, :close_webssh, :code_runinng_message, :vnc]
   before_filter :require_login, :except => [:training_task_status, :close_webssh, :code_runinng_message, :vnc]
   before_filter :check_authentication, :except => [:training_task_status, :close_webssh, :mul_test_home, :mul_test_user,
-                                                   :mul_test_myshixun, :mul_test_shixun, :mul_test_start, :code_runinng_message]
+                                                   :mul_test_myshixun, :mul_test_shixun, :mul_test_start, :code_runinng_message, :vnc]
   before_filter :find_myshixun, :only => [:show, :myshixun_reset, :open_webssh, :sync_reset_time, :destroy, :search_file_list, :vnc]
   DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 
@@ -357,7 +357,8 @@ class MyshixunsController < ApplicationController
     host = Redmine::Configuration['tomcat_php']
     begin
     uri = "#{shixun_tomcat}/bridge/vnc/getvnc"
-    params = {tpiID:@myshixun.id}
+    shixun = @myshixun.shixun
+    params = {tpiID: @myshixun.id, :containers => "#{Base64.urlsafe_encode64(container_limit(shixun.mirror_repositories))}"}
     res = uri_exec uri, params
     if res && res['code'].to_i != 0
       raise("实训云平台繁忙（繁忙等级：99）")

app/views/managements/schools/_contrast_search_form.html.erb

@@ -26,13 +26,10 @@
 
   <div style="float: left;">
     <%= hidden_field_tag :data_type, params[:data_type] || 'grow' %>
-    <% if params[:data_type] == 'contrast' %>
+    <a href="javascript:void(0)" class="fl task-btn ml5 mt10 contrast-btn <%= params[:data_type] == 'contrast' ? 'task-btn-orange' : '' %>"
-      <a href="javascript:void(0)" class="fl task-btn ml5 mt10 contrast-btn task-btn-orange">时间对比</a>
+       data-tip-down="请在左侧分别选择需进行对比的两个时段，下表显示两时段选定指标两时段变化情况对比">时段对比</a>
-      <a href="javascript:void(0)" class="fl task-btn ml5 mt10 grow-btn">新增数据</a>
+    <a href="javascript:void(0)" class="fl task-btn ml5 mt10 grow-btn <%= params[:data_type] == 'contrast' ? '' : 'task-btn-orange' %>"
-    <% else %>
+       data-tip-down="请在左侧选择时间段，下表显示选定时间段内各项指标数据变化情况">数据变化</a>
-      <a href="javascript:void(0)" class="fl task-btn ml5 mt10 contrast-btn">时间对比</a>
-      <a href="javascript:void(0)" class="fl task-btn ml5 mt10 grow-btn task-btn-orange">新增数据</a>
-    <% end %>
   </div>
 
   <%= text_field_tag :keyword, params[:keyword], placeholder: '请输入单位名称或者ID关键字进行搜索',

app/views/managements/schools/_data_contrast_list.html.erb

@@ -21,8 +21,8 @@
     <th width="6%">序号</th>
     <th width="10%">ID</th>
     <th width="20%" class="edu-txt-left">单位名称</th>
-    <th width="22%">时段一<br><%= "（#{params[:begin_date]}至#{params[:end_date]}）" %></th>
+    <th width="22%">时段一<br><%= "（#{params[:begin_date]} 05:00至#{params[:end_date]} 05:00）" %></th>
-    <th width="22%">时段二<br><%= "（#{params[:other_begin_date]}至#{params[:other_end_date]}）" %></th>
+    <th width="22%">时段二<br><%= "（#{params[:other_begin_date]} 05:00至#{params[:other_end_date]} 05:00）" %></th>
     <th width="20%" colspan="2">
       <%= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %>
       <br>（  新  增  数   | 新增百分比）

app/views/managements/schools/_data_grow_list.html.erb

@@ -9,7 +9,7 @@
   新增教师<span class="color-red"><%= @grow_summary.teacher_increase_count || 0 %></span>人，
   新增学生<span class="color-red"><%= @grow_summary.student_increase_count || 0 %></span>人，
   新增课堂<span class="color-red"><%= @grow_summary.course_increase_count || 0 %></span>个，
-  新增实训<span class="color-red"><%= @grow_summary.shixun_increase_count || 0 %></span>个，
+  新增实训作业<span class="color-red"><%= @grow_summary.shixun_increase_count || 0 %></span>个，
   活跃用户<span class="color-red"><%= @grow_summary.active_user_count || 0 %></span>个
 </div>
 <table class="edu-pop-table edu-txt-center" cellpadding="0" cellspacing="0" style="table-layout: fixed">
@@ -22,7 +22,7 @@
     <th width="12%"><%= sort_tag('新增教师', name: 'teacher_increase_count', path: school_data_grow_managements_path) %></th>
     <th width="12%"><%= sort_tag('新增学生', name: 'student_increase_count', path: school_data_grow_managements_path) %></th>
     <th width="12%"><%= sort_tag('新增课堂', name: 'course_increase_count', path: school_data_grow_managements_path) %></th>
-    <th width="12%"><%= sort_tag('新增实训', name: 'shixun_increase_count', path: school_data_grow_managements_path) %></th>
+    <th width="12%"><%= sort_tag('新增实训作业', name: 'shixun_increase_count', path: school_data_grow_managements_path) %></th>
     <th width="12%"><%= sort_tag('活跃用户', name: 'active_user_count', path: school_data_grow_managements_path) %></th>
   </tr>
   </thead>

config/locales/school_daily_reports/zh.yml

@@ -3,5 +3,5 @@ zh:
     teacher_increase_count: 新增教师
     student_increase_count: 新增学生
     course_increase_count: 新增课堂
-    shixun_increase_count: 新增实训
+    shixun_increase_count: 新增实训作业
     active_user_count: 活跃用户