From eff623823502ab79efef903f3b183d2a02db907d Mon Sep 17 00:00:00 2001
From: zhangxy102 <zhangxy102@lenovo.com>
Date: Sat, 6 Aug 2022 23:36:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/log.ts                     |  38 +++++
 src/components/QuickForm/index.vue |  12 +-
 src/router/dynamicRouter.ts        |   1 +
 src/types/form.ts                  |   1 +
 src/types/log.ts                   |  16 ++
 src/views/menu/index.vue           |   2 +-
 src/views/system/log/operate.vue   | 240 ++++++++++++++++++++---------
 src/views/system/menu/index.vue    |   2 +-
 8 files changed, 240 insertions(+), 72 deletions(-)
 create mode 100644 src/api/log.ts
 create mode 100644 src/types/log.ts

diff --git a/src/api/log.ts b/src/api/log.ts
new file mode 100644
index 0000000..d2613e0
--- /dev/null
+++ b/src/api/log.ts
@@ -0,0 +1,38 @@
+import { Log } from '../types/log'
+import request, { QuickResponseData } from '../utils/request'
+
+const Api = {
+  pageList: '/api/log/getPageList',
+  remove: '/api/log/remove',
+  batchRemove: '/api/log/batchRemove',
+}
+
+export const getLogPageList = (
+  params: any
+): Promise<QuickResponseData<Array<Log>>> => {
+  return request<QuickResponseData<Array<Log>>>({
+    url: Api.pageList,
+    method: 'GET',
+    params,
+  })
+}
+
+export const removeLog = (id: string) => {
+  return request({
+    url: Api.remove,
+    method: 'POST',
+    data: {
+      id,
+    },
+  })
+}
+
+export const batchRemove = (ids: string) => {
+  return request({
+    url: Api.batchRemove,
+    method: 'POST',
+    data: {
+      ids,
+    },
+  })
+}
diff --git a/src/components/QuickForm/index.vue b/src/components/QuickForm/index.vue
index 59c520f..cda9f5c 100644
--- a/src/components/QuickForm/index.vue
+++ b/src/components/QuickForm/index.vue
@@ -195,6 +195,17 @@ defineExpose({ handleSubmit })
             :inactive-value="0"
           />
         </template>
+        <template v-else-if="item.type === 'datetimerange'">
+          <el-date-picker
+            v-model="model[item.vModel]"
+            type="datetimerange"
+            range-separator="To"
+            value-format="X"
+            format="YYYY-MM-DD HH:mm:ss"
+            :start-placeholder="item.placeholders[0]"
+            :end-placeholder="item.placeholders[1]"
+          />
+        </template>
         <template v-else-if="item.type === 'tree'">
           <el-tree-select
             v-model="model[item.vModel]"
@@ -210,7 +221,6 @@ defineExpose({ handleSubmit })
           />
         </template>
         <template v-else-if="item.type == 'icon'">
-          <!-- v-model:visible="iconVisible" -->
           <el-popover placement="bottom" width="1000px" trigger="click">
             <template #reference>
               <el-input
diff --git a/src/router/dynamicRouter.ts b/src/router/dynamicRouter.ts
index 8d46e66..e205a7d 100644
--- a/src/router/dynamicRouter.ts
+++ b/src/router/dynamicRouter.ts
@@ -58,6 +58,7 @@ const formatRouter = (data: Menu[]) => {
     if (childMenu.length > 0) {
       routerObj.redirect = childMenu[0].path
       childMenu.forEach((childElement: Menu) => {
+        if (childElement.link) return
         const component = getComponent(childElement)
         const childRouterObj: RouteRecordRaw = {
           name: childElement.menuId,
diff --git a/src/types/form.ts b/src/types/form.ts
index c53dc30..853cfa4 100644
--- a/src/types/form.ts
+++ b/src/types/form.ts
@@ -31,6 +31,7 @@ export interface FormItem {
   rules?: any
   width?: string
   maxLength?: string
+  placeholders?: Array<string>
   format?: () => any
   change?: (value: string) => void
   select?: (value: string) => void
diff --git a/src/types/log.ts b/src/types/log.ts
new file mode 100644
index 0000000..ad471ce
--- /dev/null
+++ b/src/types/log.ts
@@ -0,0 +1,16 @@
+export interface Log {
+  id: string | number
+  logTime: string
+  operateApi: string
+  requestParams?: string
+  errorMessage?: string
+  exceptionMessage?: string
+  ip: string
+  logType: number
+}
+export interface SearchLog {
+  startTime?: string
+  endTime?: string
+  operateUserId?: string
+  logTime: string
+}
diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue
index 48457a6..02266c1 100644
--- a/src/views/menu/index.vue
+++ b/src/views/menu/index.vue
@@ -5,7 +5,7 @@ import { selectTreeFormat, listToTree } from '@/utils/index'
 import { Column, Actionbar, Toolbar } from '@/types/table'
 import { Menu } from '@/types/menu'
 import { FormItem } from '@/types/form'
-import { Options } from '@/types/options.js'
+import { Options } from '@/types/options'
 import { getMenuList, addMenu, updateMenu, deleteMenu } from '@/api/menu'
 import QuickCrud from '@/components/QuickCrud/index.vue'
 
diff --git a/src/views/system/log/operate.vue b/src/views/system/log/operate.vue
index a269961..c330f02 100644
--- a/src/views/system/log/operate.vue
+++ b/src/views/system/log/operate.vue
@@ -3,112 +3,183 @@ import { reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import QuickCrud from '@/components/QuickCrud/index.vue'
 import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Role } from '@/types/role'
+import { Log, SearchLog } from '@/types/log'
 import { FormItem } from '@/types/form'
-import { getRoleList, addRole, updateRole, deleteRole } from '@/api/role'
+import { Page } from '@/types/page'
+import { getLogPageList, removeLog, batchRemove } from '@/api/log'
 
-const dataList = reactive<Array<Role>>([])
+const dataList = reactive<Array<Log>>([])
 /**
  * 表单
  */
 const dialogTitle = reactive({
-  add: '新增角色',
-  edit: '编辑角色',
-  detail: '角色详情',
+  // add: '添加日志',
+  // edit: '编辑日志',
+  detail: '日志详情',
 })
-const formModel = reactive<Role>({
+const formModel = reactive<Log>({
   id: '',
-  roleId: '',
-  roleName: '',
+  logTime: '',
+  operateApi: '',
+  requestParams: '',
+  errorMessage: '',
+  exceptionMessage: '',
+  ip: '',
+  logType: 0,
 })
 const formItems = reactive<Array<FormItem>>([
   {
-    label: '角色编号',
+    label: '编号',
     labelWidth: '80px',
-    vModel: 'roleId',
-    placeholder: '角色编号',
-    editReadonly: true,
-    prop: 'roleId',
-    rules: [
-      {
-        required: true,
-        message: '角色编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '角色名称',
+    vModel: 'id',
+  },
+  {
+    label: '日志时间',
+    labelWidth: '80px',
+    vModel: 'logTime',
+  },
+  {
+    label: '操作接口',
+    labelWidth: '80px',
+    vModel: 'operateApi',
+  },
+  {
+    label: 'IP',
+    labelWidth: '80px',
+    vModel: 'ip',
+  },
+  {
+    label: '请求参数',
+    labelWidth: '80px',
+    vModel: 'requestParams',
+  },
+  {
+    label: '操作人',
+    labelWidth: '80px',
+    vModel: 'operateUserId',
+  },
+  {
+    label: '错误信息',
+    labelWidth: '80px',
+    vModel: 'errorMessage',
+  },
+  {
+    label: '异常信息',
     labelWidth: '80px',
-    vModel: 'roleName',
-    placeholder: '角色名称',
-    prop: 'roleName',
-    rules: [
-      {
-        required: true,
-        message: '角色名称不能为空',
-        trigger: 'blur',
-      },
-    ],
+    vModel: 'exceptionMessage',
+    type: 'textarea',
+  },
+])
+
+/**
+ * 搜索
+ */
+const searchForm = reactive<SearchLog>({
+  startTime: '',
+  endTime: '',
+  operateUserId: '',
+  logTime: '',
+})
+const searchFormItems = reactive<Array<FormItem>>([
+  {
+    label: '日志时间',
+    vModel: 'logTime',
+    placeholders: ['开始时间', '结束时间'],
+    type: 'datetimerange',
+  },
+  {
+    label: '操作人',
+    vModel: 'operateUserId',
+    placeholder: '操作人',
   },
 ])
-const handleFormSubmit = (form: Role, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色修改成功',
-      })
-      done()
-    })
-  } else {
-    addRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色创建成功',
-      })
-      done()
-    })
-  }
-}
 /**
  * 工具栏
  */
 const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
   hiddenImportButton: true,
   hiddenExportButton: true,
+  hiddenAddButton: true,
   hiddenPrintButton: true,
 })
