Merge branch 'LD'

app/Services/BatchService.php

@@ -93,13 +93,14 @@ class BatchService
                 $stationTaskMaterialBoxes=$this->stationTaskMaterialBoxService->createByBatches($batches_shouldProcess,$stationTasks); //注册料箱任务
                 $stationTaskCommodities=$this->stationTaskCommodityService->createByBatches($batches_shouldProcess,$stationTasks); //注册商品任务
             });
-
-            $stationTasks->loadMissing([
-                "stationTaskCommodities.commodity.barcodes",
-                "stationTaskCommodities.materialBox",
-                "stationTaskBatches.batch.owner",
-                "stationTaskMaterialBoxes.materialBox",
-            ]);
+            foreach ($stationTasks as &$stationTask){
+                $stationTask->loadMissing([
+                    "stationTaskCommodities.commodity.barcodes",
+                    "stationTaskCommodities.materialBox",
+                    "stationTaskBatches.batch.owner",
+                    "stationTaskMaterialBoxes.materialBox",
+                ]);
+            }
             $jsonStationTasks=json_encode($stationTasks);
             broadcast(new BroadcastToStation(BroadcastToStation::ALL_STATION, $jsonStationTasks));
 //            $ran=$this->stationTaskBatchService->runMany($stationTaskBatches);//执行波次任务

resources/views/layouts/menu.blade.php

@@ -53,7 +53,7 @@
                     <span class="fa fa-header" style="color: #72441b"></span>
                     人事管理</a></li> @endcan
         @can('站管理')
-            <li class="nav-item"><a href="{{url("station/monitor/index")}}" class="nav-link" target="station/monitor/index"
+            <li class="nav-item"><a href="{{url("station/monitor")}}" class="nav-link" target="station/monitor/index"
                                     :class="{active:isActive('station',1)}">
                     <span class="fa fa-share-alt-square" style="color: #72441b"></span>
                     站管理</a></li> @endcan

resources/views/station/menu.blade.php

@@ -4,7 +4,7 @@
         <ul class="nav nav-pills">
             @can('站管理-监视器')
                 <li class="nav-item">
-                    <a target="station/monitor/index" class="nav-link" href="{{url('station/monitor/index')}}" :class="{active:isActive('monitor',2)}">监视器</a>
+                    <a target="station/monitor" class="nav-link" href="{{url('station/monitor')}}" :class="{active:isActive('monitor',2)}">监视器</a>
                 </li> @endcan
             @can('站管理-缓存架')
                 <li class="nav-item">