diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 775b1947..b4e5b0b4 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -2929,7 +2929,7 @@ end attachment.save path = attachment.disk_directory name = attachment.disk_filename - if name.split(".").last == "xls" || name.split(".").last == "xlsx" + if name.split(".").last == "xlsx" # lists = readXlsData("files/baolong.xlsx") lists = readXlsData("files/#{path}/#{name}") school_id = nil diff --git a/app/views/colleges/statistics.html.erb b/app/views/colleges/statistics.html.erb index 15535571..0a159d2a 100644 --- a/app/views/colleges/statistics.html.erb +++ b/app/views/colleges/statistics.html.erb @@ -35,7 +35,7 @@
  • 实训
  • 实训报告
  • 学员实战时间
  • -
  • 云主机
  • +
  • <%= @teachers_count %>
  • @@ -44,7 +44,7 @@
  • <%= @shixuns_count %>
  • <%= @shixun_report_count %>
  • <%= @shixun_time_sum %>
  • -
  • <%= @department.present? ? @department.host_count.to_i : @school.departments.first.try(:host_count).to_i %>
  • +
    diff --git a/app/views/managements/import_student_accounts.js.erb b/app/views/managements/import_student_accounts.js.erb index 7008649f..dde4caa6 100644 --- a/app/views/managements/import_student_accounts.js.erb +++ b/app/views/managements/import_student_accounts.js.erb @@ -1,3 +1,5 @@ <% if @status == 1 %> notice_box("导入成功"); +<% else %> +notice_box("导入失败,只支持xlsx文件"); <% end %> \ No newline at end of file diff --git a/app/views/managements/update_notice.html.erb b/app/views/managements/update_notice.html.erb index c0e1f254..adbfc43b 100644 --- a/app/views/managements/update_notice.html.erb +++ b/app/views/managements/update_notice.html.erb @@ -41,7 +41,7 @@ formatTime:'H:i', formatDate:'Y-m-d', validateOnBlur:false, - step:30 + step:10 }); $('#notice_end_time').datetimepicker({ allowBlank:true, @@ -50,7 +50,7 @@ formatTime:'H:i', formatDate:'Y-m-d', validateOnBlur:false, - step:30 + step:10 }); }); diff --git a/app/views/managements/users_trial.html.erb b/app/views/managements/users_trial.html.erb index 6878c433..b872ca87 100644 --- a/app/views/managements/users_trial.html.erb +++ b/app/views/managements/users_trial.html.erb @@ -59,9 +59,9 @@ 搜索 清除 - - - +
    + + 导入学生账号 +
    diff --git a/public/javascripts/educoder/edu_application.js b/public/javascripts/educoder/edu_application.js index 47705d21..437fb319 100644 --- a/public/javascripts/educoder/edu_application.js +++ b/public/javascripts/educoder/edu_application.js @@ -1115,14 +1115,15 @@ function _initZoomCheck() { } var ratio = Math.round(window.devicePixelRatio * 100); // A value of 1 indicates a classic 96 DPI (76 DPI on some platforms) display, while a value of 2 is expected for HiDPI/Retina displays - var isNormalZoom = ratio === 100 || ratio === 200 + // 有个显示器默认值是1.25 + var isNormalZoom = ratio === 100 || ratio === 200 || ratio === 125 if (!isNormalZoom) { suofang(); } $(window).resize(function() { var ratio = Math.round(window.devicePixelRatio * 100); - var isNormalZoom = ratio === 100 || ratio === 200 + var isNormalZoom = ratio === 100 || ratio === 200 || ratio === 125 if (!isNormalZoom) { suofang(); } else {