+const handleBatchDelete = (data: any, done: any) => {
+  const { checkDataList, ids } = data
+  ElMessageBox.confirm(`你真的删除选择的日志吗？`, '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    batchRemove(ids).then(() => {
+      ElMessage({
+        type: 'success',
+        message: '日志删除成功',
+      })
+      done()
+    })
+  })
+}
+const handleImport = (done: any) => {
+  done()
+}
+const handleExport = () => {
+  // window.open(`${window.location.origin}/日志报表.xlsx`)//TODO:导出bug
+}
+const handlePrint = () => {
+  window.print()
+}
 /**
  * 表格
  */
 const tableColumns = reactive<Array<Column>>([
   {
-    width: '50',
+    width: '100',
     type: 'selection',
+    align: 'center',
   },
   {
-    label: '角色编号',
-    prop: 'roleId',
+    label: '日志时间',
+    prop: 'logTime',
     width: '200',
   },
   {
-    label: '角色名称',
-    prop: 'roleName',
+    label: '操作接口',
+    prop: 'operateApi',
+    width: '300',
+  },
+  {
+    label: 'IP',
+    prop: 'ip',
+    width: '120',
+  },
+  {
+    label: '请求参数',
+    prop: 'requestParams',
+    width: '180',
+  },
+  {
+    label: '操作人',
+    prop: 'operateUserId',
+    width: '100',
+    //   format: (row: Log) => {
+    //   return row.enabled === 1 ? '禁用' : '启用'
+    // },
+  },
+  {
+    label: '错误信息',
+    prop: 'errorMessage',
+    width: '200',
   },
 ])
