CCC

js/basic.js

@@ -1,4 +1,4 @@
-let Queue = {IS_LOADED : false, nowuse : 0, SVR_URL:"/server/", groupsCount : 0, groups:[], backup:["/server/","http://localhost:8803/server/","http://172.30.84.3:8803/server/","https://1.niimei.com/server/"] ,list:[]};
+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:[]};
 
 function get_server_url() {
     let output = $.ajax({url: Queue.SVR_URL + "/fcWorker/list?userId=1", timeout:1000 }).fail(on_check_fail).done(function(){
@@ -71,7 +71,9 @@ function parse_queue(){
             g_request_data(one.url, one.callback, one.gid);
         }
     }
-    setTimeout(parse_queue,100);
+    if(Queue.shouldStop == false) {
+        setTimeout(parse_queue, 100);
+    }
 }
 
 function request_data(url, callback){
@@ -145,6 +147,7 @@ function on_fail(msg) {
     console.warn("-----   网络请求失败 ---------")
     console.warn(JSON.stringify(this));
     console.warn("----------------------------")
+    Queue.shouldStop = true;
 }
 
 function first_parse(ajax, obj) {
@@ -175,5 +178,14 @@ function on_document_load() {
     }
 }
 
+function send_alert(a, b){
+    var modelO = $("#alertModal");
+    if(modelO.length == 0){
+        alert(a);
+    }else{
+        modelO.modal('show');
+    }
+}
+
 $(document).ready(on_document_load);
 get_server_url();

js/lazhang-data.js

@@ -14,7 +14,6 @@ var goodfailrate = [];
 var badpass = [];
 var badid = [];
 var badfailrate = [];
-var t = 0;
 var n = 0;
 var sectorID = [];
 var namedata = [];
@@ -39,9 +38,6 @@ function first_success(obj, sta) {
     let x = 0;
     let worksum = [];
     sectorID[0] = output.list[0].sectorId;
-    passNumber[0] = 0;
-    failNumber[0] = 0;
-    stackeverynum[0] = 0;
     z = 0;
     if(output.list == undefined || output.list.length == 0){
         alert("没有数据，请稍候刷新页面");
@@ -61,6 +57,7 @@ function first_success(obj, sta) {
         }
 
     }
+
     j = 0;
     for (k = 0; k < sectorID.length; k++) {
         var uid = sectorID[k];
@@ -88,12 +85,13 @@ function first_success(obj, sta) {
         ///
 
     }
-    addtime_load_spots_data();
-    for (i = 2; i < 5; i++) {
-        secondtime_load_spots_data();
+
+    for (i = 1; i < 5; i++) {
+        load_flows_history_data(i);
     }
-    chart_load_spots_data();
-    chart1_load_spots_data();
+
+    load_table_red_rank();
+    load_table_black_rank();
 
 
     showChart();
@@ -106,32 +104,33 @@ function request_data_realtime() {
     get_data("fcWorkScheduleLoad/list?scheduleId=" + scheduleId, realtime_success);
 }
 
-function secondtime_load_spots_data() {
-    get_data("fcBiFlowDaily/list?type=" + num + "&flowId=" + flowId, second_success);
-    num++;
+function load_flows_history_data() {
+    get_data("fcBiFlowDaily/list?type=" + num + "&flowId=" + flowId, history_success);
 }
 
-function chart_load_spots_data() {
-    get_data("fcBiWorkerDaily/get?type=0&limit=3", chart_success);
-
+function load_table_red_rank() {
+    get_data("fcBiWorkerDaily/get?type=0&limit=3", on_red_rank_success);
 }
 
-function chart1_load_spots_data() {
+function load_table_black_rank() {
     get_data("fcBiWorkerDaily/get?type=4&limit=3", chart1_success);
 
 }
 
-function addtime_load_spots_data() {
-    num++;
-    get_data("fcBiFlowDaily/list?type=" + num + "&flowId=" + flowId, add_success);
-
-}
-
-function second_success(obj, sta) {
+function history_success(obj, sta) {
     var history = first_parse(this, obj);
-    var i, j;
+    var i, j, t;
     console.log(" history : ");
     console.log(history);
+    if(this.url.indexOf("type=1") >= 0){
+        t = 1;
+    }else if(this.url.indexOf("type=2") >= 0){
+        t = 2;
+    }else if(this.url.indexOf("type=3") >= 0) {
+        t = 3;
+    }else{
+        t = 0;
+    }
     hispass[t] = 0;
     hisfail[t] = 0;
     hisstack[t] = 0;
@@ -140,19 +139,17 @@ function second_success(obj, sta) {
         hispass[t] = history[i].passNum + hispass[t];
         hisfail[t] = history[i].failNum + hisfail[t];
         hisstack[t] = history[i].avgDue + hisstack[t];
-        hisrate[t] = history[i].failRate;
-        hisrate[t] = hisrate[t] / 100;
     }
     if (history.length != 1) {
-        hisrate[t] = Math.floor(hisfail[t] / (hispass[t] + hisfail[t]) * 10000) / 100;
-    }
-    if (hispass[t] + hisfail[t] == 0) {
-        hisrate[t] = 0;
+        if (hispass[t] + hisfail[t] == 0) {
+            hisrate[t] = 0;
+        } else {
+            hisrate[t] = Math.floor(hisfail[t] / (hispass[t] + hisfail[t]) * 10000) / 100;
+        }
     }
-    t++;
 }
 
-function chart_success(obj, sta) {
+function on_red_rank_success(obj, sta) {
     var redchart = first_parse(this, obj);
     var i, j;
     i = j = 0;

lazhang.html

@@ -169,6 +169,35 @@
 
 </div>
 
+<!-- Modal 部分开始 -->
+<div class="modal fade" id="alertModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="alertModalLabel">New message</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label for="recipient-name" class="col-form-label">Recipient:</label>
+                        <input type="text" class="form-control" id="recipient-name">
+                    </div>
+                    <div class="form-group">
+                        <label for="message-text" class="col-form-label">Message:</label>
+                        <textarea class="form-control" id="message-text"></textarea>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary">Send message</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 <!-- Demo Js -->
 <script src="js/basic.js"></script>