jason.lu 6 years ago
parent
commit
425cfa34b7
3 changed files with 11 additions and 7 deletions
  1. 8 4
      js/newLazhang.js
  2. 2 2
      js/newRedrankvue.js
  3. 1 1
      lazhang.html

+ 8 - 4
js/newLazhang.js

@@ -72,7 +72,7 @@ var FlowRealTime = new (function () {
         }
     })(this);
 
-    var ClearDataControl = new (function (parent) {
+    this.ClearDataControl = new (function (parent) {
         this.p = parent;
         this.finished = true;
         this.executed = false;
@@ -83,9 +83,13 @@ var FlowRealTime = new (function () {
             this.directCount = -1;
             this.finished = true;
             var hand = handId;
-            var hd = 0;
-            if (hand.length > 0) {
-                hd = parseInt(hand);
+            hand = hand.trim();
+            var possible = "0123456789,-*";
+            for(let i = 0; i < hand.length ; i++){
+                if(possible.indexOf(hand.charAt(i)) === -1){
+                    send_alert("您的输入有误,请重新输入 : " +handId);
+                    return;
+                }
             }
             get_data("endpoint/clearBoard?flowId=" + flowId + "&handheldId=" + hd, this.clearSuccess);
         };

+ 2 - 2
js/newRedrankvue.js

@@ -44,10 +44,10 @@ RedRankTable.showPart = function(slide, part, data){
         partList[partList.length - 1].isRed = false;
         partList[partList.length - 1].isGreen = false;
 
-        if(i >= data.len() - this.markerLen && partList[partList.length - 1].passNum > 0) {
+        if(data.len() - i <= this.markerLen && partList[partList.length - 1].workerId > 0) {
             partList[partList.length - 1].isRed = true;
         }
-        if(i <= this.markerLen && partList[partList.length - 1].passNum > 0) {
+        if(i <= this.markerLen && partList[partList.length - 1].workerId > 0) {
             partList[partList.length - 1].isGreen = true;
         }
     }

+ 1 - 1
lazhang.html

@@ -134,7 +134,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                    <button type="button confirm-clear-data" class="btn btn-primary" data-dismiss="modal">确认清除</button>
+                    <button type="button" class="btn btn-primary  confirm-clear-data" data-dismiss="modal">确认清除</button>
                 </div>
             </div>
         </div>