|
|
@@ -392,17 +392,17 @@
|
|
|
this.inputs.manuallyTakeBox.text='';
|
|
|
})
|
|
|
},
|
|
|
- runTheTaskBatch($taskBatch){
|
|
|
- $taskBatch.runningStatus='请求中'
|
|
|
- axios.post('{{url('/api/thirdPart/haiq/runTaskBatch')}}',{station_task_batch_id:$taskBatch.id})
|
|
|
+ runTheTaskBatch(stationTaskBatch){
|
|
|
+ stationTaskBatch.runningStatus='请求中'
|
|
|
+ axios.post('{{url('/api/thirdPart/haiq/runTaskBatch')}}',{station_task_batch_id:stationTaskBatch.id})
|
|
|
.then(function(response){
|
|
|
if(!response.data.success){
|
|
|
- $taskBatch.runningStatus='请求失败';
|
|
|
+ stationTaskBatch.runningStatus='请求失败';
|
|
|
return;
|
|
|
}
|
|
|
- $taskBatch.runningStatus='请求成功'
|
|
|
+ stationTaskBatch.runningStatus='请求成功'
|
|
|
}).catch(function(err){
|
|
|
- $taskBatch.runningStatus='请求异常'
|
|
|
+ stationTaskBatch.runningStatus='请求异常'
|
|
|
tempTip.okWindow(err,'确定')
|
|
|
})
|
|
|
},
|
|
|
@@ -423,8 +423,8 @@
|
|
|
this.stationTasks.forEach(function(stationTask){
|
|
|
if(!stationTask.station_task_batches)return;
|
|
|
stationTask.station_task_batches.forEach(function(stationTaskBatch){
|
|
|
- if(typeof(stationTaskBatch_index['_'+stationTaskBatch.batch_id])!=='undefined'){
|
|
|
- if(stationTaskBatch_index['_'+stationTaskBatch.batch_id]['status']==='完成')return;
|
|
|
+ if(typeof(stationTaskBatch_index['_'+stationTaskBatch.batch_id])==='undefined'){
|
|
|
+ // if(stationTaskBatch_index['_'+stationTaskBatch.batch_id]['status']==='完成')return;
|
|
|
stationTaskBatches.push(stationTaskBatch)
|
|
|
}
|
|
|
stationTaskBatch_index['_'+stationTaskBatch.batch_id]=stationTaskBatch;
|