LD 5 лет назад
Родитель
Сommit
7e72372ad8

BIN
resources/images/demoBin.png


+ 1 - 1
resources/views/layouts/menu.blade.php

@@ -1,4 +1,4 @@
-<div class="collapse navbar-collapse" id="navbarSupportedContent">
+<div class="collapse navbar-collapse nav1" id="navbarSupportedContent">
     <!-- Left Side Of Navbar -->
     <ul class="navbar-nav mr-auto nav-tabs nav font-weight-bold" id="nav1" style="padding-top: 10px">
         @can('退货管理')

+ 5 - 8
resources/views/station/monitor/menu.blade.php

@@ -1,15 +1,12 @@
-<div id="nav2">
-    @component('station.menu')
-    @endcomponent
-    <div class="container-fluid nav3">
-        <div class="card menu-third" >
+
+<div class="container-fluid nav3">
+    <div class="card" >
             <ul class="nav nav-pills">
                 @can('站管理-监视器')
                     <li class="nav-item">
-                        <a class="nav-link" href="{{url('inventory/statement/changeInventory?range=1')}}" :class="{active:isActive('changeInventory',3)}">监视器</a>
+                        <a class="nav-link" href="{{url('station/monitor')}}" :class="{active:isActive('',3)}">列表</a>
                     </li> @endcan
+                {{$slot}}
             </ul>
-        </div>
     </div>
 </div>
-

+ 105 - 6
resources/views/station/monitor/show.blade.php

@@ -3,19 +3,118 @@
 
 @section('content')
     <div id="nav2">
-        @component('maintenance.menu')
+        @component('station.menu')
         @endcomponent
-        @component('maintenance.carrier.menu')
-                <li class="nav-item">
-                    <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('{{$station->id}}',3)}">显示:{{$station->name}}</a>
-                </li>
+        @component('station.monitor.menu')
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('{{$station->id}}',3)}">显示:{{$station->name}}</a>
+                    </li>
         @endcomponent
     </div>
-    <div class="container-fluid">
+    <div class="container-fluid body">
         <div class="card">
             <div class="card-body">
+                <div class="row border" style="opacity: 0.75">
+                    <div class="col-4 text-center  h3 py-2 font-weight-bold">宝时云仓</div>
+                    <div class="col text-center  h3 py-2 text-muted">智能分拣</div>
+                </div>
+                <div class="row pt-3">
+                    <div class="col-4 text-center">
+                        <div class="row">
+                            <div class="col py-3 h4">
+                                波次号:
+                            </div>
+                            <div class="col py-3 h4">
 
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col py-3 h4">
+                            </div>
+                            <div class="col py-3 h4 text-muted">
+                                {条码}
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col py-3 h4">
+                                料箱号:
+                            </div>
+                            <div class="col py-3 h4">
+
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col py-3 h4">
+                            </div>
+                            <div class="col py-3 h4 text-muted">
+                                {条码}
+                            </div>
+                        </div>
+                        <div class="row pt-5">
+                            <div class="col"><img src="{{asset('images/demoBin.png')}}" alt="" class="img"></div>
+                        </div>
+                    </div>
+                    <div class="col text-center">
+                        <div class="row">
+                            <div class="col py-3 h4">订单号:</div>
+                            <div class="col py-3 h4">N</div>
+                        </div>
+                        <div class="row">
+                            <div class="col py-1">数量</div>
+                            <div class="col py-1">0/0</div>
+                            <div class="col py-1 text-muted">异常</div>
+                            <div class="col py-1"></div>
+                        </div>
+                        <div class="row">
+                            <div class="col py-1">
+                                <table class="table table-striped border">
+                                    <tr>
+                                        <th class="py-2">序号</th>
+                                        <th class="py-2">商品</th>
+                                        <th class="py-2">数量</th>
+                                        <th class="py-2">条码</th>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 @endsection
+
+@section('lastScript')
+    <script>
+        new Vue({
+            el:"#app",
+            mounted() {
+                $('.navbar,.nav1,.nav2').hide()
+                $('.nav3').on('mouseenter', function () {
+                    $('.navbar,.nav1,.nav2').show();
+                });
+                $('.body').on('mouseenter', function () {
+                    $('.navbar,.nav1,.nav2').hide();
+                });
+            }
+        });
+    </script>
+@endsection

+ 2 - 2
routes/web.php

@@ -592,11 +592,11 @@ Route::group(['prefix'=>'customer'],function(){
 
 /** 站管理 */
 Route::group(['prefix'=>'station'],function(){
-    Route::get('index',function (){return view('station.index');});
+    Route::get('index','StationController@monitorIndex');
     Route::group(['prefix'=>'monitor'],function(){
         Route::get('/','StationController@monitorIndex');
         Route::get('/index','StationController@monitorIndex');
-        Route::get('/{id}','StationController@monitorShow');
+        Route::get('/{station}','StationController@monitorShow');
     });
 });
 /** 控制台 */

+ 1 - 1
tests/webApi/thirdPart/haiq/pickStation.http

@@ -6,7 +6,7 @@
 ## * 'mptr' and 'fptr' create a POST request to submit a form with a text or file field (multipart/form-data);
 
 
-POST http://bswas/api/thirdPart/haiq/pickStation/processed
+POST https://was.baoshi56.com/api/thirdPart/haiq/pickStation/processed
 Content-Type: application/json
 
 {"success":true}