Browse Source

Update Pages / Ranking basic

jason.lu 6 years ago
parent
commit
75b6fa6b69
8 changed files with 270 additions and 311 deletions
  1. 81 23
      dapingmu.html
  2. 60 52
      denglu.html
  3. 60 169
      js/common.js
  4. 5 6
      js/dapingmu-display.js
  5. 7 6
      js/entrance.js
  6. 1 0
      js/lazhang-data.js
  7. 6 6
      js/lazhang-display.js
  8. 50 49
      lazhang.html

+ 81 - 23
dapingmu.html

@@ -21,7 +21,7 @@
     <link href="plugins/morrisjs/morris.css" rel="stylesheet" />
 
     <!-- Custom Css -->
-    <link href="css/style-frontend.css" rel="stylesheet">
+    <!--<link href="css/style-frontend.css" rel="stylesheet">-->
 
     <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
     <link href="css/themes/all-themes.css" rel="stylesheet" />
@@ -34,13 +34,13 @@
         /* css 代码  */
         th, td{
             color:white;
-            font-size:2em;
+            font-size: 1.2em;
         }
         .big-letter{
-            font-size: 2em;
+            font-size: 1.2em;
         }
         .middle-font{
-            font-size: 1.2em;
+            font-size: 1.02em;
         }
     </style>
     <script src="css/third/hchart.js"></script>
@@ -52,23 +52,56 @@
 </head>
 
 <body class="theme-black" style="background-color: #2d2d2d !important;" onload="startTime()">
-<nav class="navbar" style="background-color: red">
-    <div class="container-fluid">
+<nav class="navbar clearfix navbar-expand-lg navbar-dark" role="navigation" style="background-color: #732020;">
+    <a class="navbar-brand" href="#">
+        <img src="images/logo.jpg" width="42" height="30" class="d-inline-block align-top" alt="">
+        工厂产能监控系统
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item">
+                <a class="nav-link" href="denglu.html"> 主页 <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item active">
+                <a class="nav-link" href="#">全厂大屏</a>
+            </li>
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    前往
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item" href="#" onclick="history.go(0)">刷新</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="/server">后台入口</a>
+                </div>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link bg-red text-white" href="javascript:void">深圳市度彼电子有限公司</a>
+            </li>
+        </ul>
+        <form class="form-inline my-2 my-lg-0 text-white" >
+            <button class="btn btn-outline-dark my-2 my-sm-0 text-white" id="nowDateTimeSpan"></button>
+            <button class="btn btn-success my-2 my-sm-0" type="submit">重新加载</button>
+        </form>
+    </div>
+    <!--<div class="container-fluid">
         <div class="navbar-header">
             <a class="navbar-brand" href="index.html">工厂产能监控系统</a>
         </div>
         <div style="color:#fff" class="text-center"><img src="images/logo.jpg" style="width: 10%;"> 深圳市度彼电子有限公司</div>
         <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
-    </div>
-
+    </div>-->
 </nav>
-<div class="container" style="max-width:none; !important; padding-top:100px;">
+<div class="container" style="max-width:none; !important;">
     <div class="alert alert-warning" id="mpAlert" style="display:none">
     </div>
     <div class="text-white row middle-font">
-        <div class="col-md-5">
+        <div class="col-md-3">
             <div class="text-center big-letter">全厂产能统计</div>
-            <table class="table table-bordered text-center" style="color: #ffffff">
+            <table class="table table-bordered text-center">
                 <thead>
                 <tr>
                     <th scope="col">时间</th>
@@ -83,43 +116,68 @@
                 </tbody>
             </table>
         </div>
-        <div class="col-md-7 text-white ">
+        <div class="col-md-9 text-white">
             <div class="text-center text-lg big-letter">本厂今日生产能手榜</div>
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-3">
                     <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>
+                            <th>坏品</th>
                             <th>不良率</th>
 
                         </tr>
                         </thead>
                         <tbody id="rank-two">
                         </tbody>
-
                     </table>
                 </div>
 
-                <div class="col-md-6">
+                <div class="col-md-3">
                     <table class="table table-bordered text-center table-striped">
                         <thead>
                         <tr>
-                            <th scope="col" colspan="4">黑榜</th>
+                            <th>人员</th>
+                            <th>良品</th>
+                            <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>
                             <th>人员</th>
