feat: 增加日志一键删除 数据导出

app/admin/controller/system/Admin.php

@@ -55,13 +55,6 @@ class Admin extends AdminController
     {
         parent::__construct();
         $this->model = new AdminModel();
-        $this->jobs = Jobs::select()->toArray();
-        $this->group = AdminGroupModel::select()->toArray();
-        $this->department = Department::getListTree();
-
-        foreach ($this->group as $k => $v) {
-            $this->group[$k]['title'] = __($v['title']);
-        }
     }
 
     /**
@@ -123,6 +116,10 @@ class Admin extends AdminController
             return $this->success('查询成功', null, $list, $count);
         }
 
+        $this->jobs = Jobs::select()->toArray();
+        $this->group = AdminGroupModel::select()->toArray();
+        $this->department = Department::getListTree();
+
         return view('/system/admin/index', [
             'jobs'       => $this->jobs,
             'group'      => $this->group,

app/admin/view/system/dictionary/index.html

@@ -108,7 +108,7 @@
                         <i class="layui-icon layui-icon-add-1"></i>{:__('添加')}
                     </button>
                     <!-- // 删除所有 -->
-                    <button class="layui-btn icon-btn layui-btn-danger" lay-batch="lay-tableList"  data-url="{:url('/system/Dictionary/del')}" >
+                    <button class="layui-btn icon-btn layui-btn-danger" lay-batch data-table="lay-tableList"  data-url="{:url('/system/Dictionary/del')}" >
                       <i class="layui-icon layui-icon-delete"></i>{:__('删除')}
                     </button>
                 </div>

app/admin/view/system/login_log/index.html

@@ -87,6 +87,10 @@
                         <button class="layui-btn icon-btn" lay-filter="formSearch" lay-submit><i
                                 class="layui-icon layui-icon-search"></i>{:__('搜索')}
                         </button>
+                        <!-- // 删除所有 -->
+                        <button class="layui-btn icon-btn layui-btn-danger" lay-batch="" data-table="lay-tableList"  data-url="{:url('/system/LoginLog/del')}" >
+                            <i class="layui-icon layui-icon-delete"></i>{:__('删除')}
+                        </button>
                     </div>
                 </div>
             </div>

app/admin/view/system/system_log/index.html

@@ -47,6 +47,10 @@
                     <!-- // 默认搜索 -->
                     <button class="layui-btn icon-btn" lay-filter="formSearch" lay-submit>
                         <i class="layui-icon layui-icon-search"></i>{:__('搜索')}</button>
+                    <!-- // 删除所有 -->
+                    <button class="layui-btn icon-btn layui-btn-danger" lay-batch="lay-tableList" data-table="lay-tableList" data-url="{:url('/system/SystemLog/del')}" >
+                        <i class="layui-icon layui-icon-delete"></i>{:__('删除')}
+                    </button>
                 </div>
             </div>
         </div>   
@@ -136,6 +140,8 @@
         var isTable = table.render({
             elem: "#lay-tableList"
             ,url: "{:url('/system/SystemLog/index')}"
+            ,toolbar: '#tableButton'
+            ,defaultToolbar: ['filter', 'exports', 'print', 'search']
             ,limit: 18
             ,page: true
             ,cols: [[

app/common/model/system/Company.php

@@ -4,12 +4,14 @@ declare (strict_types = 1);
 namespace app\common\model\system;
 
 use think\Model;
+use think\model\concern\SoftDelete;
 
 /**
  * @mixin \think\Model
  */
 class Company extends Model
 {
+    use SoftDelete;
     // 定义时间戳字段名
     protected $createTime = 'create_time';
     

app/install/install.sql

@@ -292,6 +292,7 @@ CREATE TABLE `__PREFIX__company`  (
   `longitude` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地图经度',
   `latitude` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地图纬度',
   `create_time` int(11) NULL DEFAULT NULL COMMENT '创建时间',
+  `delete_time` int(11) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '公司信息表' ROW_FORMAT = DYNAMIC;