diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 8c035ca..0000000
--- a/src/views/system/log/list.log.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script lang="ts" setup name="ListLog">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import type { IlistQuery } from './log_interface'
-import {
-  delLog,
-  getBizLogDetail,
-  getBizLogList,
-  getLogType,
-} from '@/api/system/log'
-const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  beginTime: '',
-  endTime: '',
-  // logType: '业务日志',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-})
-const columns = ref([
-  {
-    text: '日志名称',
-    value: 'logName',
-    width: 150,
-  },
-  {
-    text: '用户',
-    value: 'userName',
-  },
-  {
-    text: '时间',
-    value: 'createTime',
-  },
-  {
-    text: '详细信息',
-    value: 'message',
-  },
-])
-const list = ref([])
-const total = ref(20)
-const logTypeList = ref(null)
-const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-
-// 获取日志数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-
-fetchData(true)
-
-// 打开详情对话框
-const detail = (row: any) => {
-  getBizLogDetail(row.id).then((res) => {
-    if (res.code === 200) {
-      ElMessageBox.alert(res.data, '详情', {
-        confirmButtonText: '确定',
-      })
-    }
-  })
-}
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    delLog().then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        list.value = []
-        total.value = 0
-        // this.fetchData()
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-
-// 获取日志类型
-const fetchLogType = () => {
-  getLogType().then((response) => {
-    logTypeList.value = response.data
-  })
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <div class="list-log">
-    <!-- 布局 -->
-    <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.keywords"
-            placeholder="日志名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择开始时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择结束时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button
-            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            @click="cleanAll"
-          >
-            清空日志
-          </el-button>
-        </template>
-      </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </app-container>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.table {
-  margin-bottom: 20px;
-}
-
-.pagination-container {
-  margin-bottom: 50px;
-}
-</style>
-
-<style lang="scss">
-  .list-log {
-    .el-button + .el-button {
-      margin-top: -10px;
-    }
-  }
-
-  .el-message-box {
-    overflow: auto;
-  }
-</style>

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 8c035ca..0000000
--- a/src/views/system/log/list.log.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script lang="ts" setup name="ListLog">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import type { IlistQuery } from './log_interface'
-import {
-  delLog,
-  getBizLogDetail,
-  getBizLogList,
-  getLogType,
-} from '@/api/system/log'
-const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  beginTime: '',
-  endTime: '',
-  // logType: '业务日志',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-})
-const columns = ref([
-  {
-    text: '日志名称',
-    value: 'logName',
-    width: 150,
-  },
-  {
-    text: '用户',
-    value: 'userName',
-  },
-  {
-    text: '时间',
-    value: 'createTime',
-  },
-  {
-    text: '详细信息',
-    value: 'message',
-  },
-])
-const list = ref([])
-const total = ref(20)
-const logTypeList = ref(null)
-const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-
-// 获取日志数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-
-fetchData(true)
-
-// 打开详情对话框
-const detail = (row: any) => {
-  getBizLogDetail(row.id).then((res) => {
-    if (res.code === 200) {
-      ElMessageBox.alert(res.data, '详情', {
-        confirmButtonText: '确定',
-      })
-    }
-  })
-}
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    delLog().then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        list.value = []
-        total.value = 0
-        // this.fetchData()
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-
-// 获取日志类型
-const fetchLogType = () => {
-  getLogType().then((response) => {
-    logTypeList.value = response.data
-  })
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <div class="list-log">
-    <!-- 布局 -->
-    <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.keywords"
-            placeholder="日志名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择开始时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择结束时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button
-            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            @click="cleanAll"
-          >
-            清空日志
-          </el-button>
-        </template>
-      </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </app-container>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.table {
-  margin-bottom: 20px;
-}
-
-.pagination-container {
-  margin-bottom: 50px;
-}
-</style>
-
-<style lang="scss">
-  .list-log {
-    .el-button + .el-button {
-      margin-top: -10px;
-    }
-  }
-
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index ce05c27..9256771 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -79,7 +79,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 8c035ca..0000000
--- a/src/views/system/log/list.log.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script lang="ts" setup name="ListLog">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import type { IlistQuery } from './log_interface'
-import {
-  delLog,
-  getBizLogDetail,
-  getBizLogList,
-  getLogType,
-} from '@/api/system/log'
-const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  beginTime: '',
-  endTime: '',
-  // logType: '业务日志',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-})
-const columns = ref([
-  {
-    text: '日志名称',
-    value: 'logName',
-    width: 150,
-  },
-  {
-    text: '用户',
-    value: 'userName',
-  },
-  {
-    text: '时间',
-    value: 'createTime',
-  },
-  {
-    text: '详细信息',
-    value: 'message',
-  },
-])
-const list = ref([])
-const total = ref(20)
-const logTypeList = ref(null)
-const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-
-// 获取日志数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-
-fetchData(true)
-
-// 打开详情对话框
-const detail = (row: any) => {
-  getBizLogDetail(row.id).then((res) => {
-    if (res.code === 200) {
-      ElMessageBox.alert(res.data, '详情', {
-        confirmButtonText: '确定',
-      })
-    }
-  })
-}
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    delLog().then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        list.value = []
-        total.value = 0
-        // this.fetchData()
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-
-// 获取日志类型
-const fetchLogType = () => {
-  getLogType().then((response) => {
-    logTypeList.value = response.data
-  })
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <div class="list-log">
-    <!-- 布局 -->
-    <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.keywords"
-            placeholder="日志名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择开始时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择结束时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button
-            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            @click="cleanAll"
-          >
-            清空日志
-          </el-button>
-        </template>
-      </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </app-container>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.table {
-  margin-bottom: 20px;
-}
-
-.pagination-container {
-  margin-bottom: 50px;
-}
-</style>
-
-<style lang="scss">
-  .list-log {
-    .el-button + .el-button {
-      margin-top: -10px;
-    }
-  }
-
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index ce05c27..9256771 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -79,7 +79,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
new file mode 100644
index 0000000..745c63d
--- /dev/null
+++ b/src/views/system/log/listLog.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup name="ListLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
+import {
+  delLog,
+  getBizLogDetail,
+  getBizLogList,
+  getLogType,
+} from '@/api/system/log'
+const { proxy } = getCurrentInstance() as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+})
+const columns = ref([
+  {
+    text: '日志名称',
+    value: 'logName',
+    width: 150,
+  },
+  {
+    text: '用户',
+    value: 'userName',
+  },
+  {
+    text: '时间',
+    value: 'createTime',
+  },
+  {
+    text: '详细信息',
+    value: 'message',
+  },
+])
+const list = ref([])
+const total = ref(20)
+const logTypeList = ref(null)
+const listLoading = ref(true)
+const dialogFormVisible = ref(false)
+const dialogStatus = ref('')
+
+// 获取日志数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getBizLogList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+
+fetchData(true)
+
+// 打开详情对话框
+const detail = (row: any) => {
+  getBizLogDetail(row.id).then((res) => {
+    if (res.code === 200) {
+      ElMessageBox.alert(res.data, '详情', {
+        confirmButtonText: '确定',
+      })
+    }
+  })
+}
+
+// 清空日志
+const cleanAll = () => {
+  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delLog().then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        list.value = []
+        total.value = 0
+        // this.fetchData()
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 获取日志类型
+const fetchLogType = () => {
+  getLogType().then((response) => {
+    logTypeList.value = response.data
+  })
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <div class="list-log">
+    <!-- 布局 -->
+    <app-container>
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.keywords"
+            placeholder="日志名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.beginTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择开始时间"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.endTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择结束时间"
+          />
+        </search-item>
+        <template #btns>
+          <el-button
+            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="listLoading"
+        @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="70" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                ㅤ详情ㅤㅤ
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+</style>
+
+<style lang="scss">
+  .list-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 8c035ca..0000000
--- a/src/views/system/log/list.log.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script lang="ts" setup name="ListLog">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import type { IlistQuery } from './log_interface'
-import {
-  delLog,
-  getBizLogDetail,
-  getBizLogList,
-  getLogType,
-} from '@/api/system/log'
-const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  beginTime: '',
-  endTime: '',
-  // logType: '业务日志',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-})
-const columns = ref([
-  {
-    text: '日志名称',
-    value: 'logName',
-    width: 150,
-  },
-  {
-    text: '用户',
-    value: 'userName',
-  },
-  {
-    text: '时间',
-    value: 'createTime',
-  },
-  {
-    text: '详细信息',
-    value: 'message',
-  },
-])
-const list = ref([])
-const total = ref(20)
-const logTypeList = ref(null)
-const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-
-// 获取日志数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-
-fetchData(true)
-
-// 打开详情对话框
-const detail = (row: any) => {
-  getBizLogDetail(row.id).then((res) => {
-    if (res.code === 200) {
-      ElMessageBox.alert(res.data, '详情', {
-        confirmButtonText: '确定',
-      })
-    }
-  })
-}
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    delLog().then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        list.value = []
-        total.value = 0
-        // this.fetchData()
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-
-// 获取日志类型
-const fetchLogType = () => {
-  getLogType().then((response) => {
-    logTypeList.value = response.data
-  })
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <div class="list-log">
-    <!-- 布局 -->
-    <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.keywords"
-            placeholder="日志名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择开始时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择结束时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button
-            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            @click="cleanAll"
-          >
-            清空日志
-          </el-button>
-        </template>
-      </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </app-container>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.table {
-  margin-bottom: 20px;
-}
-
-.pagination-container {
-  margin-bottom: 50px;
-}
-</style>
-
-<style lang="scss">
-  .list-log {
-    .el-button + .el-button {
-      margin-top: -10px;
-    }
-  }
-
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index ce05c27..9256771 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -79,7 +79,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
new file mode 100644
index 0000000..745c63d
--- /dev/null
+++ b/src/views/system/log/listLog.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup name="ListLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
+import {
+  delLog,
+  getBizLogDetail,
+  getBizLogList,
+  getLogType,
+} from '@/api/system/log'
+const { proxy } = getCurrentInstance() as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+})
+const columns = ref([
+  {
+    text: '日志名称',
+    value: 'logName',
+    width: 150,
+  },
+  {
+    text: '用户',
+    value: 'userName',
+  },
+  {
+    text: '时间',
+    value: 'createTime',
+  },
+  {
+    text: '详细信息',
+    value: 'message',
+  },
+])
+const list = ref([])
+const total = ref(20)
+const logTypeList = ref(null)
+const listLoading = ref(true)
+const dialogFormVisible = ref(false)
+const dialogStatus = ref('')
+
+// 获取日志数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getBizLogList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+
+fetchData(true)
+
+// 打开详情对话框
+const detail = (row: any) => {
+  getBizLogDetail(row.id).then((res) => {
+    if (res.code === 200) {
+      ElMessageBox.alert(res.data, '详情', {
+        confirmButtonText: '确定',
+      })
+    }
+  })
+}
+
+// 清空日志
+const cleanAll = () => {
+  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delLog().then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        list.value = []
+        total.value = 0
+        // this.fetchData()
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 获取日志类型
+const fetchLogType = () => {
+  getLogType().then((response) => {
+    logTypeList.value = response.data
+  })
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <div class="list-log">
+    <!-- 布局 -->
+    <app-container>
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.keywords"
+            placeholder="日志名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.beginTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择开始时间"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.endTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择结束时间"
+          />
+        </search-item>
+        <template #btns>
+          <el-button
+            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="listLoading"
+        @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="70" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                ㅤ详情ㅤㅤ
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+</style>
+
+<style lang="scss">
+  .list-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 904f51c..30dc2c1 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -95,7 +95,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }

diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 94d28ef..1a4b535 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -17,7 +17,7 @@
       {
         path: 'list',
         name: 'AreaList',
-        component: () => import('@/views/system/area/list.area.vue'),
+        component: () => import('@/views/system/area/listArea.vue'),
         meta: {
           title: '区域管理',
           auth: '/sys/area',
@@ -209,7 +209,7 @@
       {
         path: 'list',
         name: 'BusinessList',
-        component: () => import('@/views/system/log/list.log.vue'),
+        component: () => import('@/views/system/log/listLog.vue'),
         meta: {
           title: '业务日志',
           auth: '/sys/log/biz/list',
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
deleted file mode 100644
index 16a8cc8..0000000
--- a/src/views/system/area/list.area.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script lang="ts" setup name="ListArea">
-import { computed, onActivated, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQuery } from './area_interface'
-import EditArea from './editArea.vue'
-import { delArea, getAreaListPage } from '@/api/system/area'
-const { proxy } = getCurrentInstance() as any
-const editarea = ref()
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-}) // 筛选条件
-const columns: any = [
-  {
-    text: '区域名称',
-    value: 'areaName',
-    align: 'center',
-  },
-  {
-    text: '区域编码',
-    value: 'id',
-    align: 'center',
-  },
-  {
-    text: '区域等级',
-    value: 'levelName',
-    align: 'center',
-  },
-  {
-    text: '所属区域',
-    value: 'pName',
-    align: 'center',
-  },
-  {
-    text: '区域排序',
-    value: 'num',
-    width: 80,
-    align: 'center',
-  },
-]// 显示列
-const list = ref([]) // 列表数据
-const total = ref(0)// 数据总数
-const listLoading = ref(true)// 加载动画
-const fullscreenLoading = ref(false) // 全屏加载动画
-const dialogFormVisible = ref(false) // 是否显示编辑框
-
-// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-const showOperate = computed(() => {
-  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
-})
-
-// 获取区域数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getAreaListPage(listQuery).then((response) => {
-    if (response.code === 200) {
-      list.value = response.data.rows
-      total.value = parseInt(response.data.total)
-      listLoading.value = false
-    }
-  })
-}
-
-fetchData(true)// 获取数据
-
-onActivated(() => {
-  fetchData(true)// 获取数据
-})
-
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
-// 新增区域
-const add = () => {
-  dialogFormVisible.value = true
-  editarea.value.initDialog('create')
-}
-
-// 编辑区域信息
-const edit = (row: any) => {
-  dialogFormVisible.value = true
-  // editShow = true
-  editarea.value.initDialog('update', row)
-}
-// 删除区域
-const del = (row: any) => {
-  ElMessageBox.confirm(
-    '确定要删除区域吗？',
-    '确认操作',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    delArea(row.id).then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        fetchData(true)
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
new file mode 100644
index 0000000..335a6fb
--- /dev/null
+++ b/src/views/system/area/listArea.vue
@@ -0,0 +1,170 @@
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { Ref } from 'vue'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const { proxy } = getCurrentInstance() as any
+const editarea = ref()
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row: any) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.initDialog('update', row)
+}
+// 删除区域
+const del = (row: any) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 8c035ca..0000000
--- a/src/views/system/log/list.log.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<script lang="ts" setup name="ListLog">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import type { IlistQuery } from './log_interface'
-import {
-  delLog,
-  getBizLogDetail,
-  getBizLogList,
-  getLogType,
-} from '@/api/system/log'
-const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = reactive({
-  keywords: '',
-  beginTime: '',
-  endTime: '',
-  // logType: '业务日志',
-  offset: 1,
-  limit: 20,
-  sort: '',
-  order: '',
-})
-const columns = ref([
-  {
-    text: '日志名称',
-    value: 'logName',
-    width: 150,
-  },
-  {
-    text: '用户',
-    value: 'userName',
-  },
-  {
-    text: '时间',
-    value: 'createTime',
-  },
-  {
-    text: '详细信息',
-    value: 'message',
-  },
-])
-const list = ref([])
-const total = ref(20)
-const logTypeList = ref(null)
-const listLoading = ref(true)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
-
-// 获取日志数据
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getBizLogList(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-
-fetchData(true)
-
-// 打开详情对话框
-const detail = (row: any) => {
-  getBizLogDetail(row.id).then((res) => {
-    if (res.code === 200) {
-      ElMessageBox.alert(res.data, '详情', {
-        confirmButtonText: '确定',
-      })
-    }
-  })
-}
-
-// 清空日志
-const cleanAll = () => {
-  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    delLog().then((response) => {
-      if (response.code === 200) {
-        ElMessage({
-          message: '删除成功',
-          type: 'success',
-        })
-        list.value = []
-        total.value = 0
-        // this.fetchData()
-      }
-    })
-  })
-}
-
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-
-// 获取日志类型
-const fetchLogType = () => {
-  getLogType().then((response) => {
-    logTypeList.value = response.data
-  })
-}
-
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData(true)
-}
-</script>
-
-<template>
-  <div class="list-log">
-    <!-- 布局 -->
-    <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.keywords"
-            placeholder="日志名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.beginTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择开始时间"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="选择结束时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button
-            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            @click="cleanAll"
-          >
-            清空日志
-          </el-button>
-        </template>
-      </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </app-container>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.table {
-  margin-bottom: 20px;
-}
-
-.pagination-container {
-  margin-bottom: 50px;
-}
-</style>
-
-<style lang="scss">
-  .list-log {
-    .el-button + .el-button {
-      margin-top: -10px;
-    }
-  }
-
-  .el-message-box {
-    overflow: auto;
-  }
-</style>
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index ce05c27..9256771 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -79,7 +79,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
new file mode 100644
index 0000000..745c63d
--- /dev/null
+++ b/src/views/system/log/listLog.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup name="ListLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
+import {
+  delLog,
+  getBizLogDetail,
+  getBizLogList,
+  getLogType,
+} from '@/api/system/log'
+const { proxy } = getCurrentInstance() as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  beginTime: '',
+  endTime: '',
+  // logType: '业务日志',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+})
+const columns = ref([
+  {
+    text: '日志名称',
+    value: 'logName',
+    width: 150,
+  },
+  {
+    text: '用户',
+    value: 'userName',
+  },
+  {
+    text: '时间',
+    value: 'createTime',
+  },
+  {
+    text: '详细信息',
+    value: 'message',
+  },
+])
+const list = ref([])
+const total = ref(20)
+const logTypeList = ref(null)
+const listLoading = ref(true)
+const dialogFormVisible = ref(false)
+const dialogStatus = ref('')
+
+// 获取日志数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getBizLogList(listQuery).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+
+fetchData(true)
+
+// 打开详情对话框
+const detail = (row: any) => {
+  getBizLogDetail(row.id).then((res) => {
+    if (res.code === 200) {
+      ElMessageBox.alert(res.data, '详情', {
+        confirmButtonText: '确定',
+      })
+    }
+  })
+}
+
+// 清空日志
+const cleanAll = () => {
+  ElMessageBox.confirm('确定要清空全部日志吗？', '确认操作', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delLog().then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        list.value = []
+        total.value = 0
+        // this.fetchData()
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 获取日志类型
+const fetchLogType = () => {
+  getLogType().then((response) => {
+    logTypeList.value = response.data
+  })
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
+</script>
+
+<template>
+  <div class="list-log">
+    <!-- 布局 -->
+    <app-container>
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.keywords"
+            placeholder="日志名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.beginTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择开始时间"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.endTime"
+            type="datetime"
+            value-format="YYYY/MM/DD HH:mm:ss"
+            placeholder="选择结束时间"
+          />
+        </search-item>
+        <template #btns>
+          <el-button
+            v-if="proxy.hasPerm('/sys/log/biz/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="listLoading"
+        @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="70" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                ㅤ详情ㅤㅤ
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+</style>
+
+<style lang="scss">
+  .list-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 904f51c..30dc2c1 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -95,7 +95,7 @@
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
diff --git a/src/views/system/tenant/list.tenant.vue b/src/views/system/tenant/list.tenant.vue
index 20256b0..eebf1df 100644
--- a/src/views/system/tenant/list.tenant.vue
+++ b/src/views/system/tenant/list.tenant.vue
@@ -126,7 +126,7 @@
         />
       </search-item>
     </search-area>
-    <NormalTable
+    <normal-table
       ref="normalTableRef"
       :data="list"
       :query="listQuery"
@@ -155,9 +155,9 @@
           </template>
         </el-table-column>
       </template>
-    </NormalTable>
-    <EditTenant ref="editTenant" @watchChild="fetchData" />
-    <RelateDept ref="relateDept" @watchChild="fetchData" />
+    </normal-table>
+    <edit-tenant ref="editTenant" @watchChild="fetchData" />
+    <relate-dept ref="relateDept" @watchChild="fetchData" />
   </app-container>
 </template>