Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/lazhang-data.js

dapingmu.html

@@ -124,16 +124,17 @@
         <div class="col-md-7 text-white ">
             <div class="text-center text-lg big-letter">本厂今日生产能手榜</div>
             <div class="row">
-                <div class="col-6 text-center big-letter">红榜</div>
-                <div class="col-6 text-center big-letter">黑榜</div>
-            </div>
-            <div class="row">
-                <div class="col-md-3">
+                <div class="col-md-6">
                     <table class="table table-bordered text-center table-striped">
                         <thead>
                         <tr>
+                            <th scope="col" colspan="4">红榜</th>
+                        </tr>
+                        <tr>
                             <th>人员</th>
                             <th>良品数</th>
+                            <th>人员</th>
+                            <th>不良率</th>
 
                         </tr>
                         </thead>
@@ -142,45 +143,22 @@
 
                     </table>
                 </div>
-                <div class="col-md-3">
+
+                <div class="col-md-6">
                     <table class="table table-bordered text-center table-striped">
                         <thead>
                         <tr>
-                            <th>人员</th>
-                            <th>不良率</th>
-
+                            <th scope="col" colspan="4">黑榜</th>
                         </tr>
-                        </thead>
-                        <tbody id="rank-four">
-                        </tbody>
-                    </table>
-                </div>
-                <div class="col-md-3">
-                    <table class="table table-bordered text-center table-striped">
-                        <thead>
                         <tr>
                             <th>人员</th>
                             <th>良品数</th>
-
-                        </tr>
-                        </thead>
-                        <tbody id="rank-three">
-                        </tbody>
-                    </table>
-                </div>
-                <div class="col-md-3">
-                    <table class="table table-bordered text-center table-striped">
-                        <thead>
-                        <tr>
-
-                        </tr>
-                        <tr>
                             <th>人员</th>
-
                             <th>不良率</th>
+
                         </tr>
                         </thead>
-                        <tbody id="rank-five">
+                        <tbody id="rank-three">
                         </tbody>
                     </table>
                 </div>

js/dapingmu-display.js

@@ -53,8 +53,6 @@ function showChart() {
     showEachSpot();
     showEachSpot1();
     showEachSpot2();
-    showEachSpot3();
-    showEachSpot4();
 
     stackAndFailChart = Highcharts.chart('graph-1', {
         chart: {
@@ -217,8 +215,7 @@ function updateChart() {
     showEachSpot();
     showEachSpot1();
     showEachSpot2();
-    showEachSpot3();
-    showEachSpot4();
+
 }
 
 var stackAndFailChart = null;