-                            <th>良品数</th>
+                            <th>良品</th>
+                            <th>坏品</th>
+                            <th>不良率</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>
+                            <th>坏品</th>
                             <th>不良率</th>
+
                         </tr>
                         </thead>
-                        <tbody id="rank-three">
+                        <tbody id="rank-five">
                         </tbody>
                     </table>
                 </div>

+ 60 - 52
denglu.html

@@ -26,8 +26,8 @@
     <!-- Morris Chart Css-->
     <link href="plugins/morrisjs/morris.css" rel="stylesheet"/>
 
-    <!-- Custom Css -->
-    <link href="css/style-frontend.css" rel="stylesheet">
+    <!-- Custom Css - ->
+    <link href="css/style-frontend.css" rel="stylesheet"-->
 
     <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
     <link href="css/themes/all-themes.css" rel="stylesheet"/>
@@ -44,58 +44,67 @@
     <script src="css/third/exporting.js"></script>
     <script src="css/third/cn.js"></script>
     <script src="css/third/dark.js"></script>
-    <script language="JavaScript">
-        function startTime() {
-            var today = new Date();//定义日期对象
-            var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
-            var MM = today.getMonth() + 1;//通过日期对象的getMonth()方法返回年
-            var dd = today.getDate();//通过日期对象的getDate()方法返回年
-            var hh = today.getHours();//通过日期对象的getHours方法返回小时
-            var mm = today.getMinutes();//通过日期对象的getMinutes方法返回分钟
-            var ss = today.getSeconds();//通过日期对象的getSeconds方法返回秒
-            // 如果分钟或小时的值小于10,则在其值前加0,比如如果时间是下午3点20分9秒的话,则显示15:20:09
-            MM = checkTime(MM);
-            dd = checkTime(dd);
-            mm = checkTime(mm);
-            ss = checkTime(ss);
-            var day; //用于保存星期(getDay()方法得到星期编号)
-            if (today.getDay() == 0) day = "星期日 "
-            if (today.getDay() == 1) day = "星期一 "
-            if (today.getDay() == 2) day = "星期二 "
-            if (today.getDay() == 3) day = "星期三 "
-            if (today.getDay() == 4) day = "星期四 "
-            if (today.getDay() == 5) day = "星期五 "
-            if (today.getDay() == 6) day = "星期六 "
-            document.getElementById('nowDateTimeSpan').innerHTML = yyyy + "-" + MM + "-" + dd + "   " + day + " " + hh + ":" + mm + ":" + ss;
-            setTimeout('startTime()', 1000);//每一秒中重新加载startTime()方法
-        }
-
-        function checkTime(i) {
-            if (i < 10) {
-                i = "0" + i;
-            }
-            return i;
-        }
-    </script>
 </head>
 
 <body class="" style="background-color: #17253f !important;" onload="startTime();">
-<div class="text-center">
-    <nav class="navbar" style="background-color: red">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                <a class="navbar-brand text-white" href="index.html">工厂产能监控系统</a>
-            </div>
-            <div style="color: #ffffff"><img src="images/logo.jpg" style="width: 10%"> &nbsp;&nbsp;&nbsp;&nbsp;深圳市度彼电子有限公司
-            </div>
-            <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
-            <div onclick="logout()" class="btn btn-warning"> 注销账户 </div>
+<nav class="navbar clearfix navbar-expand-lg navbar-dark" role="navigation" style="background-color: #732020;">
+    <a class="navbar-brand" href="#">
+        <img src="images/logo.jpg" width="42" height="30" class="d-inline-block align-top" alt="">
+        工厂产能监控系统
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item active">
+                <a class="nav-link" href="#"> 主页 <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link" href="dapingmu.html">全厂大屏</a>
+            </li>
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    前往
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item" href="#" onclick="history.go(0)">刷新</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="/server">后台入口</a>
+                </div>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link bg-red text-white" href="javascript:void">深圳市度彼电子有限公司</a>
+            </li>
+        </ul>
+        <form class="form-inline my-2 my-lg-0 text-white" >
+            <button class="btn btn-outline-dark my-2 my-sm-0 text-white" id="nowDateTimeSpan"></button>
+            <button class="btn btn-success my-2 my-sm-0" type="submit">重新加载</button>
+        </form>
+    </div>
+    <!--<div class="container-fluid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="index.html">工厂产能监控系统</a>
         </div>
