摄像头同步脚本临时去掉洗选中心

Modules/Admin/Database/Migrations/2022_05_11_103753_update_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

Modules/Admin/Http/Controllers/UsersController.php

@@ -15,6 +15,7 @@ use Modules\Admin\Auxiliary\View\TableAuxiliary;
 use Modules\Admin\Enum\UserEnum;
 use Modules\Admin\Services\UsersService;
 use Spatie\Permission\Models\Permission;
+use DB;
 
 class UsersController extends BaseController
 {
@@ -47,7 +48,7 @@ class UsersController extends BaseController
         $tableObj->displayActionOthers = [
             [
                 'name'   => '更改权限',
-                'path'   => 'staff/roles/change',
+                'path'   => 'users/roles/edit',
                 'class'  => 'layui-btn-warm',
                 'isShow' => function ($item) {
                     return true;
@@ -191,4 +192,38 @@ class UsersController extends BaseController
         }
         return $this->success();
     }
+
+    //权限修改
+    public function roles(Request $request)
+    {
+        if ($request->isMethod('post')) {
+//            $roleData['title']      = $request->input('name');
+//            $roleData['guard_name'] = 'admin';
+//            $roleData['name']       = implode(array_map(function ($v) {
+//                return ucfirst($v);
+//            }, pinyin($request->input('name'))));
+//
+//            // 添加角色
+//            $roler = Role::updateOrCreate(['id' => $request->input('id') ?? ''], $roleData);
+//            if ($request->has('id')) {  // 同步权限
+//                $roler->syncPermissions($request->input('authids'));
+//            } else {  // 添加权限
+//                $roler->givePermissionTo($request->input('authids'));
+//            }
+//            return $this->redirect('/admin/roles/list');
+            dd(123);
+        }
+        $mine_parent = DB::table('mine_list')->where('parent_id',0)->where('deleted_at',null)->get();
+        $data['menusAll'] = $mine_parent;
+        $data['title']    = '更改权限';
+
+        if (!$request->has('id')) {
+            return $this->redirect('/admin/users/list');
+        }
+
+//        $roler             = Role::find($request->input('id'));
+//        $data['checkedId'] = $roler->getAllPermissions()->pluck('name')->all();
+//        $data['roler']     = $roler;
+        return $this->view('admin::roles', $data);
+    }
 }

Modules/Admin/Resources/views/roles.blade.php

@@ -0,0 +1,106 @@
+<h2>{{ $title }} <a href="javascript:history.go(-1);" class="layui-btn layui-btn-primary layui-layer-close"
+                    style="position:relative;">返回</a></h2>
+<hr/>
+
+<form class="layui-form">
+    <div class="layui-form-item">
+        @if(isset($roler))
+            <input type="hidden" name="id" value="{{ $roler['id'] }}">
+        @endif
+
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">全部选择</label>
+        <div class="layui-input-block">
+            <input type="checkbox" lay-filter="xuanze" lay-skin="switch" lay-text="全选|全不选">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">选择权限</label>
+        <div class="layui-input-block">
+            <div id="LAY-auth-tree-index"></div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" type="submit" lay-submit lay-filter="LAY-auth-tree-submit">提交</button>
+            <button class="layui-btn layui-btn-default" type="reset">重置</button>
+        </div>
+    </div>
+</form>
+
+<script type="text/javascript">
+    layui.extend({
+        authtree: '/js/admin/layui/extends/authtree',
+    });
+    layui.use(['jquery', 'authtree', 'form', 'layer'], function () {
+        var $ = layui.jquery;
+        var authtree = layui.authtree;
+        var form = layui.form;
+        var layer = layui.layer;
+        // 初始化
+
+        var trees = authtree.listConvert(@json($menusAll), {
+            primaryKey: 'id'
+            , startPid: 0
+            , parentKey: 'parent_id'
+            , nameKey: 'title'
+            , valueKey: 'slug'
+            @if(isset($roler))
+            , checkedKey: @json($checkedId)
+            @endif
+        });
+
+        // 渲染时传入渲染目标ID，树形结构数据（具体结构看样例，checked表示默认选中），以及input表单的名字
+        authtree.render('#LAY-auth-tree-index', trees, {
+            inputname: 'authids[]'
+            , layfilter: 'lay-check-auth'
+            // ,autoclose: false
+            // ,autochecked: false
+            // ,openchecked: true
+            , openall: true
+            , autowidth: true
+        });
+
+        form.on('switch(zhankai)', function (data) {
+            if (data.elem.checked) {
+                authtree.showAll('#LAY-auth-tree-index');
+            } else {
+                authtree.closeAll('#LAY-auth-tree-index');
+            }
+        });
+
+        form.on('switch(xuanze)', function (data) {
+            if (data.elem.checked) {
+                authtree.checkAll('#LAY-auth-tree-index');
+            } else {
+                authtree.uncheckAll('#LAY-auth-tree-index');
+            }
+        });
+
+        form.on('submit(LAY-auth-tree-submit)', function (obj) {
+            var authids = authtree.getChecked('#LAY-auth-tree-index');
+            console.log('Choosed authids is', authids);
+            $.ajax({
+                @if(isset($path))
+                url: '{{ $path }}',
+                @else
+                url: '/admin/roles/edit',
+                @endif
+                method: 'post',
+                dataType: 'json',
+                data: obj.field,
+                success: function (res) {
+                    if (res.code === 0) {
+                        layer.msg('提交成功！');
+                        location.href = res.data.url;
+                    }
+                }
+            });
+            return false;
+        });
+
+    });
+
+</script>

Modules/Admin/Routes/web.php

@@ -40,6 +40,8 @@ Route::prefix('admin')->group(function() {
     Route::post('/users/list/edit', 'UsersController@editPost');
     Route::post('/users/list/del', 'UsersController@delPost');
     Route::get('/users/list/resetpassword', 'UsersController@resetPassword');
+//    Route::get('/users/roles/change', 'UsersController@rolesChange');
+    Route::match(['get', 'post'], '/users/roles/edit', 'UsersController@roles');
 });
 
 //菜单导出文件

app/Console/Commands/UpdateHkList.php

@@ -102,6 +102,14 @@ class UpdateHkList extends Command
         //查询存在index_code列表
         $index_code_list = MineList::where('index_code', '!=', null)->get();
 
+        //去掉洗选
+        foreach($index_code_list as $k=>$v){
+            $degree = explode('|',$v->degree);
+            if($degree[0] == 66){
+                unset($index_code_list[$k]);
+            }
+        }
+
         //天地伟业矿区
         $mine_ext = DB::table('mine_list_ext')
             ->select('mine_list_ext.*','mine_list.parent_id')