Changed Stuff

js/basic.js

@@ -61,44 +61,27 @@ function first_success(obj, sta) {
     //在这里排序 spo\
     console.log(" output : ");
     console.log(output);
-    var i, j;
-    for (i = 0; i < output.length - 1; i++) {
-        passNumber[i] = output[i].passNum;
-        passnum=passNumber[i]; //修正通过数量算法
-    }
-    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) {
-            failrate[i] = 0;
-        }
-        else {
-            failrate[i] = failNumber[i] / (failNumber[i] + passNumber[i]) * 100;
-        }
-    }
-    stackeverynum[0] = 0;
-    for (i = 1; i < output.length - 1; i++) {
-        stackeverynum[i] = passNumber[i - 1] - passNumber[i] - failNumber[i];
-        stacknum = stackeverynum[i] + stacknum;
+
+    calcData(output);
+
+    document.getElementById("test1").innerHTML = passnum;
+    document.getElementById("test2").innerHTML = failnum;
+    if(passnum+failnum != 0) {
+        document.getElementById("test3").innerHTML = Math.floor(passnum / (passnum + failnum) * 100) / 100 + '%';
+    }else{
+        document.getElementById("test3").innerHTML = "~0%";
     }
+    document.getElementById("test4").innerHTML = stacknum;
+
     showChart();
 
     setInterval(function(){
         get_data("fcWorkRaw/allSpots?flowId=" + thisPageFlow, realtime_success);
     },1000);
-    document.getElementById("test1").innerHTML = passnum;
-    document.getElementById("test2").innerHTML = failnum;
-    document.getElementById("test3").innerHTML = Math.floor(passnum/(passnum+failnum)*100)/100+'%';
-    document.getElementById("test4").innerHTML = stacknum;
 }
 
-function realtime_success(obj, sta) {
 
-    var output = first_parse(this, obj);
-    console.log(" output : ");
-    console.log(output);
+function calcData(output){
     var i, j;
     for (i = 0; i < output.length - 1; i++) {
         passNumber[i] = output[i].passNum;
@@ -120,10 +103,23 @@ function realtime_success(obj, sta) {
         stackeverynum[i] = passNumber[i - 1] - passNumber[i] - failNumber[i];
         stacknum = stackeverynum[i] + stacknum;
     }
+}
+
+function realtime_success(obj, sta) {
+
+    var output = first_parse(this, obj);
+    console.log("------- output : --------");
+    console.log(output);
+    calcData(output);
+
     updateChart();
     document.getElementById("test1").innerHTML = passnum;
     document.getElementById("test2").innerHTML = failnum;
-    document.getElementById("test3").innerHTML = Math.floor(passnum/(passnum+failnum)*100)/100+'%';
+    if(passnum+failnum != 0) {
+        document.getElementById("test3").innerHTML = Math.floor(passnum / (passnum + failnum) * 100) / 100 + '%';
+    }else{
+        document.getElementById("test3").innerHTML = "~0%";
+    }
     document.getElementById("test4").innerHTML = stacknum;
 }