-const handleDelete = (item: Role, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.roleName}】的角色吗？`, '警告', {
+const handleDelete = (item: Log, done: any) => {
+  ElMessageBox.confirm(`你真的删除【${item.id}】的日志吗？`, '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    deleteRole(item.id).then(() => {
+    removeLog(item.id.toString()).then(() => {
       ElMessage({
         type: 'success',
-        message: '角色删除成功',
+        message: '日志删除成功',
       })
       done()
     })
@@ -116,15 +187,38 @@ const handleDelete = (item: Role, done: any) => {
 }
 const tableActionbar = reactive<Actionbar>({
   width: 150,
+  hiddenEditButton: true,
+})
+/**
+ * 分页
+ */
+const page = reactive<Page>({
+  current: 1,
+  size: 10,
+  sizes: [10, 20, 30, 40, 50],
+  total: 100,
 })
 /**
  * 加载数据
  */
-const load = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    dataList.length = 0
-    dataList.push(...roleList)
+const load = (params: any) => {
+  let obj = {}
+  const { logTime } = params
+  if (logTime) {
+    obj = { ...params, startTime: logTime[0], endTime: logTime[1] }
+  } else {
+    obj = { ...params }
+  }
+
+  getLogPageList(obj).then((res: any) => {
+    const { data: logList, page: pagination } = res
+    if (logList) {
+      dataList.length = 0
+      dataList.push(...logList)
+    }
+    if (pagination) {
+      page.total = pagination.total
+    }
   })
 }
 </script>
@@ -137,9 +231,17 @@ const load = () => {
     :table-columns="tableColumns"
     :table-actionbar="tableActionbar"
     :table-toolbar="tableToolbar"
+    :search-form-items="searchFormItems"
+    :search-form-model="searchForm"
     dialog-titles="dialogTitles"
+    :page="page"
+    :form-inline="true"
     @on-load="load"
     @on-form-submit="handleFormSubmit"
     @on-delete="handleDelete"
+    @on-batch-delete="handleBatchDelete"
+    @on-import="handleImport"
+    @on-export="handleExport"
+    @on-print="handlePrint"
   ></quick-crud>
 </template>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a062c19..5a3f887 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -5,7 +5,7 @@ import { selectTreeFormat, listToTree } from '@/utils/index'
 import { Column, Actionbar, Toolbar } from '@/types/table'
 import { Menu } from '@/types/menu'
 import { FormItem } from '@/types/form'
-import { Options } from '@/types/options.js'
+import { Options } from '@/types/options'
 import { getMenuList, addMenu, updateMenu, deleteMenu } from '@/api/menu'
 import QuickCrud from '@/components/QuickCrud/index.vue'
 import elementPlusIcons from '@/config/custormIcons.json'
-- 
Gitee


From f544ac221f87a62b3ec4fb6ebdc7ac7d484b2dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=9F=E8=B1=86=E5=93=A5?= <zhanglp15229380174@163.com>
Date: Sun, 7 Aug 2022 19:05:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/QuickCrud/index.vue |   6 +
 src/components/QuickForm/index.vue |   2 +-
 src/types/form.ts                  |   2 +-
 src/types/log.ts                   |   3 +-
 src/views/assignUser/index.vue     | 199 -------------
 src/views/dept/index.vue           | 249 -----------------
 src/views/dictionary/index.vue     | 222 ---------------
 src/views/dictionaryType/index.vue | 151 ----------
 src/views/log/error.vue            | 145 ----------
 src/views/log/operate.vue          | 145 ----------
 src/views/menu/index.vue           | 345 -----------------------
 src/views/role/index.vue           | 145 ----------
 src/views/rolePermission/index.vue | 186 -------------
 src/views/system/log/error.vue     | 216 +++++++++-----
 src/views/system/log/operate.vue   |  93 ++-----
 src/views/user/index.vue           | 433 -----------------------------
 16 files changed, 187 insertions(+), 2355 deletions(-)
 delete mode 100644 src/views/assignUser/index.vue
 delete mode 100644 src/views/dept/index.vue
 delete mode 100644 src/views/dictionary/index.vue
 delete mode 100644 src/views/dictionaryType/index.vue
 delete mode 100644 src/views/log/error.vue
 delete mode 100644 src/views/log/operate.vue
 delete mode 100644 src/views/menu/index.vue
 delete mode 100644 src/views/role/index.vue
 delete mode 100644 src/views/rolePermission/index.vue
 delete mode 100644 src/views/user/index.vue

diff --git a/src/components/QuickCrud/index.vue b/src/components/QuickCrud/index.vue
index 35ac071..7b93372 100644
--- a/src/components/QuickCrud/index.vue
+++ b/src/components/QuickCrud/index.vue
@@ -257,6 +257,12 @@ const handleDetail = (row: any) => {
   Object.keys(formModel.value).forEach((key) => {
     formModel.value[key] = row[key]
   })
+  emits('onDetail', formModel.value, (data: any) => {
+    Object.keys(formModel.value).forEach((key) => {
+      formModel.value[key] = data[key]
+    })
+    dialogFormVisible.value = true
+  })
   dialogFormVisible.value = true
 }
 /**
diff --git a/src/components/QuickForm/index.vue b/src/components/QuickForm/index.vue
index cda9f5c..fb35bd6 100644
--- a/src/components/QuickForm/index.vue
+++ b/src/components/QuickForm/index.vue
@@ -199,7 +199,7 @@ defineExpose({ handleSubmit })
           <el-date-picker
             v-model="model[item.vModel]"
             type="datetimerange"
-            range-separator="To"
+            range-separator="-"
             value-format="X"
             format="YYYY-MM-DD HH:mm:ss"
             :start-placeholder="item.placeholders[0]"
diff --git a/src/types/form.ts b/src/types/form.ts
index 853cfa4..7537b36 100644
--- a/src/types/form.ts
+++ b/src/types/form.ts
@@ -32,7 +32,7 @@ export interface FormItem {
   width?: string
   maxLength?: string
   placeholders?: Array<string>
-  format?: () => any
+  format?: (value: string) => any
   change?: (value: string) => void
   select?: (value: string) => void
   success?: () => void
diff --git a/src/types/log.ts b/src/types/log.ts
index ad471ce..0639c8e 100644
--- a/src/types/log.ts
+++ b/src/types/log.ts
@@ -1,5 +1,5 @@
 export interface Log {
-  id: string | number
+  id: number
   logTime: string
   operateApi: string
   requestParams?: string
@@ -11,6 +11,5 @@ export interface Log {
 export interface SearchLog {
   startTime?: string
   endTime?: string
-  operateUserId?: string
   logTime: string
 }
diff --git a/src/views/assignUser/index.vue b/src/views/assignUser/index.vue
deleted file mode 100644
index ad3d944..0000000
--- a/src/views/assignUser/index.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<script lang="ts" setup>
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
-import { reactive, ref } from 'vue'
-import { treeFormat } from '@/utils'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Toolbar } from '@/types/table'
-import { User } from '@/types/user'
-import { Tree, LeftTree } from '@/types/tree'
-import { getRoleList, getUserPermission, assignUser } from '@/api/role'
-import { getUserList } from '@/api/user'
-
-/**
- * 常规属性
- */
-const checkDataList = ref<Array<User>>([])
-const currentTreeData = ref<Tree>({
-  id: '',
-  label: '',
-  children: [],
-})
-/**
- * 工具栏
- */
-const handleAssign = () => {
-  const { id, label } = currentTreeData.value
-  if (!id) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择一个角色',
-    })
-    return
-  }
-  ElMessageBox.confirm(`你真的要给【${label}】角色分配用户吗？`, {
-    confirmButtonText: 'OK',
-    cancelButtonText: 'Cancel',
-    type: 'warning',
-  })
-    .then(() => {
-      const userIds = checkDataList.value
-        .map((x) => {
-          return x.id
-        })
-        .join(',')
-      assignUser({
-        roleId: id,
-        userIds,
-      }).then(() => {
-        ElMessage({
-          type: 'success',
-          message: '分配用户成功',
-        })
-      })
-    })
-    .catch(() => {
-      ElMessage({
-        type: 'info',
-        message: '您已取消分配用户',
-      })
-    })
-}
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-  hiddenAddButton: true,
-  hiddenRefreshButton: true,
-  btns: [
-    {
-      name: '分配用户',
-      position: 'left',
-      type: 'primary',
-      click(data: any, done: any) {
-        handleAssign(data, done)
-      },
-    },
-  ],
-})
-/**
- * 表格
- */
-const dataList = reactive<Array<User>>([])
-const userList = reactive<Array<User>>([])
-const handleSelectionChange = (selectDataList: Array<User>) => {
-  checkDataList.value = selectDataList
-}
-const load = () => {
-  getUserList().then((res) => {
-    const { data: userDataList } = res
-    userList.length = 0
-    userList.push(...userDataList)
-  })
-}
-const tabRef = ref<InstanceType<typeof ElTable>>()
-const hanleTableRef = (instance: any) => {
-  tabRef.value = instance.value
-}
-const toggleRowSelection = (rows: Array<User>) => {
-  rows.forEach((row) => {
-    if (tabRef.value) {
-      tabRef.value.toggleRowSelection(row, true)
-    }
-  })
-}
-const clearSelection = () => {
-  if (tabRef.value) {
-    tabRef.value.clearSelection()
-  }
-}
-const getRows = (data: string[]) => {
-  const arr: User[] = []
-  data.forEach((element: string) => {
-    const user = userList.find((x) => x.id === element)
-    if (user) {
-      arr.push(user)
-    }
-  })
-  return arr
-}
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '用户编号',
-    prop: 'userId',
-    width: '200',
-  },
-  {
-    label: '用户名',
-    prop: 'userName',
-  },
-  {
-    label: '姓名',
-    prop: 'fullName',
-  },
-  {
-    label: '手机号',
-    prop: 'phone',
-  },
-  {
-    label: '邮箱',
-    prop: 'email',
-    width: '200',
-  },
-])
-/**
- * 左树
- */
-const treeDataList = reactive<Array<Tree>>([])
-const leftTree = reactive<LeftTree>({
-  treeData: [],
-  treeSpan: 6,
-})
-const treeLoad = (done: any) => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    const data = treeFormat(roleList, {
-      label: 'roleName',
-      children: 'children',
-    })
-    treeDataList.length = 0
-    treeDataList.push(...data)
-    leftTree.treeData.length = 0
-    leftTree.treeData.push(...treeDataList)
-    currentTreeData.value.id = treeDataList[0].id
-    done(currentTreeData.value.id)
-  })
-}
-const handleTreeClick = (data: Tree, done: any) => {
-  clearSelection()
-  currentTreeData.value = data
-  const { id } = currentTreeData.value
-  const roleId = id
-  getUserPermission(roleId).then((res) => {
-    const { data: userPermissionList } = res
-    dataList.length = 0
-    dataList.push(...userList)
-    const rows = getRows(userPermissionList)
-    toggleRowSelection(rows)
-  })
-  done()
-}
-</script>
-<template>
-  <quick-crud
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    :left-tree="leftTree"
-    @on-selection-change="handleSelectionChange"
-    @on-load="load"
-    @on-tree-load="treeLoad"
-    @on-tree-click="handleTreeClick"
-    @on-table-ref="hanleTableRef"
-  ></quick-crud>
-</template>
diff --git a/src/views/dept/index.vue b/src/views/dept/index.vue
deleted file mode 100644
index 65b93f1..0000000
--- a/src/views/dept/index.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<script lang="ts" setup>
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { listToTableTree, selectTreeFormat } from '@/utils'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Dept } from '@/types/dept'
-import { FormItem } from '@/types/form'
-import { Options } from '@/types/options'
-import { Tree, LeftTree } from '@/types/tree'
-import { getDeptList, addDept, updateDept, deleteDept } from '@/api/dept'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-
-/**
- * 常规属性
- */
-const deptDdataListTemp = reactive<Array<Dept>>([])
-const dicTypeList = reactive<Array<Options>>([])
-const dataList = reactive<Array<Dept>>([])
-const currentTreeData = ref<Tree>({
-  id: '',
-  label: '',
-  children: [],
-})
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '创建部门',
-  edit: '修改部门',
-  detail: '部门详情',
-})
-const formModel = reactive<Dept>({
-  id: '',
-  deptId: '',
-  name: '',
-  pId: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '部门编号',
-    labelWidth: '80px',
-    vModel: 'deptId',
-    placeholder: '部门编号',
-    editReadonly: true,
-    prop: 'deptId',
-    rules: [
-      {
-        required: true,
-        message: '部门编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '部门名称',
-    labelWidth: '80px',
-    vModel: 'name',
-    placeholder: '部门名称',
-    prop: 'name',
-    rules: [
-      {
-        required: true,
-        message: '部门名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '父级部门',
-    labelWidth: '80px',
-    vModel: 'pId',
-    placeholder: '父级部门',
-    type: 'tree',
-    addDisabled: true,
-    editDisabled: true,
-    detailDisabled: true,
-    options: dicTypeList,
-  },
-])
-const handleFormSubmit = (form: Dept, done: any) => {
-  if (form.id) {
-    updateDept(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '部门修改成功',
-      })
-      done()
-    })
-  } else {
-    addDept(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '部门创建成功',
-      })
-      done()
-    })
-  }
-}
-const handleEdit = (form: any, done: any) => {
-  const model = form
-  model.pId = model.pId.toString()
-  done(model)
-}
-/**
- * 工具栏
- */
-
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '部门编号',
-    prop: 'deptId',
-    width: '200',
-  },
-  {
-    label: '部门名称',
-    prop: 'name',
-  },
-])
-const handleDelete = (item: Dept, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.name}】的部门吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteDept(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '部门删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 300,
-  hiddenDetailButton: true,
-})
-const deptTreeFormat = (data: Array<Dept>, pId = '0') => {
-  const arr: Array<Tree> = []
-  const obj: Tree = {
-    id: '',
-    label: '',
-    children: [],
-  }
-  const parentData = data.find((x: any) => x.pId === Number(pId))
-  if (parentData) {
-    obj.id = parentData.id.toString()
-    obj.label = parentData.name
-    const parentId = parentData.id
-    const companyData = data.filter((x: any) => x.pId === Number(parentId))
-    companyData.forEach((item: Dept) => {
-      if (companyData) {
-        const companyObj: Tree = {
-          id: item.id.toString(),
-          label: item.name,
-          children: [],
-        }
-        const companyPid = item.id
-        const deptData = data.filter((x: any) => x.pId === Number(companyPid))
-        deptData.forEach((deptItem) => {
-          companyObj.children.push({
-            id: deptItem.id.toString(),
-            label: deptItem.name,
-            children: [],
-          })
-        })
-        obj.children.push(companyObj)
-      }
-    })
-  }
-  arr.push(obj)
-  return arr
-}
-/**
- * 加载数据
- */
-const load = () => {
-  const { id } = currentTreeData.value
-  const pId = Number(id)
-  const deptTree = listToTableTree(deptDdataListTemp, pId)
-  dataList.length = 0
-  dataList.push(...deptTree)
-}
-
-/**
- * 左树
- */
-
-const leftTree = reactive<LeftTree>({
-  treeData: [],
-  treeSpan: 6,
-})
-const treeLoad = (done: any) => {
-  getDeptList().then((res: any) => {
-    const { data: deptList } = res
-    deptDdataListTemp.length = 0
-    deptDdataListTemp.push(...deptList)
-    const data = deptTreeFormat(deptList)
-    leftTree.treeData.length = 0
-    leftTree.treeData.push(...data)
-    const selectTreeData = selectTreeFormat(data, {
-      value: 'id',
-    })
-    dicTypeList.length = 0
-    dicTypeList.push(...selectTreeData)
-    if (!currentTreeData.value.id) {
-      currentTreeData.value.id = data[0].id
-    }
-    done(currentTreeData.value.id)
-  })
-}
-const handleTreeClick = (data: Tree, done: any) => {
-  currentTreeData.value = data
-  done()
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    :left-tree="leftTree"
-    :left-tree-refresh="true"
-    @on-edit="handleEdit"
-    @on-load="load"
-    @on-tree-load="treeLoad"
-    @on-tree-click="handleTreeClick"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/dictionary/index.vue b/src/views/dictionary/index.vue
deleted file mode 100644
index 7b45410..0000000
--- a/src/views/dictionary/index.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-<script lang="ts" setup>
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { dicFormat, treeFormat } from '@/utils'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Dictionary } from '@/types/dictionary'
-import { FormItem } from '@/types/form'
-import { Options } from '@/types/options'
-import { Tree } from '@/types/tree'
-import { getDictionaryTypeList } from '@/api/dictionaryType'
-import {
-  getDictionaryList,
-  addDictionary,
-  updateDictionary,
-  deleteDictionary,
-} from '@/api/dictionary'
-import { LeftTree } from '../../types/tree'
-
-/**
- * 常规属性
- */
-const dicTypeList = reactive<Array<Options>>([])
-const treeDataList = reactive<Array<Tree>>([])
-const dataList = reactive<Array<Dictionary>>([])
-const currentTreeData = ref<Tree>({
-  id: '',
-  label: '',
-  children: [],
-})
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '创建字典',
-  edit: '修改字典',
-  detail: '字典详情',
-})
-const formModel = reactive<Dictionary>({
-  id: '',
-  dicTypeId: '',
-  dicId: '',
-  name: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '字典编号',
-    labelWidth: '80px',
-    vModel: 'dicId',
-    placeholder: '字典编号',
-    editReadonly: true,
-    prop: 'dicId',
-    rules: [
-      {
-        required: true,
-        message: '字典编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '字典名称',
-    labelWidth: '80px',
-    vModel: 'name',
-    placeholder: '字典名称',
-    prop: 'name',
-    rules: [
-      {
-        required: true,
-        message: '字典名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '字典类型',
-    labelWidth: '80px',
-    vModel: 'dicTypeId',
-    placeholder: '字典类型',
-    type: 'select',
-    addDisabled: true,
-    editDisabled: true,
-    detailDisabled: true,
-    options: dicTypeList,
-    change: (val: string) => {
-      console.log('change', val)
-    },
-  },
-])
-const handleFormSubmit = (form: Dictionary, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateDictionary(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '字典修改成功',
-      })
-      done()
-    })
-  } else {
-    addDictionary(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '字典创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '字典编号',
-    prop: 'dicId',
-    width: '200',
-  },
-  {
-    label: '字典名称',
-    prop: 'name',
-  },
-])
-const handleDelete = (item: Dictionary, done: any) => {
-  ElMessageBox.confirm(
-    `你真的删除【${item.dictionaryName}】的字典吗？`,
-    '警告',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  ).then(() => {
-    deleteDictionary(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '字典删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 300,
-  hiddenDetailButton: true,
-})
-/**
- * 加载数据
- */
-const load = (parmas: object) => {
-  const { id } = currentTreeData.value
-  getDictionaryList(id).then((res: any) => {
-    const { data: dictionaryList } = res
-    dataList.length = 0
-    dataList.push(...dictionaryList)
-  })
-}
-/**
- * 左树
- */
-const leftTree = reactive<LeftTree>({
-  treeData: [],
-})
-const treeLoad = (done: any) => {
-  getDictionaryTypeList().then((res: any) => {
-    const { data: dictionaryTypeList } = res
-    const data = treeFormat(dictionaryTypeList, {
-      id: 'dicTypeId',
-      label: 'name',
-      children: 'children',
-    })
-    treeDataList.length = 0
-    treeDataList.push(...data)
-    leftTree.treeData.length = 0
-    leftTree.treeData.push(...treeDataList)
-    const data1 = dicFormat(dictionaryTypeList, {
-      value: 'dicTypeId',
-      label: 'name',
-    })
-    dicTypeList.length = 0
-    dicTypeList.push(...data1)
-
-    currentTreeData.value.id = treeDataList[0].id
-    done(currentTreeData.value.id)
-  })
-}
-const handleTreeClick = (data: Tree, done: any) => {
-  currentTreeData.value = data
-  done()
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    :left-tree="leftTree"
-    @on-load="load"
-    @on-tree-load="treeLoad"
-    @on-tree-click="handleTreeClick"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/dictionaryType/index.vue b/src/views/dictionaryType/index.vue
deleted file mode 100644
index cc4e248..0000000
--- a/src/views/dictionaryType/index.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { DictionaryType } from '@/types/dictionaryType'
-import { FormItem } from '@/types/form'
-import {
-  getDictionaryTypeList,
-  addDictionaryType,
-  updateDictionaryType,
-  deleteDictionaryType,
-} from '@/api/dictionaryType'
-
-const dataList = reactive<Array<DictionaryType>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '创建字典分类',
-  edit: '修改字典分类',
-  detail: '字典分类详情',
-})
-const formModel = reactive<DictionaryType>({
-  id: '',
-  dicTypeId: '',
-  name: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '分类编号',
-    labelWidth: '80px',
-    vModel: 'dicTypeId',
-    placeholder: '分类编号',
-    editReadonly: true,
-    prop: 'dicTypeId',
-    rules: [
-      {
-        required: true,
-        message: '分类编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '分类名称',
-    labelWidth: '80px',
-    vModel: 'name',
-    placeholder: '分类名称',
-    prop: 'name',
-    rules: [
-      {
-        required: true,
-        message: '分类名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-])
-const handleFormSubmit = (form: DictionaryType, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateDictionaryType(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户修改成功',
-      })
-      done()
-    })
-  } else {
-    addDictionaryType(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '分类编号',
-    prop: 'dicTypeId',
-    width: '200',
-  },
-  {
-    label: '字典分类',
-    prop: 'name',
-  },
-])
-const handleDelete = (item: DictionaryType, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.name}】的字典分类吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteDictionaryType(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '字典分类删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 100,
-  hiddenDetailButton: true,
-})
-/**
- * 加载数据
- */
-const load = (parmas: object) => {
-  getDictionaryTypeList().then((res) => {
-    const { data: dictionaryTypeList } = res
-    dataList.length = 0
-    dataList.push(...dictionaryTypeList)
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/log/error.vue b/src/views/log/error.vue
deleted file mode 100644
index a269961..0000000
--- a/src/views/log/error.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Role } from '@/types/role'
-import { FormItem } from '@/types/form'
-import { getRoleList, addRole, updateRole, deleteRole } from '@/api/role'
-
-const dataList = reactive<Array<Role>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '新增角色',
-  edit: '编辑角色',
-  detail: '角色详情',
-})
-const formModel = reactive<Role>({
-  id: '',
-  roleId: '',
-  roleName: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '角色编号',
-    labelWidth: '80px',
-    vModel: 'roleId',
-    placeholder: '角色编号',
-    editReadonly: true,
-    prop: 'roleId',
-    rules: [
-      {
-        required: true,
-        message: '角色编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '角色名称',
-    labelWidth: '80px',
-    vModel: 'roleName',
-    placeholder: '角色名称',
-    prop: 'roleName',
-    rules: [
-      {
-        required: true,
-        message: '角色名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-])
-const handleFormSubmit = (form: Role, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色修改成功',
-      })
-      done()
-    })
-  } else {
-    addRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '角色编号',
-    prop: 'roleId',
-    width: '200',
-  },
-  {
-    label: '角色名称',
-    prop: 'roleName',
-  },
-])
-const handleDelete = (item: Role, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.roleName}】的角色吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteRole(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 150,
-})
-/**
- * 加载数据
- */
-const load = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    dataList.length = 0
-    dataList.push(...roleList)
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/log/operate.vue b/src/views/log/operate.vue
deleted file mode 100644
index a269961..0000000
--- a/src/views/log/operate.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Role } from '@/types/role'
-import { FormItem } from '@/types/form'
-import { getRoleList, addRole, updateRole, deleteRole } from '@/api/role'
-
-const dataList = reactive<Array<Role>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '新增角色',
-  edit: '编辑角色',
-  detail: '角色详情',
-})
-const formModel = reactive<Role>({
-  id: '',
-  roleId: '',
-  roleName: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '角色编号',
-    labelWidth: '80px',
-    vModel: 'roleId',
-    placeholder: '角色编号',
-    editReadonly: true,
-    prop: 'roleId',
-    rules: [
-      {
-        required: true,
-        message: '角色编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '角色名称',
-    labelWidth: '80px',
-    vModel: 'roleName',
-    placeholder: '角色名称',
-    prop: 'roleName',
-    rules: [
-      {
-        required: true,
-        message: '角色名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-])
-const handleFormSubmit = (form: Role, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色修改成功',
-      })
-      done()
-    })
-  } else {
-    addRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '角色编号',
-    prop: 'roleId',
-    width: '200',
-  },
-  {
-    label: '角色名称',
-    prop: 'roleName',
-  },
-])
-const handleDelete = (item: Role, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.roleName}】的角色吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteRole(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 150,
-})
-/**
- * 加载数据
- */
-const load = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    dataList.length = 0
-    dataList.push(...roleList)
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/menu/index.vue b/src/views/menu/index.vue
deleted file mode 100644
index 02266c1..0000000
--- a/src/views/menu/index.vue
+++ /dev/null
@@ -1,345 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { selectTreeFormat, listToTree } from '@/utils/index'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Menu } from '@/types/menu'
-import { FormItem } from '@/types/form'
-import { Options } from '@/types/options'
-import { getMenuList, addMenu, updateMenu, deleteMenu } from '@/api/menu'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-
-const dataList = reactive<Array<Menu>>([])
-const parentTreeList = reactive<Array<Options>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '创建菜单',
-  edit: '修改菜单',
-  detail: '菜单详情',
-})
-const formModel = reactive<Menu>({
-  id: 0,
-  menuId: '',
-  menuName: '',
-  path: '',
-  viewPath: '',
-  menuType: 0,
-  icon: '',
-  sort: 0,
-  pid: 0,
-  link: 0,
-  linkUrl: '',
-  enabled: 1,
-  status: 1,
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '菜单编号',
-    labelWidth: '80px',
-    vModel: 'menuId',
-    placeholder: '菜单编号',
-    editReadonly: true,
-    prop: 'menuId',
-    rules: [
-      {
-        required: true,
-        message: '菜单编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '菜单名称',
-    labelWidth: '80px',
-    vModel: 'menuName',
-    placeholder: '菜单名称',
-    prop: 'menuName',
-    rules: [
-      {
-        required: true,
-        message: '菜单名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '路由',
-    labelWidth: '80px',
-    vModel: 'path',
-    placeholder: '路由',
-  },
-  {
-    label: '视图',
-    labelWidth: '80px',
-    vModel: 'viewPath',
-    placeholder: '视图',
-  },
-  {
-    label: '菜单类型',
-    labelWidth: '80px',
-    vModel: 'menuType',
-    placeholder: '菜单类型',
-    prop: 'menuType',
-    type: 'select',
-    options: [
-      {
-        label: '目录',
-        value: 0,
-      },
-      {
-        label: '菜单',
-        value: 1,
-      },
-      {
-        label: '按钮',
-        value: 2,
-      },
-    ],
-    rules: [
-      {
-        required: true,
-        message: '菜单类型不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '菜单图标',
-    labelWidth: '80px',
-    vModel: 'icon',
-    placeholder: '菜单图标',
-    type: 'test',
-    options: parentTreeList,
-  },
-  // {
-  //   label: '菜单图标',
-  //   labelWidth: '80px',
-  //   vModel: 'icon',
-  //   placeholder: '菜单图标',
-  //   prop: 'icon',
-  //   type: 'icon',
-  // },
-  {
-    label: '排序',
-    labelWidth: '80px',
-    vModel: 'sort',
-    placeholder: '排序',
-    prop: 'sort',
-  },
-  // {
-  //   label: '父级菜单',
-  //   labelWidth: '80px',
-  //   vModel: 'pid',
-  //   placeholder: '父级菜单',
-  //   prop: 'pid',
-  //   type: 'select',
-  //   options: [],
-  // },
-  {
-    label: '父级菜单',
-    labelWidth: '80px',
-    vModel: 'pid',
-    placeholder: '父级菜单',
-    type: 'tree',
-    options: parentTreeList,
-  },
-  {
-    label: '外链',
-    labelWidth: '80px',
-    vModel: 'link',
-    placeholder: '外链',
-    prop: 'link',
-    type: 'switch',
-  },
-  {
-    label: '链接地址',
-    labelWidth: '80px',
-    vModel: 'linkUrl',
-    placeholder: '链接地址',
-  },
-
-  {
-    label: '是否启用',
-    labelWidth: '80px',
-    vModel: 'enabled',
-    placeholder: '是否启用',
-    prop: 'enabled',
-    type: 'switch',
-  },
-  {
-    label: '是否显示',
-    labelWidth: '80px',
-    vModel: 'status',
-    placeholder: '是否显示',
-    prop: 'status',
-    type: 'switch',
-  },
-])
-const handleFormSubmit = (form: Menu, done: any) => {
-  if (form.id) {
-    updateMenu(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '菜单修改成功',
-      })
-      done()
-    })
-  } else {
-    addMenu(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '菜单创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '菜单编号',
-    prop: 'menuId',
-    width: '200',
-  },
-  {
-    label: '菜单名称',
-    prop: 'menuName',
-    width: '200',
-  },
-  {
-    label: '路由',
-    prop: 'path',
-    width: '200',
-  },
-  {
-    label: '视图',
-    prop: 'viewPath',
-    width: '200',
-  },
-  {
-    label: '菜单类型',
-    prop: 'menuType',
-    width: '200',
-    format: (row: Menu) => {
-      if (row.menuType === 0) {
-        return '目录'
-      }
-      if (row.menuType === 1) {
-        return '菜单'
-      }
-      if (row.menuType === 2) {
-        return '按钮'
-      }
-      return ''
-    },
-  },
-  {
-    label: '菜单图标',
-    prop: 'icon',
-    width: '200',
-  },
-  {
-    label: '菜单排序',
-    prop: 'sort',
-    width: '200',
-  },
-  {
-    label: '是否外链',
-    prop: 'link',
-    width: '200',
-    format: (row: Menu) => {
-      return row.link === 1 ? '外链' : '非外链'
-    },
-  },
-  {
-    label: '是否启用',
-    prop: 'enabled',
-    width: '200',
-    format: (row: Menu) => {
-      return row.enabled === 1 ? '启用' : '禁用'
-    },
-  },
-  {
-    label: '是否显示',
-    prop: 'status',
-    width: '200',
-    format: (row: Menu) => {
-      return row.status === 1 ? '显示' : '不显示'
-    },
-  },
-])
-const handleDelete = (item: Menu, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.menuName}】的菜单吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteMenu(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '菜单删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 150,
-})
-/**
- * 加载数据
- */
-const load = () => {
-  getMenuList().then((res) => {
-    const { data: menuList } = res
-    const menuTree = listToTree(menuList, 0, {
-      pId: 'pid',
-    })
-    dataList.length = 0
-    dataList.push(...menuTree)
-
-    const parentMenuList = menuList.filter((x) => x.menuType !== 2)
-    const parentTree = listToTree(parentMenuList, 0, {
-      pId: 'pid',
-    })
-    const selectTreeData = selectTreeFormat(parentTree, {
-      value: 'id',
-      label: 'menuName',
-    })
-    parentTreeList.length = 0
-    parentTreeList.push(...selectTreeData)
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/role/index.vue b/src/views/role/index.vue
deleted file mode 100644
index a269961..0000000
--- a/src/views/role/index.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Role } from '@/types/role'
-import { FormItem } from '@/types/form'
-import { getRoleList, addRole, updateRole, deleteRole } from '@/api/role'
-
-const dataList = reactive<Array<Role>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '新增角色',
-  edit: '编辑角色',
-  detail: '角色详情',
-})
-const formModel = reactive<Role>({
-  id: '',
-  roleId: '',
-  roleName: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '角色编号',
-    labelWidth: '80px',
-    vModel: 'roleId',
-    placeholder: '角色编号',
-    editReadonly: true,
-    prop: 'roleId',
-    rules: [
-      {
-        required: true,
-        message: '角色编号不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '角色名称',
-    labelWidth: '80px',
-    vModel: 'roleName',
-    placeholder: '角色名称',
-    prop: 'roleName',
-    rules: [
-      {
-        required: true,
-        message: '角色名称不能为空',
-        trigger: 'blur',
-      },
-    ],
-  },
-])
-const handleFormSubmit = (form: Role, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色修改成功',
-      })
-      done()
-    })
-  } else {
-    addRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
-  hiddenImportButton: true,
-  hiddenExportButton: true,
-  hiddenPrintButton: true,
-})
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '50',
-    type: 'selection',
-  },
-  {
-    label: '角色编号',
-    prop: 'roleId',
-    width: '200',
-  },
-  {
-    label: '角色名称',
-    prop: 'roleName',
-  },
-])
-const handleDelete = (item: Role, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.roleName}】的角色吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteRole(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色删除成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 150,
-})
-/**
- * 加载数据
- */
-const load = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    dataList.length = 0
-    dataList.push(...roleList)
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    dialog-titles="dialogTitles"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-  ></quick-crud>
-</template>
diff --git a/src/views/rolePermission/index.vue b/src/views/rolePermission/index.vue
deleted file mode 100644
index e23fd7a..0000000
--- a/src/views/rolePermission/index.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<script lang="ts" setup>
-import { ElTree, ElMessage, ElMessageBox } from 'element-plus'
-import { nextTick, onMounted, reactive, ref } from 'vue'
-import { listToTree, treeFormat } from '@/utils'
-import { MenuTree } from '@/types/menu'
-import { Toolbar } from '@/types/table'
-import { Tree } from '@/types/tree'
-import { getRoleList, getMenuPermission, assignPermission } from '@/api/role'
-import { getMenuList } from '@/api/menu'
-import QuickToolbar from '@/components/QuickToolbar/index.vue'
-
-/**
- * 菜单tree
- */
-const menuTreeRef = ref<InstanceType<typeof ElTree>>()
-const menuProps = reactive({
-  id: 'menuId',
-  label: 'menuName',
-  children: 'children',
-})
-const menuTreeData = reactive<Array<MenuTree>>([])
-const menuTreeList = reactive<Array<MenuTree>>([])
-const menuLoad = () => {
-  getMenuList().then((res) => {
-    const { data: menuList } = res
-    const menuTree = listToTree(menuList, 0, {
-      pId: 'pid',
-    })
-    menuTreeList.length = 0
-    menuTreeList.push(...menuTree)
-  })
-}
-/**
- * 角色tree
- */
-const roleTreeRef = ref<InstanceType<typeof ElTree>>()
-const roleProps = reactive({
-  id: 'id',
-  label: 'label',
-  children: 'children',
-})
-const roleTreeData = reactive<Array<Tree>>([])
-const currentTreeData = ref<Tree>({
-  id: '',
-  label: '',
-  children: [],
-})
-const handleNodeClick = (data: any) => {
-  currentTreeData.value = data
-  const { id } = currentTreeData.value
-  getMenuPermission(id).then((res) => {
-    const { data: menuList } = res
-    const value = menuList.map((x) => x.id)
-    menuTreeData.length = 0
-    menuTreeData.push(...menuTreeList)
-    nextTick(() => {
-      if (menuTreeRef.value) {
-        menuTreeRef.value.setCheckedKeys(value, false)
-      }
-    })
-  })
-}
-const roleTreeLoad = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    const roleTree = treeFormat(roleList, {
-      id: 'id',
-      label: 'roleName',
-      children: 'children',
-    })
-    roleTreeData.length = 0
-    roleTreeData.push(...roleTree)
-    nextTick(() => {
-      const key = roleTree[0].id
-      roleTreeRef.value?.setCurrentKey(key)
-      const node = roleTreeRef.value?.getCurrentNode() as Tree
-      handleNodeClick(node)
-    })
-  })
-}
-/**
- * 工具栏
- */
-const handleGrant = () => {
-  const { id, label } = currentTreeData.value
-  if (!id) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择一个角色',
-    })
-    return
-  }
-  ElMessageBox.confirm(`你真的要给【${label}】角色分配权限吗？`, {
-    confirmButtonText: 'OK',
-    cancelButtonText: 'Cancel',
-    type: 'warning',
-  })
-    .then(() => {
-      if (!menuTreeRef.value) {
-        return
-      }
-      const menuIdArr = menuTreeRef.value.getCheckedKeys(false)
-      const menuIds = menuIdArr.join(',')
-      assignPermission({
-        roleId: id,
-        menuIds,
-      }).then(() => {
-        ElMessage({
-          type: 'success',
-          message: '分配权限成功',
-        })
-      })
-    })
-    .catch(() => {
-      ElMessage({
-        type: 'info',
-        message: '您已取消分配权限',
-      })
-    })
-}
-const tableToolbar = reactive<Toolbar>({
-  btns: [
-    {
-      name: '分配权限',
-      position: 'left',
-      type: 'primary',
-      size: 'small',
-      click() {
-        handleGrant()
-      },
-    },
-  ],
-})
-onMounted(() => {
-  roleTreeLoad()
-  menuLoad()
-})
-</script>
-
-<template>
-  <div clas="content">
-    <el-row :gutter="20">
-      <el-col :span="4">
-        <el-card shadow="never">
-          <el-tree
-            ref="roleTreeRef"
-            :data="roleTreeData"
-            :props="roleProps"
-            node-key="id"
-            :highlight-current="true"
-            @node-click="handleNodeClick"
-          />
-        </el-card>
-      </el-col>
-      <el-col :span="20">
-        <el-card shadow="never">
-          <quick-toolbar
-            :table-toolbar="tableToolbar"
-            :hidden-add-button="true"
-            :hidden-batch-delete-button="true"
-            :hidden-import-button="true"
-            :hidden-export-button="true"
-            :hidden-print-button="true"
-            :hidden-refresh-button="true"
-          ></quick-toolbar>
-          <!-- :default-checked-keys="" -->
-          <el-tree
-            ref="menuTreeRef"
-            :data="menuTreeData"
-            :props="menuProps"
-            show-checkbox
-            node-key="id"
-            highlight-current
-          />
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<style lang="scss" scoped>
-.content {
-  .el-card {
-    height: 575px;
-  }
-}
-</style>
diff --git a/src/views/system/log/error.vue b/src/views/system/log/error.vue
index a269961..7a39b1c 100644
--- a/src/views/system/log/error.vue
+++ b/src/views/system/log/error.vue
@@ -3,84 +3,109 @@ import { reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import QuickCrud from '@/components/QuickCrud/index.vue'
 import { Column, Actionbar, Toolbar } from '@/types/table'
-import { Role } from '@/types/role'
+import { Log, SearchLog } from '@/types/log'
 import { FormItem } from '@/types/form'
-import { getRoleList, addRole, updateRole, deleteRole } from '@/api/role'
+import { Page } from '@/types/page'
+import { getLogPageList, removeLog, batchRemove } from '@/api/log'
 
-const dataList = reactive<Array<Role>>([])
+const dataList = reactive<Array<Log>>([])
 /**
  * 表单
  */
 const dialogTitle = reactive({
-  add: '新增角色',
-  edit: '编辑角色',
-  detail: '角色详情',
+  detail: '日志详情',
 })
-const formModel = reactive<Role>({
-  id: '',
-  roleId: '',
-  roleName: '',
+const formModel = reactive<Log>({
+  id: 0,
+  logTime: '',
+  operateApi: '',
+  requestParams: '',
+  errorMessage: '',
+  exceptionMessage: '',
+  ip: '',
+  logType: 0,
 })
 const formItems = reactive<Array<FormItem>>([
   {
-    label: '角色编号',
+    label: '编号',
     labelWidth: '80px',
-    vModel: 'roleId',
-    placeholder: '角色编号',
-    editReadonly: true,
-    prop: 'roleId',
-    rules: [
-      {
-        required: true,
-        message: '角色编号不能为空',
-        trigger: 'blur',
-      },
-    ],
+    vModel: 'id',
   },
   {
-    label: '角色名称',
+    label: '日志时间',
     labelWidth: '80px',
-    vModel: 'roleName',
-    placeholder: '角色名称',
-    prop: 'roleName',
-    rules: [
-      {
-        required: true,
-        message: '角色名称不能为空',
-        trigger: 'blur',
-      },
-    ],
+    vModel: 'logTime',
+  },
+  {
+    label: '操作接口',
+    labelWidth: '80px',
+    vModel: 'operateApi',
+  },
+  {
+    label: 'IP',
+    labelWidth: '80px',
+    vModel: 'ip',
+  },
+  {
+    label: '错误信息',
+    labelWidth: '80px',
+    vModel: 'errorMessage',
+  },
+  {
+    label: '请求参数',
+    labelWidth: '80px',
+    vModel: 'requestParams',
+    type: 'textarea',
+  },
+  {
+    label: '异常信息',
+    labelWidth: '80px',
+    vModel: 'exceptionMessage',
+    type: 'textarea',
+  },
+])
+
+/**
+ * 搜索
+ */
+const searchForm = reactive<SearchLog>({
+  startTime: '',
+  endTime: '',
+  logTime: '',
+})
+const searchFormItems = reactive<Array<FormItem>>([
+  {
+    label: '日志时间',
+    vModel: 'logTime',
+    placeholders: ['开始时间', '结束时间'],
+    type: 'datetimerange',
   },
 ])
-const handleFormSubmit = (form: Role, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色修改成功',
-      })
-      done()
-    })
-  } else {
-    addRole(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '角色创建成功',
-      })
-      done()
-    })
-  }
-}
 /**
  * 工具栏
  */
 const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: true,
   hiddenImportButton: true,
   hiddenExportButton: true,
+  hiddenAddButton: true,
   hiddenPrintButton: true,
 })
+const handleBatchDelete = (data: any, done: any) => {
+  const { ids } = data
+  ElMessageBox.confirm(`你真的删除选择的日志吗？`, '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    batchRemove(ids).then(() => {
+      ElMessage({
+        type: 'success',
+        message: '日志删除成功',
+      })
+      done()
+    })
+  })
+}
 /**
  * 表格
  */
@@ -88,43 +113,90 @@ const tableColumns = reactive<Array<Column>>([
   {
     width: '50',
     type: 'selection',
+    align: 'center',
   },
   {
-    label: '角色编号',
-    prop: 'roleId',
+    label: '日志时间',
+    prop: 'logTime',
     width: '200',
   },
   {
-    label: '角色名称',
-    prop: 'roleName',
+    label: 'IP',
+    prop: 'ip',
+    width: '120',
+  },
+  {
+    label: '错误信息',
+    prop: 'errorMessage',
+    width: '200',
+  },
+  {
+    label: '操作接口',
+    prop: 'operateApi',
+    width: '300',
+  },
+  {
+    label: '请求参数',
+    prop: 'requestParams',
   },
 ])
-const handleDelete = (item: Role, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.roleName}】的角色吗？`, '警告', {
+const handleDelete = (item: Log, done: any) => {
+  ElMessageBox.confirm(`你真的删除【${item.id}】的日志吗？`, '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    deleteRole(item.id).then(() => {
+    removeLog(item.id.toString()).then(() => {
       ElMessage({
         type: 'success',
-        message: '角色删除成功',
+        message: '日志删除成功',
       })
       done()
     })
   })
 }
