代码整理

app/Http/Controllers/Admin/CommonController.php

@@ -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('id',$user['role_id'])->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()
    {

        if (Input::hasFile('Filedata')) {

            $file = Input::file('Filedata');

            $entension = $file->getClientOriginalExtension();

            $newName = date('YmdHis') . mt_rand(100, 999) . '.' . $entension;

            $file->move(base_path() . '/public/img', $newName);

            return 'img/' . $newName;

        }

    }

    public function __construct()
    {

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

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

}

app/Http/Controllers/Admin/DepartmentController.php

@@ -11,116 +11,93 @@ use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Admin\CommonController;
 use Session;
-class DepartmentController extends CommonController{
+
+class DepartmentController extends CommonController
+{
 
     public function index()
     {
-        $data = Department::orderby('id','asc')->paginate(20);
-        return view('admin.department.index',compact('data'));
+
+        $data = Department::orderby('id', 'asc')->paginate(20);
+
+        return view('admin.department.index', compact('data'));
+
     }
 
     public function edit($dep_id)
     {
-        $data = Department::find($dep_id);
-        return view('admin.department.edit',compact('data'));
+
+        if (!$data = Department::find($dep_id)) return back()->withErrors('未找到数据');
+
+        return view('admin.department.edit', compact('data'));
     }
 
     public function create()
     {
+
         return view('admin.department.create');
+
     }
 
     public function update($dep_id)
     {
-        $input = Input::except('_token','_method');
-        $re = Department::where('id',$dep_id)->update($input);
-        if($re){
-            return redirect('/department');
-        }else{
-            return back()->with('errors','机构信息更新失败，请稍后重试!');
-        }
+
+        if (!Department::where('id', $dep_id)->update(Input::except('_token', '_method'))) return back()->withErrors('机构信息更新失败，请稍后重试!');
+
+        return redirect('/department');
+
     }
 
     public function destroy($dep_id)
     {
-        $re = Department::where('id',$dep_id)->delete();
-        if($re){
-            $data = [
-                'status'=>1,
-                'msg' => '删除成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '删除失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!Department::where('id', $dep_id)->delete()) return ['status' => 0, 'msg' => '删除失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '删除成功！'];
+
     }
 
     public function store()
     {
+
         $input = Input::except('_token');
+
         $input['display'] = '1';
-        $rules = [
-            'department_description'=>'max:200',
-            'department_name'=>'required|max:100',
-        ];
-        $msg = [
-            'department_name.required'=>'名称不能为空！',
-            'department_description.max'=>'描述不能超过100字！',
-            'department_name.max'=>'名称请保持在50字内！',
-        ];
-        $validator = Validator::make($input,$rules,$msg);
-        if($validator->passes()){
-            $re = Department::create($input);
-            if($re){
-                return redirect('/department');
-            }else{
-                return back()->with('msg','新建失败，请稍后重试！');
-            }
-        }else{
-            return back()->withErrors($validator);
-        }
+
+        $validator = Validator::make($input, [
+            'department_description' => 'max:200',
+            'department_name' => 'required|max:100',
+        ], [
+            'department_name.required' => '名称不能为空！',
+            'department_description.max' => '描述不能超过100字！',
+            'department_name.max' => '名称请保持在50字内！',
+        ]);
+
+        if ($validator->fails()) return back()->withErrors($validator);
+
+        if (!Department::create($input)) return back()->withErrors('新建失败，请稍后重试！');
+
+        return redirect('/department');
+
     }
 
 
     public function ting($dep_id)
     {
-        $temp['display'] = 0;
-        $department = Department::where('id',$dep_id)->update($temp);
-        if($department){
-            $data = [
-                'status'=>'1',
-                'msg' =>'隐藏成功！'
-            ];
-            return $data;
-        }else{
-            $data = [
-                'status' => '0',
-                'msg' => '隐藏失败！'
-            ];
-            return $data;
-        }
+
+        if (!Department::where('id', $dep_id)->update(['display' => 0])) return ['status' => '1', 'msg' => '隐藏失败！'];
+
+        return ['status' => '0','msg' => '隐藏成功！'];
+
     }
 
     public function start($dep_id)
     {
-        $temp['display'] = 1;
-        $department = Department::where('id',$dep_id)->update($temp);
-        if($department){
-            $data = [
-                'status'=>'1',
-                'msg' =>'显示成功！'
-            ];
-            return $data;
-        }else{
-            $data = [
-                'status' => '0',
-                'msg' => '显示失败！'
-            ];
-            return $data;
-        }
+
+        if (!Department::where('id', $dep_id)->update(['display' => 1])) return ['status' => '0', 'msg' => '显示失败！'];
+
+        return ['status' => '1','msg' => '显示成功！'];
+
     }
 
 }

app/Http/Controllers/Admin/IndexController.php

@@ -15,101 +15,120 @@ class IndexController extends CommonController
 {
     public function index()
     {
+
         $data = Tablelist::where('status', '>', '5')->orderby('id', 'asc')->paginate(10);
+
         $project = Project::where('display', '=', '1')->get();
+
         return view('admin.index', compact('data', 'project'));
+
     }
 
-//        登陆
+// 登陆
     public function login()
     {
+
         if ($input = Input::all()) {
+
             $user = Adminuser::where('name', $input['user_name'])->where('display', '=', '1')->first();
-            if ($user == null) {
-                return back()->with('msg', '账号或密码错误！');
-            }
-            if ($input['user_name'] != $user->name || $input['user_pswd'] != Crypt::decrypt($user->pswd)) {
-                return back()->with('msg', '账号或密码错误！');
-            }
+
+            if (!count($user) > 0) return back()->withErrors('账号或密码错误！');
+
+            if ($input['user_name'] != $user->name || $input['user_pswd'] != Crypt::decrypt($user->pswd)) return back()->withErrors('账号或密码错误！');
+
             session(['user' => $user]);
+
             return redirect('/');
+
         } else {
+
             session(['user' => null]);
+
             return view('admin.login');
+
         }
     }
 
 
     public function index_search(Request $request)
     {
-        $input = $request->all();
-        $re = Tablelist::where('bzc_name', 'like', '%' . $input['search'] . '%')->where('status','>','5')->get();
-        if ($re) {
-            return view('admin.search', compact('re'));
-        } else {
-            return back()->withErrors('errors', '对不起，没有相关信息');
-        }
+
+        if ($re = Tablelist::where('bzc_name', 'like', '%' . $request->search . '%')->where('status', '>', '5')->get()) return view('admin.search', compact('re'));
+
+        return back()->withErrors('对不起，没有相关信息');
+
     }
 
     public function search_show()
     {
+
         $re = [];
+
         return view('admin.search', compact('re'));
+
     }
 
 //        管理员修改自己密码
     public function change_pswd()
     {
+
         return view('admin.change_pswd');
+
     }
 
     public function pswd()
     {
-        if ($input = Input::all()) {
 
-            $rules = [
-                'pswd_n' => 'required|between:6,20|confirmed',
-            ];
-            $msg = [
-                'pswd_n.required' => '新密码不能为空！',
-                'pswd_n.between' => '新密码必须在6-20 位！',
-                'pswd_n.confirmed' => '新密码前后输入不一致！',
-            ];
-            $validator = Validator::make($input, $rules, $msg);
-
-            if ($validator->passes()) {
-                $user = Adminuser::first();
-                $_pswd = Crypt::decrypt($user->pswd);
-                if ($input['pswd_o'] == $_pswd) {
-                    $user->pswd = Crypt::encrypt($input['pswd_n']);
-                    $user->save();
-                    return back()->with('errors', '密码修改成功！');
-                } else {
-                    return back()->with('errors', '原密码错误!');
-                }
-            } else {
-                return back()->withErrors($validator);
-            }
-        } else {
-            return view('admin.change_pswd');
-        }
+        $validator = Validator::make(Input::all(), [
+            'pswd_n' => 'required|between:6,20|confirmed',
+        ], [
+            'pswd_n.required' => '新密码不能为空！',
+            'pswd_n.between' => '新密码必须在6-20 位！',
+            'pswd_n.confirmed' => '新密码前后输入不一致！',
+        ]);
+
+        if ($validator->fails()) return back()->withErrors($validator);
+
+        $user = Adminuser::first();
+
+        $_pswd = Crypt::decrypt($user->pswd);
+
+        if (!Input::get('pswd_o') == $_pswd) return back()->withErrors('原密码错误!');
+
+        $user->pswd = Crypt::encrypt(Input::get('pswd_n'));
+
+        $user->save();
+
+        return back()->withErrors('密码修改成功！');
+
     }
 
     public function search_where(Request $request)
     {
+
         $result = Tablelist::query();
+
         $data = $request->all();
-        $result = $result->where('status','>','5');
+
+        $result = $result->where('status', '>', '5');
+
         $result = $data['name'] != '' ? $result->where('bzc_name', $data['name']) : $result;
+
         $result = $data['project_name'] != '' ? $result->where('project_name', $data['project_name']) : $result;
-        $result = $data['start_time'] != '' ? $result->where('table_time','>',$data['start_time']) : $result;
-        $result = $data['end_time'] != '' ? $result->where('table_time','<',$data['end_time']) : $result;
+
+        $result = $data['start_time'] != '' ? $result->where('table_time', '>', $data['start_time']) : $result;
+
+        $result = $data['end_time'] != '' ? $result->where('table_time', '<', $data['end_time']) : $result;
+
         return view('admin.search', ['re' => $result->get()]);
+
     }
 
     public function out()
     {
         session(['user' => null]);
+
         return redirect('/');
+
     }
 }

app/Http/Controllers/Admin/JobController.php

@@ -10,78 +10,76 @@ use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Admin\CommonController;
 use Session;
-class JobController extends CommonController{
+
+class JobController extends CommonController
+{
 
     public function index()
     {
-        $data = Job::orderby('role','asc')->paginate(20);
-        return view('admin.job.index',compact('data'));
+        $data = Job::orderby('role', 'asc')->paginate(20);
+
+        return view('admin.job.index', compact('data'));
+
     }
 
     public function edit($job_id)
     {
+
         $data = Job::find($job_id);
-        return view('admin.job.edit',compact('data'));
+
+        return view('admin.job.edit', compact('data'));
+
     }
 
     public function create()
     {
+
         return view('admin.job.create');
+
     }
 
     public function update($job_id)
     {
-        $input = Input::except('_token','_method');
-        $re = Job::where('id',$job_id)->update($input);
-        if($re){
-            return redirect('/job');
-        }else{
-            return back()->with('errors','职位信息更新失败，请稍后重试!');
-        }
+
+        if (!Job::where('id', $job_id)->update(Input::except('_token', '_method'))) return back()->with('errors', '职位信息更新失败，请稍后重试!');
+
+        return redirect('/job');
+
     }
 
     public function destroy($job_id)
     {
-        $re = Job::where('id',$job_id)->delete();
-        if($re){
-            $data = [
-                'status'=>1,
-                'msg' => '删除成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '删除失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (Job::find($job_id)->delete()) return ['status' => 0, 'msg' => '删除失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '删除成功！'];
+
     }
 
     public function store()
     {
         $input = Input::except('_token');
+
         $input['display'] = '1';
-        $re = Job::create($input);
-        if($re){
-            return redirect('job');
-        }else{
-            return back()->with('errors','新建失败，请稍后重试！');
-        }
-        return 1;
+
+        if (!Job::create($input)) return back()->withErrors('新建失败，请稍后重试！');
+
+        return redirect('job');
+
     }
 
 
     public function ting($job_id)
     {
         $temp['display'] = 0;
-        $job = Job::where('id',$job_id)->update($temp);
-        if($job){
+        $job = Job::where('id', $job_id)->update($temp);
+        if ($job) {
             $data = [
-                'status'=>'1',
-                'msg' =>'隐藏成功！'
+                'status' => '1',
+                'msg' => '隐藏成功！'
             ];
             return $data;
-        }else{
+        } else {
             $data = [
                 'status' => '0',
                 'msg' => '隐藏失败！'
@@ -93,14 +91,14 @@ class JobController extends CommonController{
     public function start($job_id)
     {
         $temp['display'] = 1;
-        $job = Job::where('id',$job_id)->update($temp);
-        if($job){
+        $job = Job::where('id', $job_id)->update($temp);
+        if ($job) {
             $data = [
-                'status'=>'1',
-                'msg' =>'显示成功！'
+                'status' => '1',
+                'msg' => '显示成功！'
             ];
             return $data;
-        }else{
+        } else {
             $data = [
                 'status' => '0',
                 'msg' => '显示失败！'

app/Http/Controllers/Admin/ProjectController.php

@@ -10,109 +10,83 @@ use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Admin\CommonController;
 use Session;
-class ProjectController extends CommonController{
+
+class ProjectController extends CommonController
+{
 
     public function index()
     {
-        $data = Project::orderby('id','asc')->paginate(10);
-        return view('admin.project.index',compact('data'));
+
+        $data = Project::orderby('id', 'asc')->paginate(10);
+
+        return view('admin.project.index', compact('data'));
+
     }
 
     public function edit($project_id)
     {
+
         $data = Project::find($project_id);
-        return view('admin.project.edit',compact('data'));
+
+        return view('admin.project.edit', compact('data'));
+
     }
 
     public function create()
     {
+
         return view('admin.project.create');
+
     }
 
     public function update($project_id)
     {
-        $input = Input::except('_token','_method');
-        if($input){
-            $re = Project::where('id',$project_id)->update($input);
-            if($re){
-                return redirect('/project');
-            }else{
-                return back()->with('errors','更新失败，请检查输入后重试!');
-            }
-        }
+        $input = Input::except('_token', '_method');
+
+        if (!Project::where('id', $project_id)->update($input)) return back()->with('errors', '更新失败，请检查输入后重试!');
+
+        return redirect('/project');
+
     }
 
     public function destroy($project_id)
     {
-        $re = Project::where('id',$project_id)->delete();
-        if($re){
-            $data = [
-                'status'=>1,
-                'msg' => '隐藏成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '隐藏失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!Project::find($project_id)->delete()) return ['status' => 0, 'msg' => '隐藏失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '隐藏成功！'];
+
     }
 
     public function show($project_id)
     {
-        $re = Project::find($project_id);
-        $project['display'] = 1;
-        $project['id'] = $re->id;
-        $project['project_name'] = $re->project_name;
-        $test = Project::where('id',$project_id)->update($project);
-        if($test){
-            $data = [
-                'status'=>1,
-                'msg' => '显示成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '显示失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!Project::find($project_id)->update(['display' => 1])) return ['status' => 0, 'msg' => '显示失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '显示成功！'];
+
     }
 
     public function display($project_id)
     {
-        $re = Project::find($project_id);
-        $project['display'] = 0;
-        $project['id'] = $re->id;
-        $project['project_name'] = $re->project_name;
-        $test = Project::where('id',$project_id)->update($project);
-        if($test){
-            $data = [
-                'status'=>1,
-                'msg' => '隐藏成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '隐藏失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!Project::find($project_id)->update(['display' => 0])) return ['status' => 0, 'msg' => '隐藏失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '隐藏成功！'];
+
     }
 
     public function store()
     {
+
         $input = Input::except('_token');
+
         $input['display'] = 1;
-        if($input){
-            $re = Project::create($input);
-            if($re){
-                return redirect('/project');
-            }else{
-                return back()->with('errors','新建失败，请检查输入后重试！');
-            }
-        }
+
+        if (!Project::create($input)) return back()->with('新建失败，请检查输入后重试！');
+
+        return redirect('/project');
+
     }
 
 }

app/Http/Controllers/Admin/TableController.php

@@ -61,6 +61,7 @@ class TableController extends CommonController
             'admin.table.table_nine'
         ];
 
+
         return view($view[$table_type_id - 1], compact('table_type_id'));
 
     }

app/Http/Controllers/Admin/UserController.php

@@ -18,142 +18,135 @@ class UserController extends CommonController
 //    用户列表
     public function user_list()
     {
-        $data = User::orderby('role','asc')->paginate(10);
 
-        return view('admin.user.userlist',compact('data'));
+        $data = User::orderby('role', 'asc')->paginate(10);
+
+        return view('admin.user.userlist', compact('data'));
+
     }
 
 //    编辑用户
     public function edit($user_id)
     {
         $data = User::find($user_id);
-        $user_job = Job::where('display','=','1')->orderby('role','asc')->get();
-        return view('admin.user.edit',['data'=>$data,'user_job'=>$user_job]);
+
+        $user_job = Job::where('display', '=', '1')->orderby('role', 'asc')->get();
+
+        return view('admin.user.edit', ['data' => $data, 'user_job' => $user_job]);
+
     }
-    
+
 //    更新用户信息
     public function update($user_id)
     {
-        $input = Input::except('_token','_method');
-        $rules = [
-            'name'=>'required',
-            'pswd'=>'required',
-            'surname'=>'required'
-        ];
-        $msg = [
-            'name.required'=>'登录名不能为空！',
-            'pswd.required'=>'密码不能为空！',
-            'surname.required'=>'姓名不能为空！'
-        ];
-        $validator = Validator::make($input,$rules,$msg);
-        $job_role = Job::find($input['role_id']);
+
+        $validator = Validator::make(Input::except('_token', '_method'), [
+            'name' => 'required',
+            'pswd' => 'required',
+            'surname' => 'required'
+        ], [
+            'name.required' => '登录名不能为空！',
+            'pswd.required' => '密码不能为空！',
+            'surname.required' => '姓名不能为空！'
+        ]);
+
+        $job_role = Job::find(Input::get('role_id'));
         $input['role'] = $job_role->role;
         $input['job_name'] = $job_role->display_name;
-        if($validator->passes()){
-            $input['pswd'] = Crypt::encrypt($input['pswd']);
-            $re = User::find($user_id)->update($input);
-            if($re){
-                return redirect('/user_list');
-            }else{
-                return back()->with('errors','用户信息更新失败，请稍后重试!');
-            }
-        }else{
-            return back()->withErrors($validator);
-        }
+        $input['pswd'] = Crypt::encrypt($input['pswd']);
+
+        if ($validator->fails()) return back()->withErrors($validator);
+
+        if (!User::find($user_id)->update($input)) return back()->with('errors', '用户信息更新失败，请稍后重试!');
+
+        return redirect('/user_list');
+
+
     }
 
     public function create()
     {
-        $user_job = Job::where('display','=','1')->orderby('role','asc')->get();
-        $department = Department::where('display','=','1')->get();
-        return view('admin.user.add_user',compact('user_job','department'));
+
+        $user_job = Job::where('display', '=', '1')->orderby('role', 'asc')->get();
+
+        $department = Department::where('display', '=', '1')->get();
+
+        return view('admin.user.add_user', compact('user_job', 'department'));
+
     }
 
     public function store()
     {
         $input = Input::except('_token');
+
         $input['display'] = '1';
+
         $dep = Department::find($input['department_id']);
+
         $input['department'] = $dep->department_name;
-//        $input['status'] = '1';
-        $rules = [
-            'name'=>'required',
-            'pswd'=>'required',
-            'surname'=>'required'
-        ];
-        $msg = [
-            'name.required'=>'登录名不能为空！',
-            'pswd.required'=>'密码不能为空！',
-            'surname.required'=>'姓名不能为空！'
-        ];
-        $validator = Validator::make($input,$rules,$msg);
+
+        $validator = Validator::make($input, [
+            'name' => 'required',
+            'pswd' => 'required',
+            'surname' => 'required'
+        ], [
+            'name.required' => '登录名不能为空！',
+            'pswd.required' => '密码不能为空！',
+            'surname.required' => '姓名不能为空！'
+        ]);
+
         $job_role = Job::find($input['role_id']);
+
         $input['role'] = $job_role->role;
+
         $input['job_name'] = $job_role->display_name;
-        if($validator->passes()){
-            $input['pswd'] = Crypt::encrypt($input['pswd']);
-            $re = User::create($input);
-            if($re){
-                return redirect('/user_list');
-            }else{
-                return back()->with('errors','未知错误，请稍后重试！');
-            }
-        }else{
-            return back()->withErrors($validator);
-        }
-    }
 
-    public function destroy($user_id)
-    {
-        $re = User::find($user_id);
-        $re['display'] = 0;
-        User::where('id',$user_id)->update($re);
-       if($re){
-            $data = [
-                'status'=>1,
-                'msg' => '删除成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '删除失败，请刷新重试！'
-            ];
-        }
-        return $data;
+        if ($validator->fails()) return back()->withErrors($validator);
+
+        $input['pswd'] = Crypt::encrypt($input['pswd']);
+
+        if (!User::create($input)) return back()->withErrors('未知错误，请稍后重试！');
+
+        return redirect('/user_list');
+
     }
 
     public function ting($user_id)
     {
-        $temp['display'] = 0;
-        $user = User::where('id',$user_id)->update($temp);
-        if($user){
-            $data = [
-                'status'=>1,
-                'msg' => '停用成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '停用失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!User::find($user_id)->update(['display' => 0])) return ['status' => 0, 'msg' => '停用失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '停用成功！'];
+
     }
+
     public function start($user_id)
     {
-        $temp['display'] = 1;
-        $user = User::where('id',$user_id)->update($temp);
-        if($user){
-            $data = [
-                'status'=>1,
-                'msg' => '启用成功！'
-            ];
-        }else{
-            $data =[
-                'status'=>0,
-                'msg' => '启用失败，请刷新重试！'
-            ];
-        }
-        return $data;
+
+        if (!User::find($user_id)->update(['display' => 1])) return ['status' => 0, 'msg' => '启用失败，请刷新重试！'];
+
+        return ['status' => 1, 'msg' => '启用成功！'];
+
     }
+
+
+//    public function destroy($user_id)
+//    {
+//        $re = User::find($user_id);
+//        $re['display'] = 0;
+//        User::where('id', $user_id)->update($re);
+//        if ($re) {
+//            $data = [
+//                'status' => 1,
+//                'msg' => '删除成功！'
+//            ];
+//        } else {
+//            $data = [
+//                'status' => 0,
+//                'msg' => '删除失败，请刷新重试！'
+//            ];
+//        }
+//        return $data;
+//    }
+//
 }

app/Http/Controllers/Admin/VideoController.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use Illuminate\Http\Request;
-
-use App\Http\Requests;
-
-use App\Models\Video;
-
-use Auth, Toastr;
-use App\Http\Requests\Admin\VideoRequest;
-
-class VideoController extends CommonController
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        $videos = Video::paginate(20);
-        return view('admin.video.index', compact('videos'));
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        return view('admin.video.create');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(VideoRequest $request)
-    {
-        if ($data = $request->all()) {
-            $video = Video::create($data);
-            if ($video) {
-                return redirect(route('admin.video'));
-            } else {
-                return back()->with('errors', ['视频添加失败!']);
-            }
-        }
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        $video = Video::find($id);
-
-        if(!$video) {
-            Toastr::error('视频不存在');
-            return redirect(route('admin.video'));
-        }
-
-        return view('admin.video.edit', compact('video'));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(VideoRequest $request, $id)
-    {
-        $video = Video::find($id);
-        if(!$video) {
-            Toastr::error('视频不存在');
-            return redirect(route('admin.video'));
-        }
-
-        if ($data = $request->all()) {
-            $result = $video->update($data);
-            if ($result) {
-                return redirect()->route('admin.video');
-            } else {
-                return back()->with('errors', ['视频编辑失败!']);
-            }
-        }
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        $video = Video::find($id);
-        if(!$video) {
-            return redirect()->route('admin.video')->with('errors', ['视频未找到!']);
-        }
-        $err = '视频删除成功';
-        if(!$video->delete()){
-            $err = '视频删除失败!';
-        }
-        return redirect()->route('admin.video')->with('errors', [$err]);
-    }
-}

app/Http/routes.php

@@ -37,7 +37,6 @@ Route::group(['namespace'=>'Admin','middleware'=>['admin.login']],function() {
     Route::get('/table/statistics/{table_type_id}','TableController@sta_table');
 
     Route::resource('user', 'UserController');
-    Route::resource('video', 'VideoController');
     Route::resource('/permission','PermissionController');
     Route::resource('/job','JobController');
     Route::resource('/project','ProjectController');

app/Model/Video.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Video extends Model
-{
-    protected $guarded = ['_token'];
-
-    protected $table = 'user';
-    protected $primaryKey = 'id';
-}

resources/views/admin/change_pswd.blade.php

@@ -32,17 +32,8 @@
                     <div class="box-body">
                         <form action="{{ url('/pswd') }}" method="post">
                             {{csrf_field()}}
-                            @if(count($errors)>0)
-                                <div class="callout callout-danger">
-                                    @if(is_object($errors))
-                                        @foreach($errors->all() as $error)
-                                            <p>{{ $error }}</p>
-                                        @endforeach
-                                    @else
-                                        <p>{{ $errors }}</p>
-                                    @endif
-                                </div>
-                            @endif
+                            @include('admin.errors', ['errors' => $errors])
+
                             <p>原密码</p>
                             <div class="input-group margin">
                                 <input type="password" class="form-control" name="pswd_o">

resources/views/admin/department/create.blade.php

@@ -30,17 +30,8 @@
             <div class="box-body">
                 <form class="form-horizontal form-bordered" action="{{ url('/department') }}" method="POST">
                     {{ csrf_field() }}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+                    @include('admin.errors', ['errors' => $errors])
+
                     <div class="panel-body panel-body-nopadding">
 
                         <div class="form-group">

resources/views/admin/index.blade.php

@@ -15,14 +15,8 @@
                 <li><a href="#">信息统计</a></li>
             </ol>
         </section>
-
-
-
-
         <!-- Main content -->
         <section class="content">
-
-
             <div class='box'>
                 <div class="box-header">
                     <h3 class="box-title">案件搜索</h3>

resources/views/admin/job/create.blade.php

@@ -32,17 +32,8 @@
             <div class="box-body">
                 <form class="form-horizontal form-bordered" action="{{ url('/job') }}" method="POST">
                     {{ csrf_field() }}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+                    @include('admin.errors', ['errors' => $errors])
+
                     <div class="panel-body panel-body-nopadding">
 
 

resources/views/admin/job/edit.blade.php

@@ -31,17 +31,8 @@
             </div>
             <div class="box-body">
                 <form class="form-horizontal form-bordered"  action="{{ url("/job/$data->id") }}" method="POST">
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+                    @include('admin.errors', ['errors' => $errors])
+
                     <input type="hidden" name="_method" value="put" >
                     {{csrf_field()}}
                     <div class="panel-body panel-body-nopadding">

resources/views/admin/login.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 {{--@if(session('msg'))--}}
-    {{--<p style="color: #b30b0b">{{ session('msg') }}</p>--}}
+{{--<p style="color: #b30b0b">{{ session('msg') }}</p>--}}
 {{--@endif--}}
 
 <head>
@@ -17,26 +17,28 @@
 
 
 <body>
-    <div class="container">
-        <div class="container_one">
-            <h1>海勃湾区征拆局管理系统</h1>
-        </div>
-        <div class="container_two">
-            <div class="container_two_div">
-                <div>
-                    @if(session('msg'))
-                        <p style="color: #b30b0b">{{ session('msg') }}</p>
-                        @endif
-                </div>
-                <form action="{{ url('/login') }}" method="post">
-                    {{ csrf_field() }}
-                    <label>用户名：</label><input name="user_name" type="text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <label>密 码：</label><input name="user_pswd" type="password">&nbsp;&nbsp;&nbsp;&nbsp;
-                    <button type="submit">登录</button>
-                </form>
+<div class="container">
+    <div class="container_one">
+        <h1>海勃湾区征拆局管理系统</h1>
+    </div>
+    <div class="container_two">
+        <div class="container_two_div">
+            <div>
+                @if(session('msg'))
+                    <p style="color: #b30b0b">{{ session('msg') }}</p>
+                @endif
+                @include('admin.errors', ['errors' => $errors])
+
             </div>
+            <form action="{{ url('/login') }}" method="post">
+                {{ csrf_field() }}
+                <label>用户名：</label><input name="user_name" type="text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <label>密 码：</label><input name="user_pswd" type="password">&nbsp;&nbsp;&nbsp;&nbsp;
+                <button type="submit">登录</button>
+            </form>
         </div>
     </div>
+</div>
 <!--  END OF PAPER WRAP -->
 
 </body>

resources/views/admin/user/add_user.blade.php

@@ -32,17 +32,8 @@
             <div class="box-body">
                 <form action="{{ url("/user") }}" method="post">
                     {{csrf_field()}}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+                    @include('admin.errors', ['errors' => $errors])
+
                     <table id="example2" class="table table-bordered table-hover dataTable" role="grid" aria-describedby="example2_info">
                         <tbody>
                         <tr>

resources/views/admin/user/edit.blade.php

@@ -34,17 +34,8 @@
                 <form action="{{ url("/user/$data->id") }}" method="post">
                     <input type="hidden" name="_method" value="put">
                     {{csrf_field()}}
-                    @if(count($errors)>0)
-                        <div class="callout callout-danger">
-                            @if(is_object($errors))
-                                @foreach($errors->all() as $error)
-                                    <p>{{ $error }}</p>
-                                @endforeach
-                            @else
-                                <p>{{ $errors }}</p>
-                            @endif
-                        </div>
-                    @endif
+                    @include('admin.errors', ['errors' => $errors])
+
                     <table id="example2" class="table table-bordered table-hover dataTable" role="grid"
                            aria-describedby="example2_info">
                         <tbody>

resources/views/admin/video/create.blade.php

@@ -1,137 +0,0 @@
-@extends('layouts.admin-app')
-
-@section('content')
-
-   <!--- <div class="pageheader">
-        <h2><i class="fa fa-home"></i> Dashboard <span>Subtitle goes here...</span></h2>
-        <div class="breadcrumb-wrapper">
-            <span class="label">You are here:</span>
-            <ol class="breadcrumb">
-                <li class="active">Dashboard</li>
-            </ol>
-        </div>
-    </div> -->
-
-    <div class="contentpanel" smooth: true,>
-        <div class="row">
-
-            <div class="col-sm-12 col-lg-12">
-
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <div class="panel-btns">
-                            <a href="" class="panel-close">×</a>
-                            <a href="" class="minimize">−</a>
-                        </div>
-                        <h4 class="panel-title">添加视频</h4>
-                    </div>
-
-                    <form class="form-horizontal form-bordered" action="{{ route('admin.video.store') }}" method="POST" enctype="multipart/form-data">
-                        @include('admin._partials.errors', ['errors' => $errors])
-                        <div class="panel-body panel-body-nopadding">
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">视频名称</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="title" value="{{ old('title') }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">关键词</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="keywords" value="{{ old('keywords') }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">摘要</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="synopsis" value="{{ old('synopsis') }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">上传视频</label>
-
-                                <div class="col-sm-6">
-                                    <input type="file" class="form-control" id="upload_video" name="upload_video" value="">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">或 输入视频地址</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" id="url" name="url" value="{{ old('url') }}">
-                                    <input type="hidden" id="path" name="path" value="{{ old('path') }}">
-                                    <input type="hidden" id="attachment_id" name="attachment_id" value="{{ old('attachment_id') }}">
-                                </div>
-                            </div>
-
-                            {{ csrf_field() }}
-                        </div><!-- panel-body -->
-
-                        <div class="panel-footer">
-                            <div class="row">
-                                <div class="col-sm-6 col-sm-offset-3">
-                                    <button class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div><!-- panel-footer -->
-
-                    </form>
-                </div>
-
-            </div><!-- col-sm-9 -->
-
-        </div><!-- row -->
-    </div><!-- contentpanel -->
-
-    <!-- 实例化编辑器 -->
-    <script>
-        $(document).ready(function () {
-            $('#upload_video').uploadify({
-                "auto": true,
-                "buttonText": "上传",
-                "fileTypeDesc": "video files",
-                "fileTypeExts": "*.mp4;*.png",
-                "fileObjName": "video",
-                "method": "post",
-                "formData": {
-                    "timestamp": {{ time() }},
-                    "_token": "{{ csrf_token() }}"
-                },
-                "multi": false,
-                "swf": "{{ asset('plugins/uploadify/uploadify.swf') }}",
-                "uploader": "{{ route('admin.attachment.upload') }}",
-                "onUploadSuccess": function (file, data, response) {
-                    data = $.parseJSON(data);
-                    if (data.state == 0) {
-                        $('#url').val(data.data.url);
-                        $('#path').val(data.data.path);
-                        $('#attachment_id').val(data.data.aid);
-                    } else {
-                        $('.message').html(response.message);
-                    }
-                },
-                'onUploadError' : function(file, errorCode, errorMsg, errorString) {
-                    alert('The file ' + file.name + ' could not be uploaded: ' + errorString);
-                }
-            });
-        })
-    </script>
-@endsection
-
-@section('css')
-    @parent
-    <link rel="stylesheet" href="{{ asset('plugins/uploadify/uploadify.css') }}">
-@endsection
-
-@section('js')
-    @parent
-    <script src="{{ asset('plugins/uploadify/jquery.uploadify.min.js') }}"></script>
-@endsection

resources/views/admin/video/edit.blade.php

@@ -1,138 +0,0 @@
-@extends('layouts.admin-app')
-
-@section('content')
-
-   <!--- <div class="pageheader">
-        <h2><i class="fa fa-home"></i> Dashboard <span>Subtitle goes here...</span></h2>
-        <div class="breadcrumb-wrapper">
-            <span class="label">You are here:</span>
-            <ol class="breadcrumb">
-                <li class="active">Dashboard</li>
-            </ol>
-        </div>
-    </div> -->
-
-    <div class="contentpanel" smooth: true,>
-        <div class="row">
-
-            <div class="col-sm-12 col-lg-12">
-
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <div class="panel-btns">
-                            <a href="" class="panel-close">×</a>
-                            <a href="" class="minimize">−</a>
-                        </div>
-                        <h4 class="panel-title">编辑视频</h4>
-                    </div>
-
-                    <form class="form-horizontal form-bordered" action="{{ route('admin.video.update', ['id' => $video->id]) }}" method="POST">
-                        @include('admin._partials.errors', ['errors' => $errors])
-                        {{ method_field('PATCH') }}
-                        <div class="panel-body panel-body-nopadding">
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">视频名称</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="title" value="{{ $video->title }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">关键词</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="keywords" value="{{ $video->keywords }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">摘要</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" name="synopsis" value="{{ $video->synopsis }}">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">上传视频</label>
-
-                                <div class="col-sm-6">
-                                    <input type="file" class="form-control" id="upload_video" name="upload_video" value="">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label class="col-sm-3 control-label">或 输入视频地址</label>
-
-                                <div class="col-sm-6">
-                                    <input type="text" class="form-control" id="url" name="url" value="{{ $video->url }}">
-                                    <input type="hidden" id="path" name="path" value="{{ $video->path }}">
-                                    <input type="hidden" id="attachment_id" name="attachment_id" value="{{ $video->attachment_id }}">
-                                </div>
-                            </div>
-
-                            {{ csrf_field() }}
-                        </div><!-- panel-body -->
-
-                        <div class="panel-footer">
-                            <div class="row">
-                                <div class="col-sm-6 col-sm-offset-3">
-                                    <button class="btn btn-primary">保存</button>
-                                </div>
-                            </div>
-                        </div><!-- panel-footer -->
-
-                    </form>
-                </div>
-
-            </div><!-- col-sm-9 -->
-
-        </div><!-- row -->
-    </div><!-- contentpanel -->
-
-    <!-- 实例化编辑器 -->
-    <script>
-        $(document).ready(function () {
-            $('#upload_video').uploadify({
-                "auto": true,
-                "buttonText": "上传",
-                "fileTypeDesc": "video files",
-                "fileTypeExts": "*.mp4;*.png",
-                "fileObjName": "video",
-                "method": "post",
-                "formData": {
-                    "timestamp": {{ time() }},
-                    "_token": "{{ csrf_token() }}"
-                },
-                "multi": false,
-                "swf": "{{ asset('plugins/uploadify/uploadify.swf') }}",
-                "uploader": "{{ route('admin.attachment.upload') }}",
-                "onUploadSuccess": function (file, data, response) {
-                    data = $.parseJSON(data);
-                    if (data.state == 0) {
-                        $('#url').val(data.data.url);
-                        $('#path').val(data.data.path);
-                        $('#attachment_id').val(data.data.aid);
-                    } else {
-                        $('.message').html(response.message);
-                    }
-                },
-                'onUploadError' : function(file, errorCode, errorMsg, errorString) {
-                    alert('The file ' + file.name + ' could not be uploaded: ' + errorString);
-                }
-            });
-        })
-    </script>
-@endsection
-
-@section('css')
-    @parent
-    <link rel="stylesheet" href="{{ asset('plugins/uploadify/uploadify.css') }}">
-@endsection
-
-@section('js')
-    @parent
-    <script src="{{ asset('plugins/uploadify/jquery.uploadify.min.js') }}"></script>
-@endsection

resources/views/admin/video/index.blade.php

@@ -1,113 +0,0 @@
-@extends('layouts.admin-app')
-
-@section('content')
-
-   <!--- <div class="pageheader">
-        <h2><i class="fa fa-home"></i> Dashboard <span>Subtitle goes here...</span></h2>
-        <div class="breadcrumb-wrapper">
-            <span class="label">You are here:</span>
-            <ol class="breadcrumb">
-                <li class="active">Dashboard</li>
-            </ol>
-        </div>
-    </div> -->
-
-    <div class="contentpanel" smooth: true,>
-        <div class="row">
-
-            <div class="col-sm-12 col-lg-12">
-
-                <div class="panel panel-default">
-                    <div class="panel-body">
-
-                        <div class="pull-right">
-                            <div class="btn-group mr10">
-                                <a href="{{ route('admin.video.create') }}" class="btn btn-white tooltips"
-                                   data-toggle="tooltip" data-original-title="新增"><i
-                                            class="fa fa-plus"></i></a>
-                                <a class="btn btn-white tooltips deleteall" data-toggle="tooltip"
-                                   data-original-title="删除" data-href="{{ route('admin.admin_user.destroy.all') }}"><i
-                                            class="fa fa-trash"></i></a>
-                            </div>
-                        </div><!-- pull-right -->
-
-                        <h5 class="subtitle mb5">视频列表</h5>
-
-                        @include('admin._partials.show-page-status',['result'=>$videos])
-
-                        <div class="table-responsive col-md-12">
-                            <table class="table mb30">
-                                <thead>
-                                <tr>
-                                    <th>
-                                        <span class="ckbox ckbox-primary">
-                                            <input type="checkbox" id="selectall"/>
-                                            <label for="selectall"></label>
-                                        </span>
-                                    </th>
-                                    <th>名称</th>
-                                    <th>关键词</th>
-                                    <th>摘要</th>
-                                    <th>视频</th>
-                                    <th>播放次数</th>
-                                    <th>发布</th>
-                                    <th>时间</th>
-                                    <th>操作</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach($videos as $video)
-                                    <tr>
-                                        <td>
-                                            <div class="ckbox ckbox-default">
-                                                <input type="checkbox" name="id" id="id-{{ $video->id }}" value="{{ $video->id }}" class="selectall-item"/>
-                                                <label for="id-{{ $video->id }}"></label>
-                                            </div>
-                                        </td>
-                                        <td>{{ $video->title }}</td>
-                                        <td>{{ $video->keywords }}</td>
-                                        <td>{{ $video->synopsis }}</td>
-                                        <td>{{ $video->url }}</td>
-                                        <td>{{ $video->number }}</td>
-                                        <td>{{ $video->admin_user->name }}</td>
-                                        <td>{{ $video->created_at }}</td>
-                                        <td>
-                                            <a href="{{ route('admin.video.edit', ['id' => $video->id]) }}" class="btn btn-white btn-sm"><i class="fa fa-pencil"></i> 编辑</a>
-                                            <a class="btn btn-danger btn-sm video-delete"
-                                               href="javascript:if (confirm('确定要删除？')) { $('#form-destroy-{{ $video->id }}').submit(); }"><i  class="fa fa-trash-o"></i> 删除</a>
-                                            <form id="form-destroy-{{ $video->id }}" class="hidden" action="{{ route('admin.video.destroy', ['id'=>$video->id]) }}" method="POST">
-                                                <input name="_method" type="hidden" value="DELETE">
-                                                <input name="_token" type="hidden" value="{{ csrf_token() }}">
-                                            </form>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                                </tbody>
-                            </table>
-                        </div>
-
-                        {{ $videos->links() }}
-
-                    </div><!-- panel-body -->
-                </div><!-- panel -->
-
-            </div><!-- col-sm-12 -->
-
-        </div><!-- row -->
-    </div><!-- contentpanel -->
-
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $(".user-delete").click(function () {
-                return confirm("确认删除视频？");
-            });
-            $(".deleteall").click(function () {
-                return confirm("确认删除选定视频？");
-            });
-            $("#selectall").click(function () {
-                var v = this.checked;
-                $("tbody input:checkbox").attr("checked", v);
-            });
-        });
-    </script>
-@endsection