Jason(Fruit Of Eden) 6 years ago
parent
commit
7ee4feb15a
3 changed files with 95 additions and 92 deletions
  1. 4 0
      dapingmu.html
  2. 78 0
      js/common.js
  3. 13 92
      js/dapingmu-display.js

+ 4 - 0
dapingmu.html

@@ -37,6 +37,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
         /* css 代码  */
+        th, td{
+            color:white;
+        }
     </style>
     <script src="https://img.hcharts.cn/highcharts/highcharts.js"></script>
     <script src="https://img.hcharts.cn/highcharts/modules/exporting.js"></script>
@@ -171,6 +174,7 @@
 <script src="js/getparam.js"></script>
 <script src="js/resize.js"></script>
 <script src="js/dapingmu.js">    </script>
+<script src="js/common.js">    </script>
 <script src="js/dapingmu-display.js">    </script>
 
 </body>

+ 78 - 0
js/common.js

@@ -0,0 +1,78 @@
+
+function getSpotHtml(htmlbody, i) {
+    htmlbody += "<tr>";
+    htmlbody += `<tr>
+                    <td>${timeday[i]}</td>
+                    <td>${hispass[i]}</td>
+                    <td>${hisfail[i]}</td>
+                    <td>${hisstack[i]}</td>
+                    <td>${hisrate[i] + '%'}</td>
+                </tr>`;
+    htmlbody += "</tr>";
+    return htmlbody;
+}
+
+function getSpotHtml1(htmlbody, i) {
+    htmlbody += "<tr>";
+    htmlbody += `<tr>
+                    <td>${goodid[i]}</td>
+                    <td>${goodpass[i]}</td>
+                    <td>${goodfailrate[i] + '%'}</td>
+                </tr>`;
+    htmlbody += "</tr>";
+    return htmlbody;
+}
+
+function getSpotHtml2(htmlbody, i) {
+    htmlbody += "<tr>";
+    htmlbody += `<tr>
+                    <td>${badid[i]}</td>
+                    <td>${badpass[i]}</td>
+                    <td>${badfailrate[i] + '%'}</td>
+                </tr>`;
+    htmlbody += "</tr>";
+    return htmlbody;
+}
+
+
+function showEachSpot() {
+    var htmlbody = "", one_person = "";
+    var i = 0;
+    var triGap = 4;
+
+    htmlbody = "";
+    for (i = 0; i < triGap; i++) {
+
+        htmlbody = getSpotHtml(htmlbody, i);
+    }
+    $("#rank-one").html(htmlbody);
+    //console.log(htmlbody);
+}
+
+function showEachSpot1() {
+    var htmlbody = "", one_person = "";
+    var i = 0;
+    var triGap = 3;
+
+    htmlbody = "";
+    for (i = 0; i < triGap; i++) {
+
+        htmlbody = getSpotHtml1(htmlbody, i);
+    }
+    $("#rank-two").html(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);
+    }
+    $("#rank-three").html(htmlbody);
+    //console.log(htmlbody);
+}

+ 13 - 92
js/dapingmu-display.js

@@ -1,86 +1,8 @@
 var timeday = new Array("今日", "昨日", "本周", "本月");
 
-function getSpotHtml(htmlbody, i) {
-    htmlbody += "<tr>";
-    htmlbody += `<tr>
-                    <td>${timeday[i]}</td>
-                    <td>${hispass[i]}</td>
-                    <td>${hisfail[i]}</td>
-                    <td>${hisstack[i]}</td>
-                    <td>${hisrate[i]}</td>
-                </tr>`;
-    htmlbody += "</tr>";
-    return htmlbody;
-}
-
-function getSpotHtml1(htmlbody, i) {
-    htmlbody += "<tr>";
-    htmlbody += `<tr>
-                    <td>${goodid[i]}</td>
-                    <td>${goodpass[i]}</td>
-                    <td>${goodfailrate[i]}</td>
-                </tr>`;
-    htmlbody += "</tr>";
-    return htmlbody;
-}
-
-function getSpotHtml2(htmlbody, i) {
-    htmlbody += "<tr>";
-    htmlbody += `<tr>
-                    <td>${badid[i]}</td>
-                    <td>${badpass[i]}</td>
-                    <td>${badfailrate[i]}</td>
-                </tr>`;
-    htmlbody += "</tr>";
-    return htmlbody;
-}
-
-
-function showEachSpot() {
-    var htmlbody = "", one_person = "";
-    var i = 0;
-    var triGap = 4;
-
-    htmlbody = "";
-    for (i = 0; i < triGap; i++) {
-        htmlbody = getSpotHtml(htmlbody, i);
-    }
-    $("#rank-one").html(htmlbody);
-    console.log(htmlbody);
-}
-
-function showEachSpot1() {
-    var htmlbody = "", one_person = "";
-    var i = 0;
-    var triGap = 3;
-
-    htmlbody = "";
-    for (i = 0; i < triGap; i++) {
-
-        htmlbody = getSpotHtml1(htmlbody, i);
-    }
-    $("#rank-two").html(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);
-    }
-    $("#rank-three").html(htmlbody);
-    console.log(htmlbody);
-}
-
 var i = 0, j = 0;
 
 function showChart() {
-
     var stackdata = [];
     var passdata = [];
     var faildata = [];
@@ -91,13 +13,12 @@ function showChart() {
     var summax = 0;
     var stackmax = 0;
     var ratemax = 0;
-    for (i = 0; i < passNumber.length; i++) {
+    for (i = 0; i < flowIds.length; i++) {
         passdata.push(passNumber[i]);
         faildata.push(failNumber[i]);
         stackdata.push(stackeverynum[i]);
         ratedata.push(failrate[i]);
-        iddata.push(flownum[i]);
-
+        iddata.push(flowIds[i]);
         if (ratemax < ratedata[i]) {
             ratemax = ratedata[i];
         }
@@ -119,6 +40,16 @@ function showChart() {
         passmax = stackmax;
     }
 
+    var uaxv = {
+        crosshair: true,
+        labels: {
+            style: {
+                fontSize: '1.5em'
+            }
+        },
+        categories: iddata,
+    };
+
     showEachSpot();
     showEachSpot1();
     showEachSpot2();
@@ -260,7 +191,7 @@ function updateChart() {
         faildata.push(failNumber[i]);
         stackdata.push(stackeverynum[i]);
         ratedata.push(failrate[i]);
-        iddata.push(flownum[i]);
+        iddata.push(flowIds[i]);
         if (ratemax < ratedata[i]) {
             ratemax = ratedata[i];
         }
@@ -296,13 +227,3 @@ function updateChart() {
 
 var stackAndFailChart = null;
 var FailChart = null;
-
-var uaxv = {
-    crosshair: true,
-    labels: {
-        style: {
-            fontSize: '1.5em'
-        }
-    },
-    categories: iddata,
-};