+const handleDetail = (item: Log, done: any) => {
+  const form: Log = { ...item }
+  if (form.requestParams) {
+    const params = JSON.parse(form.requestParams)
+    form.requestParams = JSON.stringify(params, null, 4)
+    done(form)
+  }
+}
 const tableActionbar = reactive<Actionbar>({
   width: 150,
+  hiddenEditButton: true,
+})
+/**
+ * 分页
+ */
+const page = reactive<Page>({
+  current: 1,
+  size: 10,
+  sizes: [10, 20, 30, 40, 50],
+  total: 100,
 })
 /**
  * 加载数据
  */
-const load = () => {
-  getRoleList().then((res) => {
-    const { data: roleList } = res
-    dataList.length = 0
-    dataList.push(...roleList)
+const load = (params: any) => {
+  let obj = {}
+  const { logTime } = params
+  if (logTime) {
+    obj = { ...params, logType: 1, startTime: logTime[0], endTime: logTime[1] }
+  } else {
+    obj = { ...params, logType: 1 }
+  }
+
+  getLogPageList(obj).then((res: any) => {
+    const { data: logList, page: pagination } = res
+    if (logList) {
+      dataList.length = 0
+      dataList.push(...logList)
+    }
+    if (pagination) {
+      page.total = pagination.total
+    }
   })
 }
 </script>
@@ -137,9 +209,17 @@ const load = () => {
     :table-columns="tableColumns"
     :table-actionbar="tableActionbar"
     :table-toolbar="tableToolbar"
+    :search-form-items="searchFormItems"
+    :search-form-model="searchForm"
     dialog-titles="dialogTitles"
+    :page="page"
+    :form-inline="true"
     @on-load="load"
-    @on-form-submit="handleFormSubmit"
+    @on-detail="handleDetail"
     @on-delete="handleDelete"
+    @on-batch-delete="handleBatchDelete"
+    @on-import="handleImport"
+    @on-export="handleExport"
+    @on-print="handlePrint"
   ></quick-crud>
 </template>
diff --git a/src/views/system/log/operate.vue b/src/views/system/log/operate.vue
index c330f02..2cf64fd 100644
--- a/src/views/system/log/operate.vue
+++ b/src/views/system/log/operate.vue
@@ -13,12 +13,10 @@ const dataList = reactive<Array<Log>>([])
  * 表单
  */
 const dialogTitle = reactive({
-  // add: '添加日志',
-  // edit: '编辑日志',
   detail: '日志详情',
 })
 const formModel = reactive<Log>({
-  id: '',
+  id: 0,
   logTime: '',
   operateApi: '',
   requestParams: '',
@@ -38,35 +36,20 @@ const formItems = reactive<Array<FormItem>>([
     labelWidth: '80px',
     vModel: 'logTime',
   },
-  {
-    label: '操作接口',
-    labelWidth: '80px',
-    vModel: 'operateApi',
-  },
   {
     label: 'IP',
     labelWidth: '80px',
     vModel: 'ip',
   },
   {
-    label: '请求参数',
-    labelWidth: '80px',
-    vModel: 'requestParams',
-  },
-  {
-    label: '操作人',
-    labelWidth: '80px',
-    vModel: 'operateUserId',
-  },
-  {
-    label: '错误信息',
+    label: '操作接口',
     labelWidth: '80px',
-    vModel: 'errorMessage',
+    vModel: 'operateApi',
   },
   {
-    label: '异常信息',
+    label: '请求参数',
     labelWidth: '80px',
-    vModel: 'exceptionMessage',
+    vModel: 'requestParams',
     type: 'textarea',
   },
 ])
@@ -77,7 +60,6 @@ const formItems = reactive<Array<FormItem>>([
 const searchForm = reactive<SearchLog>({
   startTime: '',
   endTime: '',
-  operateUserId: '',
   logTime: '',
 })
 const searchFormItems = reactive<Array<FormItem>>([
@@ -87,11 +69,6 @@ const searchFormItems = reactive<Array<FormItem>>([
     placeholders: ['开始时间', '结束时间'],
     type: 'datetimerange',
   },
-  {
-    label: '操作人',
-    vModel: 'operateUserId',
-    placeholder: '操作人',
-  },
 ])
 /**
  * 工具栏
@@ -103,7 +80,7 @@ const tableToolbar = reactive<Toolbar>({
   hiddenPrintButton: true,
 })
 const handleBatchDelete = (data: any, done: any) => {
-  const { checkDataList, ids } = data
+  const { ids } = data
   ElMessageBox.confirm(`你真的删除选择的日志吗？`, '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -118,21 +95,12 @@ const handleBatchDelete = (data: any, done: any) => {
     })
   })
 }
-const handleImport = (done: any) => {
-  done()
-}
-const handleExport = () => {
-  // window.open(`${window.location.origin}/日志报表.xlsx`)//TODO:导出bug
-}
-const handlePrint = () => {
-  window.print()
-}
 /**
  * 表格
  */
 const tableColumns = reactive<Array<Column>>([
   {
-    width: '100',
+    width: '50',
     type: 'selection',
     align: 'center',
   },
@@ -141,33 +109,19 @@ const tableColumns = reactive<Array<Column>>([
     prop: 'logTime',
     width: '200',
   },
-  {
-    label: '操作接口',
-    prop: 'operateApi',
-    width: '300',
-  },
   {
     label: 'IP',
     prop: 'ip',
     width: '120',
   },
   {
-    label: '请求参数',
-    prop: 'requestParams',
-    width: '180',
-  },
-  {
-    label: '操作人',
-    prop: 'operateUserId',
-    width: '100',
-    //   format: (row: Log) => {
-    //   return row.enabled === 1 ? '禁用' : '启用'
-    // },
+    label: '操作接口',
+    prop: 'operateApi',
+    width: '300',
   },
   {
-    label: '错误信息',
-    prop: 'errorMessage',
-    width: '200',
+    label: '请求参数',
+    prop: 'requestParams',
   },
 ])
 const handleDelete = (item: Log, done: any) => {
@@ -185,6 +139,15 @@ const handleDelete = (item: Log, done: any) => {
     })
   })
 }
+const handleDetail = (item: Log, done: any) => {
+  const form: Log = { ...item }
+  if (form.requestParams) {
+    const params = JSON.parse(form.requestParams)
+    form.requestParams = JSON.stringify(params, null, 4)
+    done(form)
+  }
+}
+
 const tableActionbar = reactive<Actionbar>({
   width: 150,
   hiddenEditButton: true,
@@ -205,11 +168,16 @@ const load = (params: any) => {
   let obj = {}
   const { logTime } = params
   if (logTime) {
-    obj = { ...params, startTime: logTime[0], endTime: logTime[1] }
+    obj = {
+      ...params,
+      logType: 0,
+      startTime: logTime[0],
+      endTime: logTime[1],
+      logTime: null,
+    }
   } else {
-    obj = { ...params }
+    obj = { ...params, logType: 0, logTime: null }
   }
-
   getLogPageList(obj).then((res: any) => {
     const { data: logList, page: pagination } = res
     if (logList) {
@@ -235,9 +203,8 @@ const load = (params: any) => {
     :search-form-model="searchForm"
     dialog-titles="dialogTitles"
     :page="page"
-    :form-inline="true"
     @on-load="load"
-    @on-form-submit="handleFormSubmit"
+    @on-detail="handleDetail"
     @on-delete="handleDelete"
     @on-batch-delete="handleBatchDelete"
     @on-import="handleImport"
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
deleted file mode 100644
index 1866cc5..0000000
--- a/src/views/user/index.vue
+++ /dev/null
@@ -1,433 +0,0 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import QuickCrud from '@/components/QuickCrud/index.vue'
-import { Column, Actionbar, Toolbar } from '@/types/table'
-import { User, SearchUser } from '@/types/user'
-import { FormItem } from '@/types/form'
-import { Page } from '@/types/page'
-import { useUserStore } from '@/store/modules/user'
-import {
-  getUserPageList,
-  addUser,
-  updateUser,
-  deleteUser,
-  batchDeleteUser,
-  resetUserPassword,
-  enableUser,
-  disableUser,
-} from '@/api/user'
-
-const dataList = reactive<Array<User>>([])
-/**
- * 表单
- */
-const dialogTitle = reactive({
-  add: '添加用户',
-  edit: '编辑用户',
-  detail: '用户详情',
-})
-const validateUserId = (rule: any, value: string, callback: any) => {
-  const reg = /^YH_\d+$/
-  if (!reg.test(value)) {
-    callback(new Error('用户编号必须是以YH_开头和数字组合'))
-  } else {
-    callback()
-  }
-}
-const validateUserName = (rule: any, value: string, callback: any) => {
-  const reg = /^[a-zA-Z0-9]{4,16}$/
-  if (!reg.test(value)) {
-    callback(new Error('用户必须是4-16位的字母、数字'))
-  } else {
-    callback()
-  }
-}
-const validateFullName = (rule: any, value: string, callback: any) => {
-  const reg = /^[\u4e00-\u9fa5]{2,4}$/
-  if (!value) {
-    callback()
-  } else if (!reg.test(value)) {
-    callback(new Error('非法姓名'))
-  } else {
-    callback()
-  }
-}
-const validatePhone = (rule: any, value: string, callback: any) => {
-  const reg =
-    /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-  if (!value) {
-    callback()
-  } else if (!reg.test(value)) {
-    callback(new Error('非法手机号'))
-  } else {
-    callback()
-  }
-}
-const validateEmail = (rule: any, value: string, callback: any) => {
-  const reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
-  if (!value) {
-    callback()
-  } else if (!reg.test(value)) {
-    callback(new Error('非法邮箱'))
-  } else {
-    callback()
-  }
-}
-const formModel = reactive<User>({
-  id: '',
-  userId: '',
-  userName: '',
-  password: '',
-  createTime: '',
-  remark: '',
-})
-const formItems = reactive<Array<FormItem>>([
-  {
-    label: '用户编号',
-    labelWidth: '80px',
-    vModel: 'userId',
-    editReadonly: true,
-    placeholder: '用户编号',
-    prop: 'userId',
-    rules: [
-      {
-        required: true,
-        message: '用户编号不能为空',
-        trigger: 'blur',
-      },
-      {
-        validator: validateUserId,
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '用户名',
-    labelWidth: '80px',
-    vModel: 'userName',
-    placeholder: '用户名',
-    prop: 'userName',
-    rules: [
-      {
-        required: true,
-        message: '用户名不能为空',
-        trigger: 'blur',
-      },
-      {
-        validator: validateUserName,
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '姓名',
-    labelWidth: '80px',
-    vModel: 'fullName',
-    placeholder: '姓名',
-    prop: 'fullName',
-    rules: [
-      {
-        validator: validateFullName,
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '手机号',
-    labelWidth: '80px',
-    vModel: 'phone',
-    placeholder: '手机号',
-    prop: 'phone',
-    rules: [
-      {
-        validator: validatePhone,
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '邮箱',
-    labelWidth: '80px',
-    vModel: 'email',
-    placeholder: '邮箱',
-    prop: 'email',
-    rules: [
-      {
-        validator: validateEmail,
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '地址',
-    labelWidth: '80px',
-    vModel: 'address',
-    placeholder: '地址',
-  },
-  {
-    label: '备注',
-    labelWidth: '80px',
-    vModel: 'remark',
-    placeholder: '备注',
-    type: 'textarea',
-  },
-])
-
-const handleFormSubmit = (form: User, done: any) => {
-  console.log('handleFormSubmit', form)
-  if (form.id) {
-    updateUser(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户修改成功',
-      })
-      done()
-    })
-  } else {
-    addUser(form).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户创建成功',
-      })
-      done()
-    })
-  }
-}
-/**
- * 搜索
- */
-const searchForm = reactive<SearchUser>({
-  userName: '',
-})
-const searchFormItems = reactive<Array<FormItem>>([
-  {
-    label: '用户名',
-    vModel: 'userName',
-    placeholder: '用户名',
-  },
-])
-/**
- * 工具栏
- */
-const tableToolbar = reactive<Toolbar>({
-  hiddenBatchDeleteButton: false,
-})
-const handleBatchDelete = (data: any, done: any) => {
-  const { checkDataList, ids } = data
-  ElMessageBox.confirm(`你真的删除选择的用户吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    batchDeleteUser(ids).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户删除成功',
-      })
-      done()
-    })
-  })
-}
-const handleImport = (done: any) => {
-  done()
-}
-const handleExport = () => {
-  // window.open(`${window.location.origin}/用户报表.xlsx`)//TODO:导出bug
-}
-const handlePrint = () => {
-  window.print()
-}
-/**
- * 表格
- */
-const tableColumns = reactive<Array<Column>>([
-  {
-    width: '100',
-    type: 'selection',
-    align: 'center',
-  },
-  {
-    label: '用户编号',
-    prop: 'userId',
-    width: '100',
-  },
-  {
-    label: '用户名',
-    prop: 'userName',
-    width: '100',
-  },
-  {
-    label: '姓名',
-    prop: 'fullName',
-    width: '100',
-  },
-  {
-    label: '手机号',
-    prop: 'phone',
-    width: '180',
-  },
-  {
-    label: '邮箱',
-    prop: 'email',
-    width: '200',
-  },
-  {
-    label: '是否启用',
-    prop: 'enabled',
-    width: '200',
-    format: (row: User) => {
-      return row.enabled === 1 ? '禁用' : '启用'
-    },
-  },
-  {
-    label: '创建时间',
-    prop: 'createTime',
-    width: '200',
-  },
-  {
-    label: '地址',
-    prop: 'address',
-    width: '200',
-  },
-  {
-    label: '备注',
-    prop: 'remark',
-  },
-])
-const handleDelete = (item: User, done: any) => {
-  ElMessageBox.confirm(`你真的删除【${item.userName}】的用户吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    deleteUser(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户删除成功',
-      })
-      done()
-    })
-  })
-}
-const handleResetPassword = (item: User, done: any) => {
-  ElMessageBox.confirm(`你真的重置【${item.userName}】用户的密码吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    resetUserPassword(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '置用户密码重成功',
-      })
-      done()
-    })
-  })
-}
-const handleEnable = (item: User, done: any) => {
-  ElMessageBox.confirm(`你真的启用【${item.userName}】的用户吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    enableUser(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户启用成功',
-      })
-      done()
-    })
-  })
-}
-const handleDisable = (item: User, done: any) => {
-  ElMessageBox.confirm(`你真的禁用【${item.userName}】的用户吗？`, '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    disableUser(item.id).then(() => {
-      ElMessage({
-        type: 'success',
-        message: '用户禁用成功',
-      })
-      done()
-    })
-  })
-}
-const tableActionbar = reactive<Actionbar>({
-  width: 300,
-  btns: [
-    {
-      name: '重置密码',
-      click(item: any, done: any) {
-        handleResetPassword(item, done)
-      },
-    },
-    {
-      name: '启用',
-      click(item: any, done: any) {
-        handleEnable(item, done)
-      },
-      render(row: any) {
-        return row.enabled === 1
-      },
-    },
-    {
-      name: '禁用',
-      click(item: any, done: any) {
-        handleDisable(item, done)
-      },
-      render(row: any) {
-        return row.enabled !== 1
-      },
-    },
-  ],
-})
-/**
- * 分页
- */
-const page = reactive<Page>({
-  current: 1,
-  size: 10,
-  sizes: [10, 20, 30, 40, 50],
-  total: 100,
-})
-/**
- * 加载数据
- */
-const load = (parmas: object) => {
-  getUserPageList(parmas).then((res: any) => {
-    const { data: userList, page: pagination } = res
-    if (userList) {
-      dataList.length = 0
-      dataList.push(...userList)
-    }
-    if (pagination) {
-      page.total = pagination.total
-    }
-  })
-}
-</script>
-<template>
-  <quick-crud
-    :dialog-title="dialogTitle"
-    :form-model="formModel"
-    :form-items="formItems"
-    :table-data="dataList"
-    :table-columns="tableColumns"
-    :table-actionbar="tableActionbar"
-    :table-toolbar="tableToolbar"
-    :search-form-items="searchFormItems"
-    :search-form-model="searchForm"
-    dialog-titles="dialogTitles"
-    :page="page"
-    @on-load="load"
-    @on-form-submit="handleFormSubmit"
-    @on-delete="handleDelete"
-    @on-batch-delete="handleBatchDelete"
-    @on-import="handleImport"
-    @on-export="handleExport"
-    @on-print="handlePrint"
-  ></quick-crud>
-</template>
-- 
Gitee