-    </nav>
-    <div class="container-fluid" style="margin-top: 10em">
+        <div style="color:#fff" class="text-center"><img src="images/logo.jpg" style="width: 10%;"> 深圳市度彼电子有限公司</div>
+        <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
+    </div>-->
+</nav>
+<div class="jumbotron">
+    <h1 class="display-4">欢迎使用工厂产能监控系统</h1>
+    <p class="lead">您可以在下方开始新的班次,或查看以往班次</p>
+    <hr class="my-4">
+    <p>或者前往后台管理来查看生产数据</p>
+    <p class="lead">
+        <a class="btn btn-primary btn-lg" href="/server" role="button">前往后台</a>
+    </p>
+</div>
+<div class="text-center">
+    <div class="alert alert-warning" id="mpAlert" style="display: none"></div>
+    <div class="container-fluid" style="margin-top: 1em">
         <div class="row">
             <div class="col-lg-4 col-md-6">
-                <div class="card">
+                <div class="card" style="height: 40vh;">
                     <h5 class="card-header">
                         生产线模式 :
                         <select name="select" id="pro_areaCode">
@@ -115,7 +124,7 @@
                 </div>
             </div>
             <div class="col-lg-4 col-md-6">
-                <div class="card">
+                <div class="card"  style="height: 40vh;">
                     <h5 class="card-header">大屏模式</h5>
                     <div class="card-body">
                         <h5 class="card-title">您可以看到全厂实时状况</h5>
@@ -126,13 +135,12 @@
             </div>
 
             <div class="col-lg-4 col-md-6">
-                <div class="card">
+                <div class="card"  style="height: 40vh;">
                     <h5 class="card-header">
                         正在进行的生产
                     </h5>
                     <div class="card-body">
-                        <h5 class="card-title">需要关闭相关班次才能进行班次结算、报表生成操作。</h5>
-                        <div class="alert alert-warning" id="mpAlert" style="display:none"></div>
+                        <div class="alert alert-warning" id="mpexist" style="display: none"></div>
                         <div class="alert alert-link" id="mpRemain" style="display:none"></div>
                     </div>
                 </div>

+ 60 - 169
js/common.js

@@ -3,19 +3,20 @@ getUserId();
 function load_table_red_rank() {
     get_data("fcBiWorkerDaily/get?type=1&limit=3", on_red_rank_success);
 }
+
 function load_table_red_rank1() {
     get_data("fcBiWorkerDaily/get?type=2&limit=3", on_red_rank_success1);
 }
+
 function load_table_black_rank1() {
     get_data("fcBiWorkerDaily/get?type=3&limit=3", on_black_rank_success1);
-
 }
+
 function load_table_black_rank() {
     get_data("fcBiWorkerDaily/get?type=0&limit=3", on_black_rank_success);
-
 }
 
-
+var RANK_TBL_ROW_COUNT = 4;
 var goodColor = [];
 var badColor = [];
 var goodColor1 = [];
@@ -90,18 +91,17 @@ function history_success(obj, sta) {
     update_all_history();
 }
 
