CCC

denglu.html

@@ -93,7 +93,6 @@
             </div>
             <div style="color: #ffffff"><img src="images/logo.jpg" style="width: 10%"> &nbsp;&nbsp;&nbsp;&nbsp;深圳市度彼电子有限公司
             </div>
-            <div onclick="get_stop_scheudle()" class="btn btn-warning"> 下班 </div>
             <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
         </div>
     </nav>

js/basic.js

@@ -1,5 +1,5 @@
 let Queue = {IS_LOADED : false, nowuse : 0, SVR_URL:"/server/", groupsCount : 0, groups:[], shouldStop : false, backup:["/server/","http://localhost:8803/server/","http://172.30.84.3:8803/server/","https://1.niimei.com/server/"] ,list:[]};
-
+let Users = {list : []};
 function get_server_url() {
     let output = $.ajax({url: Queue.SVR_URL + "/fcWorker/list?userId=1", timeout:1000 }).fail(on_check_fail).done(function(){
         Queue.IS_LOADED = true;
@@ -179,6 +179,9 @@ function on_document_load() {
 }
 
 function send_alert(a, b){
+
+    if(Queue.shouldStop) return;
+
     var q = "<!-- Modal 部分开始 -->\n<div class=\"modal fade\" id=\"alertModal\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n    <div class=\"modal-dialog\" role=\"document\">\n        <div class=\"modal-content\">\n            <div class=\"modal-header\">\n                <h5 class=\"modal-title\" id=\"alertModalLabel\">New message</h5>\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                    <span aria-hidden=\"true\">&times;</span>\n                </button>\n            </div>\n            <div class=\"modal-body\">\n                <form>\n                    <div class=\"form-group\">\n                        <label for=\"recipient-name\" class=\"col-form-label\">Recipient:</label>\n                        <input type=\"text\" class=\"form-control\" id=\"recipient-name\">\n                    </div>\n                    <div class=\"form-group\">\n                        <label for=\"message-text\" class=\"col-form-label\">Message:</label>\n                        <textarea class=\"form-control\" id=\"message-text\"></textarea>\n                    </div>\n                </form>\n            </div>\n            <div class=\"modal-footer\">\n                <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>\n                <button type=\"button\" class=\"btn btn-primary\">Send message</button>\n            </div>\n        </div>\n    </div>\n</div>";
     //var model = document.createElement("div");
     if($("#modalContainer").length <= 0){
@@ -196,5 +199,16 @@ function send_alert(a, b){
     }
 }
 
+function getUserName(id){
+    get_data("fcWorker/list?userId="+id, on_username_retn);
+}
+
+function on_username_retn(obj, sta) {
+    var out = first_parse(this, obj);
+    if(out.list.length > 0){
+        Users.list.push({});
+    }
+}
+
 $(document).ready(on_document_load);
 get_server_url();

js/basic1.js

@@ -184,11 +184,9 @@ function chart_success(obj, sta) {
     console.log(redchart);
 
     for(i=0;i<3;i++){
-        goodid[i]=redchart.list[i].workerId;
+        goodid[i]=getUserName(redchart.list[i].workerId);
         goodpass[i]=redchart.list[i].passNum;
         goodfailrate[i]=redchart.list[i].failRate/100;
-
-
     }
 
 
@@ -201,11 +199,9 @@ function chart1_success(obj, sta) {
     console.log(blackchart);
 
     for(i=0;i<3;i++){
-        badid[i]=blackchart.list[i].workerId;
+        badid[i] = getUserName(blackchart.list[i].workerId);
         badpass[i]=blackchart.list[i].passNum;
         badfailrate[i]=blackchart.list[i].failRate/100;
-
-
     }
 
 

js/lazhang-data.js

@@ -123,7 +123,7 @@ function load_table_black_rank() {
 }
 
 function get_stop_scheudle(){
-    get_data("fcBiWorkerDaily/get?type=4&limit=3", stopSuccess);
+    get_data("fcWorkSchedule/stopSchedule?scheduleId=" + scheduleId, stopSuccess);
 }
 
 function stopSuccess(obj, sta){
@@ -191,11 +191,9 @@ function on_red_rank_success(obj, sta) {
     console.log(" redchart : ");
     console.log(redchart);
     for (i = 0; i < redchart.list.length; i++) {
-        goodid[i] = redchart.list[i].workerId;
+        goodid[i] = getUserName(redchart.list[i].workerId);
         goodpass[i] = redchart.list[i].passNum;
         goodfailrate[i] = redchart.list[i].failRate / 100;
-
-
     }
 
 
@@ -209,7 +207,7 @@ function on_black_rank_success(obj, sta) {
     console.log(blackchart);
 
     for (i = 0; i < blackchart.list.length; i++) {
-        badid[i] = blackchart.list[i].workerId;
+        badid[i] = getUserName(blackchart.list[i].workerId);
         badpass[i] = blackchart.list[i].passNum;
         badfailrate[i] = blackchart.list[i].failRate / 100;
     }
@@ -275,23 +273,23 @@ function realtime_success(obj, sta) {
     for (k = 0; k < sectorID.length; k++) {
         var uid = sectorID[k];
         z = 0;
+        passNumber[k] = 0;
+        failNumber[k] = 0;
+        stackeverynum[k] = 0;
         for (i = 0; i < output.list.length; i++) {
             if (uid === output.list[i].sectorId) {
-                passNumber[k] = output.list[i].passNum + passNumber[j];
-                failNumber[k] = output.list[i].failNum + failNumber[j];
-                stackeverynum[k] = output.list[i].due + stackeverynum[j];
+                passNumber[k] = output.list[i].passNum + passNumber[k];
+                failNumber[k] = output.list[i].failNum + failNumber[k];
+                stackeverynum[k] = output.list[i].due + stackeverynum[k];
                 z++;
             }
         }
         if (failNumber[k] + passNumber[k] == 0) {
             failrate[k] = 0;
-        }
-        else {
+        } else {
             failrate[k] = failNumber[k] / (failNumber[k] + passNumber[k]) * 100;
-
         }
         /*stackeverynum[k]=stackeverynum[k]/z;*/
-
         ///
 
     }

js/lazhang-display.js

@@ -18,7 +18,6 @@ function getSpotHtml1(htmlbody, i) {
     htmlbody += `<tr>
                     <td>${goodid[i]}</td>
                     <td>${goodpass[i]}</td>
-                    <td>${goodid[i]}</td>
                     <td>${goodfailrate[i] + '%'}</td>
                 </tr>`;
     htmlbody += "</tr>";
@@ -30,7 +29,6 @@ function getSpotHtml2(htmlbody, i) {
     htmlbody += `<tr>
                     <td>${badid[i]}</td>
                     <td>${badpass[i]}</td>
-                    <td>${badid[i]}</td>
                     <td>${badfailrate[i] + '%'}</td>
                 </tr>`;
     htmlbody += "</tr>";

lazhang.html

@@ -92,6 +92,7 @@
             <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>
+        <div onclick="get_stop_scheudle()" class="btn btn-warning"> 下班 </div>
         <font color="#ffffff"><span id="nowDateTimeSpan"></span></font>
     </div>