Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/basic.js

js/basic.js

@@ -101,12 +101,9 @@ function realtime_success(obj, sta) {
     var i, j;
     for (i = 0; i < output.length - 1; i++) {
         passNumber[i] = output[i].passNum;
-        passnum=passNumber[i]+passnum;
     }
     for (i = 0; i < output.length - 1; i++) {
         failNumber[i] = output[i].failNum;
-        failnum=failNumber[i]+failnum;
-
     }
     for (i = 0; i < output.length - 1; i++) {
         if (failNumber[i] + passNumber[i] == 0) {

lazhang.html

@@ -438,7 +438,7 @@
                     </div>
                     <div class="content">
                         <div class="row text-center" style="margin: 0 auto">
-                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">合格率:</div>
+                            <div class="text" style="font-size: 1.5em;padding-top: 0.2em">不良率:</div>
                             <div class="number" style="font-size: 3em" id="test3"></div>
                         </div>
                     </div>
@@ -583,7 +583,7 @@
     function showEachSpot() {
         var htmlbody = "", one_person = "";
         var i = 0;
-        var triGap = Math.floor(sID.length / 3);
+        var triGap = Math.floor(sID.length / 3) + 1;
         var remain = sID.length - triGap * 2;
         htmlbody = "";
         for (i = 0; i < triGap; i++) {