|
@@ -116,7 +116,7 @@
|
|
|
stationTypeBinMonitor:{
|
|
stationTypeBinMonitor:{
|
|
|
row:Number("{{$stationTypeBinMonitor->bin_row_length}}"),
|
|
row:Number("{{$stationTypeBinMonitor->bin_row_length}}"),
|
|
|
column:Number("{{$stationTypeBinMonitor->bin_column_length}}"),
|
|
column:Number("{{$stationTypeBinMonitor->bin_column_length}}"),
|
|
|
- amount:Number("{{$stationTypeBinMonitor->bin_stationTypeBinMonitor_amount}}"),
|
|
|
|
|
|
|
+ amount:Number("{{$stationTypeBinMonitor->bin_wall_amount}}"),
|
|
|
},
|
|
},
|
|
|
color:"red",
|
|
color:"red",
|
|
|
error:"",
|
|
error:"",
|
|
@@ -130,6 +130,7 @@
|
|
|
$('.navbar,.nav1,.nav2').hide();
|
|
$('.navbar,.nav1,.nav2').hide();
|
|
|
});
|
|
});
|
|
|
this._broadcast();
|
|
this._broadcast();
|
|
|
|
|
+ console.log(this.stationTypeBinMonitor);
|
|
|
this._renderingstationTypeBinMonitor(this.stationTypeBinMonitor.amount,this.stationTypeBinMonitor.row,this.stationTypeBinMonitor.column);
|
|
this._renderingstationTypeBinMonitor(this.stationTypeBinMonitor.amount,this.stationTypeBinMonitor.row,this.stationTypeBinMonitor.column);
|
|
|
/* this._renderingBox(3,5);*/
|
|
/* this._renderingBox(3,5);*/
|
|
|
},
|
|
},
|
|
@@ -137,8 +138,9 @@
|
|
|
_broadcast(){
|
|
_broadcast(){
|
|
|
initEcho();
|
|
initEcho();
|
|
|
window.Echo.channel(this.broadcastName).listen(this.channelName,(msg)=> {
|
|
window.Echo.channel(this.broadcastName).listen(this.channelName,(msg)=> {
|
|
|
- console.log(1231,json)
|
|
|
|
|
|
|
+ console.log(1231,msg)
|
|
|
let json = JSON.parse(msg.json);
|
|
let json = JSON.parse(msg.json);
|
|
|
|
|
+ console.log(json)
|
|
|
this._refreshData(json);
|
|
this._refreshData(json);
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
@@ -149,7 +151,7 @@
|
|
|
task.sum = 0;
|
|
task.sum = 0;
|
|
|
task.currentSum = 0;
|
|
task.currentSum = 0;
|
|
|
task.currentCommodityIndex = "";
|
|
task.currentCommodityIndex = "";
|
|
|
- obj.task_commodities.forEach((taskCommodity,i)=> {
|
|
|
|
|
|
|
+ obj.station_task_commodities.forEach((taskCommodity,i)=> {
|
|
|
task.sum += Number(taskCommodity.amount);
|
|
task.sum += Number(taskCommodity.amount);
|
|
|
if (taskCommodity.status === '完成') task.currentSum += Number(taskCommodity.amount);
|
|
if (taskCommodity.status === '完成') task.currentSum += Number(taskCommodity.amount);
|
|
|
if (taskCommodity.status === '处理中') task.currentCommodityIndex = i;
|
|
if (taskCommodity.status === '处理中') task.currentCommodityIndex = i;
|
|
@@ -162,7 +164,7 @@
|
|
|
materialBox:taskCommodity.material_box,
|
|
materialBox:taskCommodity.material_box,
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
- task.taskBatch=obj.task_batches[0];
|
|
|
|
|
|
|
+ task.taskBatch=obj.station_task_batches[0];
|
|
|
setBarcode(task.taskBatch.batch.code,"#barcode",2,50,false);
|
|
setBarcode(task.taskBatch.batch.code,"#barcode",2,50,false);
|
|
|
this.task = task;
|
|
this.task = task;
|
|
|
},
|
|
},
|