Merge branch 'develop' into educoder

app/views/colleges/statistics.html.erb

@@ -35,7 +35,7 @@
       <li>实训</li>
       <li>实训报告</li>
       <li>学员实战时间</li>
-      <li>云主机</li>
+<!--      <li>云主机</li>-->
     </div>
     <div class="base_status_value">
       <li><span><%= @teachers_count %></span>人</li>
@@ -44,7 +44,7 @@
       <li><span><%= @shixuns_count %></span>个</li>
       <li><span><%= @shixun_report_count %></span>个</li>
       <li><span data-tip-down="所有学员的实训耗时之和"><span><%= @shixun_time_sum %></span>天</span></li>
-      <li><span><%= @department.present? ? @department.host_count.to_i : @school.departments.first.try(:host_count).to_i %></span>台</li>
+<!--      <li><span><%#= @department.present? ? @department.host_count.to_i : @school.departments.first.try(:host_count).to_i %></span>台</li>-->
     </div>
   </div>
 

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 {