Parcourir la source

Added SectorName Query Functionality

Fruit of Eden il y a 6 ans
Parent
commit
60683c88c2
3 fichiers modifiés avec 47 ajouts et 6 suppressions
  1. 22 5
      js/common.js
  2. 13 1
      js/lazhang-data.js
  3. 12 0
      js/lazhang-display.js

+ 22 - 5
js/common.js

@@ -61,6 +61,16 @@ function history_success(obj, sta) {
 
 }
 
+function isUserOfThisFlow(uid) {
+    var isExist = false;
+    userIDs.forEach(function (vals) {
+        if (vals == uid) {
+            isExist = true;
+        }
+    });
+    return isExist;
+}
+
 function on_red_rank_success(obj, sta) {
     var redchart = first_parse(this, obj);
     var i, j;
@@ -75,9 +85,13 @@ function on_red_rank_success(obj, sta) {
         }else{
             goodfailrate[i] = 0;
         }
+        if(isUserOfThisFlow(redchart.list[i].workerId)){
+            goodColor[i] = 'red';
+        }else{
+            goodColor[i] = '';
+        }
     }
 
-
 }
 
 function on_black_rank_success(obj, sta) {
@@ -86,7 +100,6 @@ function on_black_rank_success(obj, sta) {
     i = j = 0;
     console.log(" black chart : ");
     console.log(blackchart);
-
     for (i = 0; i < blackchart.list.length; i++) {
         badid[i] = getUserName(blackchart.list[i].workerId);
         badpass[i] = blackchart.list[i].passNum;
@@ -96,6 +109,11 @@ function on_black_rank_success(obj, sta) {
         }else{
             badfailrate[i] = 0;
         }
+        if(isUserOfThisFlow(blackchart.list[i].workerId)){
+            badColor[i] = 'green';
+        }else{
+            badColor[i] = '';
+        }
     }
 
 
@@ -138,7 +156,7 @@ function getSpotHtml1(htmlbody, i) {
         return htmlbody;
     }
     htmlbody += "<tr>";
-    htmlbody += `<tr>
+    htmlbody += `<tr style="background-color: ${goodColor[i]}">
                     <td>${goodid[i]}</td>
                     <td>${goodpass[i]}</td>
                     <td>${goodfailrate[i] + '%'}</td>
@@ -150,7 +168,7 @@ function getSpotHtml1(htmlbody, i) {
 function getSpotHtml2(htmlbody, i) {
     if(typeof badid[i] === "undefined"){
         htmlbody += "<tr>";
-        htmlbody += `<tr>
+        htmlbody += `<tr style="background-color: ${badColor[i]}">
                     <td> - </td>
                     <td> - </td>
                     <td> - </td>
@@ -173,7 +191,6 @@ function showEachSpot() {
     var htmlbody = "", one_person = "";
     var i = 0;
     var triGap = 4;
-
     htmlbody = "";
     for (i = 0; i < triGap; i++) {
 

+ 13 - 1
js/lazhang-data.js

@@ -18,9 +18,11 @@ var n = 0;
 var sectorID = [];
 var namedata = [];
 var lazhang = {};
-
+var goodColor = [];
+var badColor = [];
 var scheduleId = utils_get_param("scheduleId");
 var flowId = utils_get_param("flowId");
+var userIDs = [];
 
 function first_success(obj, sta) {
     let output = first_parse(this, obj);
@@ -34,6 +36,16 @@ function first_success(obj, sta) {
         send_alert("没有数据");
     }
 
+    output.list.forEach(function(val,it,arr){
+        var isExist = false;
+        userIDs.forEach(function(vals){
+            if(vals == val.userId){
+                isExist = true;
+            }
+        });
+        if(!isExist) userIDs.push(val.userId);
+    });
+
     if (output.list.length > 0) {
         sectorID[0] = output.list[0].sectorId;
 

+ 12 - 0
js/lazhang-display.js

@@ -188,6 +188,7 @@ function updateChart() {
     var faildata = [];
     var passmax = 0;
     var failratemax=0;
+
     for (i = 0; i < passNumber.length; i++) {
         if (stackmax < stackeverynum[i]) {
             stackmax = stackeverynum[i];
@@ -230,7 +231,18 @@ function updateChart() {
     showEachSpot1();
     showEachSpot2();
 
+    var secNames = [];
+
+    sectorID.forEach(function(val){  secNames.push(getSectorName(val)); });
+
+    if(JSON.stringify(secNames) !== lastTimeSecNames){
+        lastTimeSecNames = JSON.stringify(secNames);
+        FailChart.xAxis[0].setCategories(secNames);
+        stackAndFailChart.xAxis[0].setCategories(secNames);
+    }
 }
 
+var lastTimeSecNames = "";
+
 var stackAndFailChart = null;
 var FailChart = null;