소스 검색

fix user name

GGican 8 년 전
부모
커밋
af3bdf09ba
34개의 변경된 파일36개의 추가작업 그리고 36개의 파일을 삭제
  1. 1 1
      app/Http/Controllers/Admin/CommonController.php
  2. 1 1
      resources/views/admin/change_pswd.blade.php
  3. 1 1
      resources/views/admin/edit_table/table_eight.blade.php
  4. 1 1
      resources/views/admin/edit_table/table_five.blade.php
  5. 1 1
      resources/views/admin/edit_table/table_four.blade.php
  6. 1 1
      resources/views/admin/edit_table/table_nine.blade.php
  7. 1 1
      resources/views/admin/edit_table/table_one.blade.php
  8. 1 1
      resources/views/admin/edit_table/table_seven.blade.php
  9. 1 1
      resources/views/admin/edit_table/table_six.blade.php
  10. 1 1
      resources/views/admin/edit_table/table_three.blade.php
  11. 1 1
      resources/views/admin/edit_table/table_two.blade.php
  12. 1 1
      resources/views/admin/index.blade.php
  13. 1 1
      resources/views/admin/job/create.blade.php
  14. 1 1
      resources/views/admin/job/edit.blade.php
  15. 1 1
      resources/views/admin/job/index.blade.php
  16. 1 1
      resources/views/admin/project/create.blade.php
  17. 1 1
      resources/views/admin/project/edit.blade.php
  18. 1 1
      resources/views/admin/project/index.blade.php
  19. 1 1
      resources/views/admin/search.blade.php
  20. 1 1
      resources/views/admin/table/on_table.blade.php
  21. 1 1
      resources/views/admin/table/table.blade.php
  22. 1 1
      resources/views/admin/table/table_eight.blade.php
  23. 1 1
      resources/views/admin/table/table_five.blade.php
  24. 1 1
      resources/views/admin/table/table_four.blade.php
  25. 1 1
      resources/views/admin/table/table_nine.blade.php
  26. 1 1
      resources/views/admin/table/table_one.blade.php
  27. 1 1
      resources/views/admin/table/table_seven.blade.php
  28. 1 1
      resources/views/admin/table/table_six.blade.php
  29. 1 1
      resources/views/admin/table/table_three.blade.php
  30. 1 1
      resources/views/admin/table/table_two.blade.php
  31. 1 1
      resources/views/admin/user/add_user.blade.php
  32. 1 1
      resources/views/admin/user/edit.blade.php
  33. 1 1
      resources/views/admin/user/userlist.blade.php
  34. 3 3
      resources/views/layouts/admin.blade.php

+ 1 - 1
app/Http/Controllers/Admin/CommonController.php

xqd
@@ -1 +1 @@
-<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/public/img',$newName);
     $filepath = 'img/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
//   $role = Job::where('role',$user->role)->first();

//   dd($user);
    View::share('user',$user);
    View::share('project',$project);
//    View::share('role',$role);
  }

 }
+<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/public/img',$newName);
     $filepath = 'img/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
   $role = Job::where('role',$user['role'])->first();

//   dd($user);
    View::share('user',$user);
    View::share('project',$project);
    View::share('role',$role);
  }

 }

+ 1 - 1
resources/views/admin/change_pswd.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/edit_table/table_eight.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_five.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_four.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_nine.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_one.blade.php

xqd
@@ -38,7 +38,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_seven.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_six.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_three.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/edit_table/table_two.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/index.blade.php

xqd
@@ -10,7 +10,7 @@
                     <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>{{ $user->surname }}</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/job/create.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/job/edit.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/job/index.blade.php

xqd
@@ -10,7 +10,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/project/create.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/project/edit.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/project/index.blade.php

xqd
@@ -10,7 +10,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/search.blade.php

xqd
@@ -10,7 +10,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/on_table.blade.php

xqd
@@ -10,7 +10,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/table/table.blade.php

xqd
@@ -12,7 +12,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/table/table_eight.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_five.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_four.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_nine.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_one.blade.php

xqd
@@ -38,7 +38,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_seven.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_six.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_three.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/table/table_two.blade.php

xqd
@@ -36,7 +36,7 @@
                     <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $role->display_name }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 1 - 1
resources/views/admin/user/add_user.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/user/edit.blade.php

xqd
@@ -11,7 +11,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 1 - 1
resources/views/admin/user/userlist.blade.php

xqd
@@ -10,7 +10,7 @@
                 <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
             </div>
             <div class="pull-left info">
-                <p>GT.Young</p>
+                <p>{{ $role->display_name }}</p>
                 <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
             </div>
         </div>

+ 3 - 3
resources/views/layouts/admin.blade.php

xqd
@@ -89,9 +89,9 @@
                             <li class="user-header">
                                 <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
                                 <p>
-                                    {{--{{ $role->display_name }}--}}
-                                    {{--<small>{{ $role->description }}</small>--}}
-                                    {{--<small>权限级别: {{ $role->role }}</small>--}}
+                                    {{ $user->surname }}
+                                    <small>{{ $role->description }}</small>
+                                    <small>权限级别: {{ $user->role }}</small>
                                 </p>
                             </li>
                             <!-- Menu Footer-->