-function update_all_history(){
+function update_all_history() {
     hispass[0] = todayotherpass + schedulepass;
     hisfail[0] = todayotherfail + schedulefail;
     hisstack[0] = todayotherstack + schedulestack;
     hisrate[0] = get_factor(hispass[0], hisfail[0]);
 
-    if(typeof hisrate[0] == "undefined" || isNaN(hisrate[0])){
+    if (typeof hisrate[0] == "undefined" || isNaN(hisrate[0])) {
         send_alert("请重试!");
-
     }
 
-    for(i=2;i<=3;i++){
+    for (i = 2; i <= 3; i++) {
         hispass[i] = orighispass[i] + hispass[0];
         hisfail[i] = orighisfail[i] + hisfail[0];
         hisstack[i] = orighisstack[i] + hisstack[0];
@@ -109,8 +109,8 @@ function update_all_history(){
     }
 }
 
-var todayotherpass , todayotherfail, todayotherstack;
-var orighisfail= [], orighispass=[], orighisstack=[];
+var todayotherpass, todayotherfail, todayotherstack;
+var orighisfail = [], orighispass = [], orighisstack = [];
 
 function isUserOfThisFlow(uid) {
     var isExist = false;
@@ -131,19 +131,20 @@ function on_red_rank_success(obj, sta) {
     for (i = 0; i < redchart.list.length; i++) {
         goodid[i] = getUserName(redchart.list[i].workerId);
         goodpass[i] = redchart.list[i].passNum;
-        if(redchart.list[i].passNum + redchart.list[i].failNum > 0) {
+        if (redchart.list[i].passNum + redchart.list[i].failNum > 0) {
             goodfailrate[i] = Math.floor(redchart.list[i].failNum * 10000 / (redchart.list[i].passNum + redchart.list[i].failNum)) / 100;
-        }else{
+        } else {
             goodfailrate[i] = 0;
         }
-        if(isUserOfThisFlow(redchart.list[i].workerId)){
+        if (isUserOfThisFlow(redchart.list[i].workerId)) {
             goodColor[i] = 'red';
-        }else{
+        } else {
             goodColor[i] = '';
         }
     }
 
 }
+
 function on_red_rank_success1(obj, sta) {
     var redchart = first_parse(this, obj);
     var i, j;
@@ -153,14 +154,14 @@ function on_red_rank_success1(obj, sta) {
     for (i = 0; i < redchart.list.length; i++) {
         goodid1[i] = getUserName(redchart.list[i].workerId);
         goodpass1[i] = redchart.list[i].passNum;
-        if(redchart.list[i].passNum + redchart.list[i].failNum > 0) {
+        if (redchart.list[i].passNum + redchart.list[i].failNum > 0) {
             goodfailrate1[i] = Math.floor(redchart.list[i].failNum * 10000 / (redchart.list[i].passNum + redchart.list[i].failNum)) / 100;
-        }else{
+        } else {
             goodfailrate1[i] = 0;
         }
-        if(isUserOfThisFlow(redchart.list[i].workerId)){
+        if (isUserOfThisFlow(redchart.list[i].workerId)) {
             goodColor1[i] = 'red';
-        }else{
+        } else {
             goodColor1[i] = '';
         }
     }
@@ -177,20 +178,21 @@ function on_black_rank_success(obj, sta) {
         badid[i] = getUserName(blackchart.list[i].workerId);
         badpass[i] = blackchart.list[i].passNum;
         //badfailrate[i] = blackchart.list[i].failRate / 100;
-        if(blackchart.list[i].passNum + blackchart.list[i].failNum > 0) {
+        if (blackchart.list[i].passNum + blackchart.list[i].failNum > 0) {
             badfailrate[i] = Math.floor(blackchart.list[i].failNum * 10000 / (blackchart.list[i].passNum + blackchart.list[i].failNum)) / 100;
-        }else{
+        } else {
             badfailrate[i] = 0;
         }
-        if(isUserOfThisFlow(blackchart.list[i].workerId)){
+        if (isUserOfThisFlow(blackchart.list[i].workerId)) {
             badColor[i] = 'green';
-        }else{
+        } else {
             badColor[i] = '';
         }
     }
 
 
 }
+
 function on_black_rank_success1(obj, sta) {
     var blackchart = first_parse(this, obj);
     var i, j;
@@ -201,14 +203,14 @@ function on_black_rank_success1(obj, sta) {
         badid1[i] = getUserName(blackchart.list[i].workerId);
         badpass1[i] = blackchart.list[i].passNum;
         //badfailrate[i] = blackchart.list[i].failRate / 100;
-        if(blackchart.list[i].passNum + blackchart.list[i].failNum > 0) {
+        if (blackchart.list[i].passNum + blackchart.list[i].failNum > 0) {
             badfailrate1[i] = Math.floor(blackchart.list[i].failNum * 10000 / (blackchart.list[i].passNum + blackchart.list[i].failNum)) / 100;
-        }else{
+        } else {
             badfailrate1[i] = 0;
         }
-        if(isUserOfThisFlow(blackchart.list[i].workerId)){
+        if (isUserOfThisFlow(blackchart.list[i].workerId)) {
             badColor1[i] = 'green';
-        }else{
+        } else {
             badColor1[i] = '';
         }
     }
@@ -216,8 +218,8 @@ function on_black_rank_success1(obj, sta) {
 
 }
 
-function getSpotHtml(htmlbody, i) {
-    if(typeof hispass[i] === "undefined"){
+function getHistoryTableBody(htmlbody, i) {
+    if (typeof hispass[i] === "undefined") {
         htmlbody += "<tr>";
         htmlbody += `<tr>
                     <td> - </td>
@@ -241,192 +243,81 @@ function getSpotHtml(htmlbody, i) {
     return htmlbody;
 }
 
-function getSpotHtml1(htmlbody, i) {
-    if(typeof goodid[i] === "undefined"){
+function getRankingTableBody(htmlbody, i) {
+    if (typeof goodRank === "undefined" || typeof goodRank[i] === "undefined") {
         htmlbody += "<tr>";
         htmlbody += `<tr>
                     <td> - </td>
-                    <td> - </td>
-                    <td> - </td>
-                    <td> - </td>
+                    <td> 0 </td>
+                    <td> 0 </td>
+                    <td> 0 </td>
                 </tr>`;
         htmlbody += "</tr>";
         return htmlbody;
     }
     htmlbody += "<tr>";
     htmlbody += `<tr ">
-                    <td style="background-color: ${goodColor[i]}">${goodid[i]}</td>
-                    <td style="background-color: ${goodColor[i]}">${goodpass[i]}</td>
-                    <td style="background-color: ${goodColor1[i]}">${goodid1[i]}</td>
-                    <td style="background-color: ${goodColor1[i]}">${goodfailrate1[i] + '%'}</td>
+                    <td style="background-color: ${goodRank[i].color}">${goodRank[i].id}</td>
+                    <td style="background-color: ${goodRank[i].color}">${goodRank[i].pass}</td>
+                    <td style="background-color: ${goodRank[i].color}">${goodRank[i].fail}</td>
+                    <td style="background-color: ${goodRank[i].color}">${goodRank[i].failRate + '%'}</td>
                 </tr>`;
     htmlbody += "</tr>";
     return htmlbody;
 }
 
-/*function getSpotHtml3(htmlbody, i) {
-    if(typeof goodid1[i] === "undefined"){
-        htmlbody += "<tr>";
-        htmlbody += `<tr>
-                    <td> - </td>
-                    <td> - </td>
-                    
-                </tr>`;
-        htmlbody += "</tr>";
-        return htmlbody;
-    }
-    htmlbody += "<tr>";
-    htmlbody += `<tr style="background-color: ${goodColor1[i]}">
-                    <td>${goodid1[i]}</td>
-                    <td>${goodfailrate1[i] + '%'}</td>
-                </tr>`;
-    htmlbody += "</tr>";
-    return htmlbody;
-}*/
-
-function getSpotHtml2(htmlbody, i) {
-    if(typeof badid[i] === "undefined"){
-        htmlbody += "<tr>";
-        htmlbody += `<tr>
-                    <td> - </td>
-                    <td> - </td>
-                    <td> - </td>
-                    <td> - </td>
-                </tr>`;
-        htmlbody += "</tr>";
-        return htmlbody;
-    }
-    htmlbody += "<tr>";
-    if(typeof badColor[i] === "undefined"){
-        htmlbody += `<tr>
-                    <td style="background-color: ${badColor[i]}">${badid[i]}</td>
-                    <td style="background-color: ${badColor[i]}">${badpass[i]}</td>
-                    <td style="background-color: ${badColor1[i]}">${badid1[i]}</td>
-                    <td style="background-color: ${badColor1[i]}">${badfailrate1[i] + '%'}</td>
-                </tr>`;
-    }else {
-        htmlbody += `<tr >
-                    <td style="background-color: ${badColor[i]}">${badid[i]}</td>
-                    <td style="background-color: ${badColor[i]}">${badpass[i]}</td>
-                    <td style="background-color: ${badColor1[i]}">${badid1[i]}</td>
-                    <td style="background-color: ${badColor1[i]}">${badfailrate1[i] + '%'}</td>
-                </tr>`;
-    }
-    htmlbody += "</tr>";
-    return htmlbody;
-}
-/*function getSpotHtml4(htmlbody, i) {
-    if(typeof badid1[i] === "undefined"){
-        htmlbody += "<tr>";
-        htmlbody += `<tr>
-                    <td> - </td>
-                    <td> - </td>
-                    
-                </tr>`;
-        htmlbody += "</tr>";
-        return htmlbody;
-    }
-    htmlbody += "<tr>";
-    if(typeof badColor1[i] === "undefined"){
-        htmlbody += `<tr style="background-color: ${badColor1[i]}">
-                    <td>${badid1[i]}</td>
-                    
-                    <td>${badfailrate1[i] + '%'}</td>
-                </tr>`;
-    }else {
-        htmlbody += `<tr style="background-color: ${badColor1[i]}">
-                    <td>${badid1[i]}</td>
-                    <td>${badfailrate1[i] + '%'}</td>
-                </tr>`;
-    }
-    htmlbody += "</tr>";
-    return htmlbody;
-}*/
-
 var lastTimeRank0 = "";
 var lastTimeRank1 = "";
 var lastTimeRank2 = "";
 var lastTimeRank3 = "";
 var lastTimeRank4 = "";
 
-function showEachSpot() {
+function showHistoryData() {
     var htmlbody = "", one_person = "";
     var i = 0;
     var triGap = 4;
     htmlbody = "";
     for (i = 0; i < triGap; i++) {
 
-        htmlbody = getSpotHtml(htmlbody, i);
+        htmlbody = getHistoryTableBody(htmlbody, i);
     }
-    if(lastTimeRank0 !== htmlbody) {
+    if (lastTimeRank0 !== htmlbody) {
         $("#rank-one").html(htmlbody);
         lastTimeRank0 = htmlbody;
     }
     //console.log(htmlbody);
 }
 
-function showEachSpot1() {
-
+function showRedRanking() {
     var htmlbody = "", one_person = "";
     var i = 0;
-    var triGap = 3;
+    var triGap = RANK_TBL_ROW_COUNT;
     htmlbody = "";
     for (i = 0; i < triGap; i++) {
 
-        htmlbody = getSpotHtml1(htmlbody, i);
+        htmlbody = getRankingTableBody(htmlbody, i);
     }
-    if(lastTimeRank1 !== htmlbody){
+    if (lastTimeRank1 !== htmlbody) {
         $("#rank-two").html(htmlbody);
         lastTimeRank1 = htmlbody;
     }
     //console.log(htmlbody);
 }
-/*function showEachSpot3() {
-
-    var htmlbody = "", one_person = "";
-    var i = 0;
-    var triGap = 3;
-    htmlbody = "";
-    for (i = 0; i < triGap; i++) {
-
-        htmlbody = getSpotHtml3(htmlbody, i);
-    }
-    if(lastTimeRank3 !== htmlbody){
-        $("#rank-four").html(htmlbody);
-        lastTimeRank3 = htmlbody;
-    }
-    //console.log(htmlbody);
-}*/
-
-function showEachSpot2() {
-    var htmlbody = "", one_person = "";
-    var i = 0;
-    var triGap = 3;
-
-    htmlbody = "";
-    for (i = 0; i < triGap; i++) {
-
-        htmlbody = getSpotHtml2(htmlbody, i);
-    }
-    if(lastTimeRank2 !== htmlbody){
-        $("#rank-three").html(htmlbody);
-        lastTimeRank2 = htmlbody;
-    }
-    //console.log(htmlbody);
-}
-/*function showEachSpot4() {
-    var htmlbody = "", one_person = "";
-    var i = 0;
-    var triGap = 3;
 
-    htmlbody = "";
-    for (i = 0; i < triGap; i++) {
 
-        htmlbody = getSpotHtml4(htmlbody, i);
-    }
-    if(lastTimeRank4 !== htmlbody){
-        $("#rank-five").html(htmlbody);
-        lastTimeRank4 = htmlbody;
-    }
+function showBlackRanking() {
+    return; // Not Showing Because we now try to scroll pages.
+    //
+    // var htmlbody = "", one_person = "";
+    // var i = 0;
+    // var triGap = RANK_TBL_ROW_COUNT;
+    // htmlbody = "";
+    // for (i = 0; i < triGap; i++) {
+    //     htmlbody = getBlackRanking(htmlbody, i);
+    // }
+    // if (lastTimeRank2 !== htmlbody) {
+    //     $("#rank-three").html(htmlbody);
+    //     lastTimeRank2 = htmlbody;
+    // }
     //console.log(htmlbody);
-}*/
+}

+ 5 - 6
js/dapingmu-display.js

@@ -50,9 +50,8 @@ function showChart() {
         categories: iddata,
     };
 
-    showEachSpot();
-    showEachSpot1();
-    showEachSpot2();
+    showHistoryData();
+    showRedRanking();
 
     stackAndFailChart = Highcharts.chart('graph-1', {
         chart: {
@@ -214,9 +213,9 @@ function updateChart() {
     stackAndFailChart.series[2].setData(stackdata);
     FailChart.series[0].setData(ratedata);
 
-    showEachSpot();
-    showEachSpot1();
-    showEachSpot2();
+    showHistoryData();
+    showRedRanking();
+    showBlackRanking();
 
 }
 

+ 7 - 6
js/entrance.js

@@ -138,9 +138,10 @@ function getRemainHTML(obj) {
     return `<a href='lazhang.html?scheduleId=${obj.scheduleId}&flowId=${obj.flowId}&userId=${userId}' style="color:#d3a60c"> ${obj.flowName} ${obj.workDay} ${pdName}</a><br> `
 }
 
-function send_remain(a, b) {
-    $("#mpRemain").html(a);
-    $("#mpRemain").show();
+
+function send_remain(a, tag) {
+    $("#"+tag).html(a);
+    $("#"+tag).show();
     return;
 }
 
@@ -151,7 +152,7 @@ function on_receive_exist(objs, sta){
     if(obj != null && obj != undefined && obj.list != null){
         if(obj.list.length === 0){
             wholehtml = "当前没有正在进行的班次<br>请开始班次!";
-            send_remain(wholehtml);
+            send_remain(wholehtml, "mpRemain");
             return;
         }
         let i = 0;
@@ -159,8 +160,8 @@ function on_receive_exist(objs, sta){
         for(i=0;i<obj.list.length;i++){
             wholehtml += getRemainHTML(obj.list[i]);
         }
-        wholehtml += "任一产线必须结束以前的班次才能开始新的班次!";
-        send_remain(wholehtml);
+        send_remain(wholehtml, "mpRemain");
+        send_remain("请及时关闭已完成班次,否则会影响工人结算、新班次数据统计!", "mpexist")
     }else{
         send_alert("查询失败");
     }

+ 1 - 0
js/lazhang-data.js

@@ -99,6 +99,7 @@ function name_Success(obj, sta) {
     name1=factory.list[0].flowPlace;
     name2=factory.list[0].flowName;
     document.getElementById("test1").innerHTML = name1+"-"+name2;
+    document.title =  name1 + " " + name2 + " | 流水线管理 | 度彼科技";
 
 }
 

+ 6 - 6
js/lazhang-display.js

@@ -56,9 +56,9 @@ function showChart() {
         faildata.push(failNumber[i])
     }
 
-    showEachSpot();
-    showEachSpot1();
-    showEachSpot2();
+    showHistoryData();
+    showRedRanking();
+    showBlackRanking();
 
 
     failratemax = Math.max(failratemax, 5);
@@ -231,9 +231,9 @@ function updateChart() {
         stackAndFailChart.yAxis[0].setExtremes(0, passmax * 1.5);
     }
 
-    showEachSpot();
-    showEachSpot1();
-    showEachSpot2();
+    showHistoryData();
+    showRedRanking();
+    showBlackRanking();
 
 
     var secNames = [];

+ 50 - 49
lazhang.html

@@ -3,7 +3,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <title>流水线管理页</title>
+    <title>加载中 | 流水线管理 | 度彼科技 </title>
     <!-- Favicon-->
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
@@ -24,7 +24,7 @@
     <!-- Morris Chart Css-->
     <link href="plugins/morrisjs/morris.css" rel="stylesheet"/>
 
-    <!-- Custom Css -->
+    <!-- Custom Css -- >
     <link href="css/style-frontend.css" rel="stylesheet">
 
     <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
@@ -42,70 +42,71 @@
         /* css 代码  */
         th, td{
             color:#fff;
-            font-size:2em;
+            font-size: 1.2em;
         }
         .big-letter{
-            font-size: 2em;
+            font-size: 1.2em;
         }
         .middle-font{
-             font-size: 1.2em;
+             font-size: 1.02em;
         }
     </style>
     <script src="css/third/hchart.js"></script>
     <script src="css/third/exporting.js"></script>
     <script src="css/third/cn.js"></script>
     <script src="css/third/dark.js"></script>
-    <script language="JavaScript">
-        function startTime() {
-            var today = new Date();//定义日期对象
-            var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
-            var MM = today.getMonth() + 1;//通过日期对象的getMonth()方法返回年
-            var dd = today.getDate();//通过日期对象的getDate()方法返回年
-            var hh = today.getHours();//通过日期对象的getHours方法返回小时
-            var mm = today.getMinutes();//通过日期对象的getMinutes方法返回分钟
-            var ss = today.getSeconds();//通过日期对象的getSeconds方法返回秒
-            // 如果分钟或小时的值小于10,则在其值前加0,比如如果时间是下午3点20分9秒的话,则显示15:20:09
-            MM = checkTime(MM);
-            dd = checkTime(dd);
-            mm = checkTime(mm);
-            ss = checkTime(ss);
-            var day; //用于保存星期(getDay()方法得到星期编号)
-            if (today.getDay() == 0) day = "星期日 "
-            if (today.getDay() == 1) day = "星期一 "
-            if (today.getDay() == 2) day = "星期二 "
-            if (today.getDay() == 3) day = "星期三 "
-            if (today.getDay() == 4) day = "星期四 "
-            if (today.getDay() == 5) day = "星期五 "
-            if (today.getDay() == 6) day = "星期六 "
-            document.getElementById('nowDateTimeSpan').innerHTML = yyyy + "-" + MM + "-" + dd + " " + hh + ":" + mm + ":" + ss + "   " + day;
-            setTimeout('startTime()', 1000);//每一秒中重新加载startTime()方法
-        }
-
-        function checkTime(i) {
-            if (i < 10) {
-                i = "0" + i;
-            }
-            return i;
-        }
-    </script>
 </head>
 
 <body class="theme-black" style="background-color: #2d2d2d !important;overflow: hidden" onload="startTime()">
-<nav class="navbar" style="background-color: red">
-    <div class="container-fluid">
+<nav class="navbar clearfix navbar-expand-lg navbar-dark" role="navigation" style="background-color: #732020;">
+    <a class="navbar-brand" href="#">
+        <img src="images/logo.jpg" width="42" height="30" class="d-inline-block align-top" alt="">
+        工厂产能监控系统
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item">
+                <a class="nav-link" href="#"> 主页 <span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link" href="dapingmu.html">全厂大屏</a>
+            </li>
+            <li class="nav-item active">
+                <a class="nav-link" href="dapingmu.html">产线大屏</a>
+            </li>
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    前往
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item" href="#" onclick="history.go(0)">刷新</a>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="/server">后台入口</a>
+                </div>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link bg-red text-white" href="javascript:void" id="test1">深圳市度彼电子有限公司</a>
+            </li>
+        </ul>
+        <form class="form-inline my-2 my-lg-0 text-white" >
+            <button class="btn btn-outline-dark my-2 my-sm-0 text-white" id="nowDateTimeSpan"></button>
+            <button class="btn btn-danger my-2 my-sm-0" onclick="get_stop_scheudle1()">下班</button>
+            <button class="btn btn-warning my-2 my-sm-0" onclick="show_clear_panel()">清除数据</button>
+            <button class="btn btn-success my-2 my-sm-0" onclick="history.go(0)">重新加载</button>
+        </form>
+    </div>
+    <!--<div class="container-fluid">
         <div class="navbar-header">
-            <a class="navbar-brand" href="#" onclick="location.href='denglu.html'" >工厂产能监控系统</a>
+            <a class="navbar-brand" href="index.html">工厂产能监控系统</a>
         </div>
-        <div style="color:#fff" class="text-center" id="test1"> 深圳市度彼电子有限公司——激光厂产线1</div>
-
+        <div style="color:#fff" class="text-center"><img src="images/logo.jpg" style="width: 10%;"> 深圳市度彼电子有限公司</div>
         <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
-        <div onclick="show_clear_panel()" class="btn btn-warning"> 清除数据 </div>
-        <div onclick="get_stop_scheudle1()" class="btn btn-warning"> 下班 </div>
-    </div>
-
+    </div>-->
 </nav>
-
-<div class="container" style="max-width:none; !important; padding-top:100px;">
+<div class="container" style="max-width:none; !important;">
     <div class="alert alert-warning" id="mpAlert" style="display:none">
     </div>
     <!-- Modal -->