From 982d27b90a37d8c3c7b4b7adfbcd9c448ead55dd Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 15 May 2019 15:17:20 +0800 Subject: [PATCH 1/5] || ratio === 125 --- public/javascripts/educoder/edu_application.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 { From 1d197501bd9ab39407fcc70ad30b2fee5ce78587 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 16 May 2019 12:11:17 +0800 Subject: [PATCH 2/5] 1 --- app/views/colleges/statistics.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 %>台
    • +
    From 88d4bed9891ac800856c5fe21b2fa6c23cf632fc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 16 May 2019 16:48:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/update_notice.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 }); }); From 1350e8fb59038e6c94177767f051b05caef76a72 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 17 May 2019 15:06:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9A=84=E8=B4=A6=E5=8F=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/users_trial.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 @@ 搜索 清除 - - - +
    + + 导入学生账号 +
    From b8daa7e818bd62d54a7c385823a047fd5c6249cc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 17 May 2019 15:15:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- app/views/managements/import_student_accounts.js.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/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