|
@@ -145,8 +145,9 @@ function clear_one_data(){
|
|
directCount = -1;
|
|
directCount = -1;
|
|
finished = true;
|
|
finished = true;
|
|
var hand = $("#handInput").val();
|
|
var hand = $("#handInput").val();
|
|
|
|
+ var hd = 0;
|
|
if(hand.length > 0){
|
|
if(hand.length > 0){
|
|
- var hd = parseInt(hand);
|
|
|
|
|
|
+ hd = parseInt(hand);
|
|
}
|
|
}
|
|
get_data("endpoint/clearBoard?flowId="+flowId+"&handheldId=" + hd, clearSuccess);
|
|
get_data("endpoint/clearBoard?flowId="+flowId+"&handheldId=" + hd, clearSuccess);
|
|
}
|
|
}
|
|
@@ -156,7 +157,7 @@ function clearSuccess(obj, sta){
|
|
console.warn(this);
|
|
console.warn(this);
|
|
send_alert("发送清空请求成功, 正在等待采集端进行处理...");
|
|
send_alert("发送清空请求成功, 正在等待采集端进行处理...");
|
|
finished = false;
|
|
finished = false;
|
|
- setTimeout(on_timeout_clear, 5000);
|
|
|
|
|
|
+ setTimeout(on_timeout_clear, 8000);
|
|
setTimeout(recurseget,300);
|
|
setTimeout(recurseget,300);
|
|
//var output = first_success(this, obj);
|
|
//var output = first_success(this, obj);
|
|
}
|
|
}
|
|
@@ -171,10 +172,12 @@ function onheart(obj,sta){
|
|
var ouy = {};
|
|
var ouy = {};
|
|
if(typeof(obj) === "string"){
|
|
if(typeof(obj) === "string"){
|
|
ouy = JSON.parse(obj);
|
|
ouy = JSON.parse(obj);
|
|
|
|
+ }else{
|
|
|
|
+ ouy = obj;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- if(typeof(obj) === "object"){
|
|
|
|
|
|
+ if(typeof(ouy) === "object"){
|
|
if(ouy.ret === "10000"){
|
|
if(ouy.ret === "10000"){
|
|
//ok
|
|
//ok
|
|
if(ouy.model == null || ouy.model === undefined){
|
|
if(ouy.model == null || ouy.model === undefined){
|