|
@@ -56,6 +56,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <span v-for="a in taskCommoditiesListByWallRow">@{{ a }}</span>
|
|
|
<div class="col text-center">
|
|
<div class="col text-center">
|
|
|
<div class="d-flex flex-row justify-content-around" v-if="station&&station.station_type_bin_monitor">
|
|
<div class="d-flex flex-row justify-content-around" v-if="station&&station.station_type_bin_monitor">
|
|
|
<div class="border h4 d-flex flex-column-reverse flex-grow-1 m-1" v-for="(wIndex) in station.station_type_bin_monitor.bin_wall_amount">
|
|
<div class="border h4 d-flex flex-column-reverse flex-grow-1 m-1" v-for="(wIndex) in station.station_type_bin_monitor.bin_wall_amount">
|
|
@@ -114,36 +115,12 @@
|
|
|
{{--broadcastName : "{{config('database.redis.options.prefix').'presence-station-'.$station->id}}",--}}
|
|
{{--broadcastName : "{{config('database.redis.options.prefix').'presence-station-'.$station->id}}",--}}
|
|
|
broadcastName : "{{config('database.redis.options.prefix').'station-'.$station->id}}",
|
|
broadcastName : "{{config('database.redis.options.prefix').'station-'.$station->id}}",
|
|
|
channelName : ".App\\Events\\BroadcastToStation",
|
|
channelName : ".App\\Events\\BroadcastToStation",
|
|
|
- // task : {
|
|
|
|
|
- // currentCommodityIndex : -1,
|
|
|
|
|
- // taskCommodities:[
|
|
|
|
|
- // /*{amount:"",binNumber:"",name:"",barcodes:[]},*/
|
|
|
|
|
- // ],
|
|
|
|
|
- // taskBatch:{
|
|
|
|
|
- // batch:{
|
|
|
|
|
- // code:"",
|
|
|
|
|
- // },
|
|
|
|
|
- // },
|
|
|
|
|
- // box:{},
|
|
|
|
|
- // sum : 0,
|
|
|
|
|
- // currentSum : 0,
|
|
|
|
|
- // },
|
|
|
|
|
- // boxes:[],
|
|
|
|
|
- {{--stationTypeBinMonitors:[],--}}
|
|
|
|
|
- {{--stationTypeBinMonitor:{--}}
|
|
|
|
|
- {{-- row:Number("{{$stationTypeBinMonitor->bin_row_length}}"),--}}
|
|
|
|
|
- {{-- column:Number("{{$stationTypeBinMonitor->bin_column_length}}"),--}}
|
|
|
|
|
- {{-- amount:Number("{{$stationTypeBinMonitor->bin_wall_amount}}"),--}}
|
|
|
|
|
- {{--},--}}
|
|
|
|
|
- // color:"red",
|
|
|
|
|
error:"",
|
|
error:"",
|
|
|
station:{!! $station??[] !!},
|
|
station:{!! $station??[] !!},
|
|
|
- {{--stationTypeBinMonitor:{!! $stationTypeBinMonitor !!},--}}
|
|
|
|
|
},
|
|
},
|
|
|
mounted() {
|
|
mounted() {
|
|
|
this._makeMenuHiding();
|
|
this._makeMenuHiding();
|
|
|
this._listenBroadcast();
|
|
this._listenBroadcast();
|
|
|
- // this._renderingstationTypeBinMonitor(this.stationTypeBinMonitor.amount,this.stationTypeBinMonitor.row,this.stationTypeBinMonitor.column);
|
|
|
|
|
},
|
|
},
|
|
|
methods:{
|
|
methods:{
|
|
|
_makeMenuHiding(){
|
|
_makeMenuHiding(){
|
|
@@ -189,12 +166,6 @@
|
|
|
console.log(task)
|
|
console.log(task)
|
|
|
this.task = task;
|
|
this.task = task;
|
|
|
},
|
|
},
|
|
|
- // //渲染墙格口
|
|
|
|
|
- // _renderingstationTypeBinMonitor(amount, row, column){
|
|
|
|
|
- // for (let i=0;i<amount;i++){
|
|
|
|
|
- // this.stationTypeBinMonitors.push(this._createstationTypeBinMonitor(row, column, i*(row*column)));
|
|
|
|
|
- // }
|
|
|
|
|
- // },
|
|
|
|
|
_setColor(status){
|
|
_setColor(status){
|
|
|
switch (status) {
|
|
switch (status) {
|
|
|
case "待处理":return "";
|
|
case "待处理":return "";
|
|
@@ -259,6 +230,26 @@
|
|
|
}
|
|
}
|
|
|
return this.taskCommoditiesListByBinVar;
|
|
return this.taskCommoditiesListByBinVar;
|
|
|
},
|
|
},
|
|
|
|
|
+ taskCommoditiesListByWallRow(){
|
|
|
|
|
+ let columnAmount=this.station.station_type_bin_monitor;
|
|
|
|
|
+ let rowAmount=this.station.bin_row_amount;
|
|
|
|
|
+ let station=[];
|
|
|
|
|
+ let wall,row,rowI=0;
|
|
|
|
|
+ this.taskCommoditiesListByBin.forEach(function(bin,i){
|
|
|
|
|
+ console.log(i,columnAmount)
|
|
|
|
|
+ if(i%columnAmount===0){
|
|
|
|
|
+ if(rowI%rowAmount===0){
|
|
|
|
|
+ wall=[];
|
|
|
|
|
+ station.push(wall);
|
|
|
|
|
+ }
|
|
|
|
|
+ row=[];
|
|
|
|
|
+ rowI++;
|
|
|
|
|
+ wall.push(row);
|
|
|
|
|
+ }
|
|
|
|
|
+ row.push(bin);
|
|
|
|
|
+ });
|
|
|
|
|
+ return station
|
|
|
|
|
+ },
|
|
|
processedCommodities(){
|
|
processedCommodities(){
|
|
|
return 1;
|
|
return 1;
|
|
|
},
|
|
},
|