diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: any) => {
+const changePage = (val: { size: number; page: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
new file mode 100644
index 0000000..4a92993
--- /dev/null
+++ b/src/views/system/process/editProcess.vue
@@ -0,0 +1,229 @@
+<!-- 编辑流程页面 -->
+<script lang="ts" setup name="EditProcess">
+import { reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import type { Ref } from 'vue'
+import type { Iform } from './process'
+const emits = defineEmits(['close'])
+const ruleFormRef = ref<FormInstance>()
+const form: Ref<Iform> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  desc: '', // 流程描述
+  selectDecision: '', // 选择的决策
+  rejectTo: '', // 可驳回至
+  changeData: '', // 驳回修改数据
+  isMessage: '', // 审批结果通知发起人
+})
+// 可选决策项
+const decision = [
+  {
+    id: 'reject-refuse',
+    title: '同意 驳回 拒绝',
+  },
+  {
+    id: 'reject',
+    title: '同意 驳回',
+  },
+  {
+    id: 'refuse',
+    title: '同意 拒绝',
+  },
+]
+// 可驳回至
+const reject = [
+  {
+    id: 'change',
+    title: '单据修改',
+  },
+]
+// 驳回修改数据
+const rejectChangeData = [
+  {
+    id: 'all',
+    title: '重新按流程走',
+  },
+  {
+    id: 'part',
+    title: '送至驳回节点',
+  },
+]
+// 审批结果通知发起人
+const messageData = [
+  {
+    id: 'yes',
+    title: '是',
+  },
+  {
+    id: 'no',
+    title: '否',
+  },
+]
+const rules = reactive<FormRules>({
+  selectDecision: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  rejectTo: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  changeData: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  isMessage: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+})
+
+// 关闭
+const close = () => {
+  emits('close')
+}
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 调保存接口
+    }
+    else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+// 选择决策项
+const changeDecision = (value: string) => {
+  form.value.selectDecision = value
+}
+const changeRejectTo = (value: string) => {
+  form.value.rejectTo = value
+}
+const changeData = (value: string) => {
+  form.value.changeData = value
+}
+const changeMessage = (value: string) => {
+  form.value.isMessage = value
+}
+</script>
+
+<template>
+  <div class="edit-process">
+    <h5 class="title">
+      流程编辑
+    </h5>
+    <div class="edit">
+      <div class="button-area">
+        <el-button type="primary" @click="save(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="primary" @click="close">
+          关闭
+        </el-button>
+      </div>
+      <el-form ref="ruleFormRef" :model="form" label-width="140px" :rules="rules">
+        <el-form-item label="流程编号">
+          {{ form.number }}
+        </el-form-item>
+        <el-form-item label="流程名称">
+          {{ form.name }}
+        </el-form-item>
+        <el-form-item label="关联业务">
+          {{ form.business }}
+        </el-form-item>
+        <el-form-item label="流程描述">
+          <el-input v-model="form.desc" type="textarea" />
+        </el-form-item>
+        <el-form-item label="可选决策项" prop="selectDecision">
+          <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+            <el-option
+              v-for="item in decision"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+          <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+            <el-option
+              v-for="item in reject"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+          <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+            <el-option
+              v-for="item in rejectChangeData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批结果通知发起人" prop="isMessage">
+          <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+            <el-option
+              v-for="item in messageData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <h5 class="title">
+      流程配置
+    </h5>
+    <div class="set edit" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .edit-process {
+    width: 100%;
+
+    .title {
+      margin: 0;
+    }
+
+    .edit {
+      width: 100%;
+      padding: 12px;
+      background-color: #fff;
+      border-radius: 7px;
+      margin: 20px 0;
+
+      .button-area {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+    }
+
+    .set {
+      height: 200px;
+    }
+  }
+</style>

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
new file mode 100644
index 0000000..4a92993
--- /dev/null
+++ b/src/views/system/process/editProcess.vue
@@ -0,0 +1,229 @@
+<!-- 编辑流程页面 -->
+<script lang="ts" setup name="EditProcess">
+import { reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import type { Ref } from 'vue'
+import type { Iform } from './process'
+const emits = defineEmits(['close'])
+const ruleFormRef = ref<FormInstance>()
+const form: Ref<Iform> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  desc: '', // 流程描述
+  selectDecision: '', // 选择的决策
+  rejectTo: '', // 可驳回至
+  changeData: '', // 驳回修改数据
+  isMessage: '', // 审批结果通知发起人
+})
+// 可选决策项
+const decision = [
+  {
+    id: 'reject-refuse',
+    title: '同意 驳回 拒绝',
+  },
+  {
+    id: 'reject',
+    title: '同意 驳回',
+  },
+  {
+    id: 'refuse',
+    title: '同意 拒绝',
+  },
+]
+// 可驳回至
+const reject = [
+  {
+    id: 'change',
+    title: '单据修改',
+  },
+]
+// 驳回修改数据
+const rejectChangeData = [
+  {
+    id: 'all',
+    title: '重新按流程走',
+  },
+  {
+    id: 'part',
+    title: '送至驳回节点',
+  },
+]
+// 审批结果通知发起人
+const messageData = [
+  {
+    id: 'yes',
+    title: '是',
+  },
+  {
+    id: 'no',
+    title: '否',
+  },
+]
+const rules = reactive<FormRules>({
+  selectDecision: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  rejectTo: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  changeData: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  isMessage: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+})
+
+// 关闭
+const close = () => {
+  emits('close')
+}
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 调保存接口
+    }
+    else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+// 选择决策项
+const changeDecision = (value: string) => {
+  form.value.selectDecision = value
+}
+const changeRejectTo = (value: string) => {
+  form.value.rejectTo = value
+}
+const changeData = (value: string) => {
+  form.value.changeData = value
+}
+const changeMessage = (value: string) => {
+  form.value.isMessage = value
+}
+</script>
+
+<template>
+  <div class="edit-process">
+    <h5 class="title">
+      流程编辑
+    </h5>
+    <div class="edit">
+      <div class="button-area">
+        <el-button type="primary" @click="save(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="primary" @click="close">
+          关闭
+        </el-button>
+      </div>
+      <el-form ref="ruleFormRef" :model="form" label-width="140px" :rules="rules">
+        <el-form-item label="流程编号">
+          {{ form.number }}
+        </el-form-item>
+        <el-form-item label="流程名称">
+          {{ form.name }}
+        </el-form-item>
+        <el-form-item label="关联业务">
+          {{ form.business }}
+        </el-form-item>
+        <el-form-item label="流程描述">
+          <el-input v-model="form.desc" type="textarea" />
+        </el-form-item>
+        <el-form-item label="可选决策项" prop="selectDecision">
+          <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+            <el-option
+              v-for="item in decision"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+          <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+            <el-option
+              v-for="item in reject"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+          <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+            <el-option
+              v-for="item in rejectChangeData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批结果通知发起人" prop="isMessage">
+          <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+            <el-option
+              v-for="item in messageData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <h5 class="title">
+      流程配置
+    </h5>
+    <div class="set edit" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .edit-process {
+    width: 100%;
+
+    .title {
+      margin: 0;
+    }
+
+    .edit {
+      width: 100%;
+      padding: 12px;
+      background-color: #fff;
+      border-radius: 7px;
+      margin: 20px 0;
+
+      .button-area {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+    }
+
+    .set {
+      height: 200px;
+    }
+  }
+</style>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 554c264..7b12a6a 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -9,3 +9,14 @@
   offset: number
   limit: number
 }
+
+export interface Iform {
+  number: string // 编号
+  name: string // 名称
+  business: string // 关联业务
+  desc?: string // 流程描述
+  selectDecision: string // 选择的决策
+  rejectTo?: string // 可驳回至
+  changeData?: string // 驳回修改数据
+  isMessage: string // 审批结果通知发起人
+}

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
new file mode 100644
index 0000000..4a92993
--- /dev/null
+++ b/src/views/system/process/editProcess.vue
@@ -0,0 +1,229 @@
+<!-- 编辑流程页面 -->
+<script lang="ts" setup name="EditProcess">
+import { reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import type { Ref } from 'vue'
+import type { Iform } from './process'
+const emits = defineEmits(['close'])
+const ruleFormRef = ref<FormInstance>()
+const form: Ref<Iform> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  desc: '', // 流程描述
+  selectDecision: '', // 选择的决策
+  rejectTo: '', // 可驳回至
+  changeData: '', // 驳回修改数据
+  isMessage: '', // 审批结果通知发起人
+})
+// 可选决策项
+const decision = [
+  {
+    id: 'reject-refuse',
+    title: '同意 驳回 拒绝',
+  },
+  {
+    id: 'reject',
+    title: '同意 驳回',
+  },
+  {
+    id: 'refuse',
+    title: '同意 拒绝',
+  },
+]
+// 可驳回至
+const reject = [
+  {
+    id: 'change',
+    title: '单据修改',
+  },
+]
+// 驳回修改数据
+const rejectChangeData = [
+  {
+    id: 'all',
+    title: '重新按流程走',
+  },
+  {
+    id: 'part',
+    title: '送至驳回节点',
+  },
+]
+// 审批结果通知发起人
+const messageData = [
+  {
+    id: 'yes',
+    title: '是',
+  },
+  {
+    id: 'no',
+    title: '否',
+  },
+]
+const rules = reactive<FormRules>({
+  selectDecision: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  rejectTo: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  changeData: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  isMessage: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+})
+
+// 关闭
+const close = () => {
+  emits('close')
+}
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 调保存接口
+    }
+    else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+// 选择决策项
+const changeDecision = (value: string) => {
+  form.value.selectDecision = value
+}
+const changeRejectTo = (value: string) => {
+  form.value.rejectTo = value
+}
+const changeData = (value: string) => {
+  form.value.changeData = value
+}
+const changeMessage = (value: string) => {
+  form.value.isMessage = value
+}
+</script>
+
+<template>
+  <div class="edit-process">
+    <h5 class="title">
+      流程编辑
+    </h5>
+    <div class="edit">
+      <div class="button-area">
+        <el-button type="primary" @click="save(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="primary" @click="close">
+          关闭
+        </el-button>
+      </div>
+      <el-form ref="ruleFormRef" :model="form" label-width="140px" :rules="rules">
+        <el-form-item label="流程编号">
+          {{ form.number }}
+        </el-form-item>
+        <el-form-item label="流程名称">
+          {{ form.name }}
+        </el-form-item>
+        <el-form-item label="关联业务">
+          {{ form.business }}
+        </el-form-item>
+        <el-form-item label="流程描述">
+          <el-input v-model="form.desc" type="textarea" />
+        </el-form-item>
+        <el-form-item label="可选决策项" prop="selectDecision">
+          <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+            <el-option
+              v-for="item in decision"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+          <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+            <el-option
+              v-for="item in reject"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+          <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+            <el-option
+              v-for="item in rejectChangeData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批结果通知发起人" prop="isMessage">
+          <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+            <el-option
+              v-for="item in messageData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <h5 class="title">
+      流程配置
+    </h5>
+    <div class="set edit" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .edit-process {
+    width: 100%;
+
+    .title {
+      margin: 0;
+    }
+
+    .edit {
+      width: 100%;
+      padding: 12px;
+      background-color: #fff;
+      border-radius: 7px;
+      margin: 20px 0;
+
+      .button-area {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+    }
+
+    .set {
+      height: 200px;
+    }
+  }
+</style>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 554c264..7b12a6a 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -9,3 +9,14 @@
   offset: number
   limit: number
 }
+
+export interface Iform {
+  number: string // 编号
+  name: string // 名称
+  business: string // 关联业务
+  desc?: string // 流程描述
+  selectDecision: string // 选择的决策
+  rejectTo?: string // 可驳回至
+  changeData?: string // 驳回修改数据
+  isMessage: string // 审批结果通知发起人
+}
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 84319b8..f248fe7 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -3,9 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
+import EditProcess from './editProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
 
 const { proxy } = getCurrentInstance() as any
+const active = ref('main')
 const listQuery: IlistQuery = reactive({
   number: '', // 编号
   name: '', // 名称
@@ -104,90 +106,128 @@
   }
   fetchData(true)
 }
+
+// 重置
+const reset = () => {
+  console.log('点击重置')
+}
+// 编辑
+const edit = (row: IlistQuery) => {
+  console.log('编辑')
+  active.value = 'edit'
+}
+// 详情
+const detail = (row: IlistQuery) => {
+  console.log('查看详情')
+  active.value = 'detail'
+}
+// 废止
+const abolish = (row: IlistQuery) => {
+  console.log('废止')
+}
+// 删除
+const del = (row: IlistQuery) => {
+  console.log('删除')
+}
+// 编辑页面点击关闭
+const close = () => {
+  active.value = 'main'
+}
 </script>
 
 <template>
   <div class="process">
     <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.number"
-            placeholder="流程编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.name"
-            placeholder="流程名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.business"
-            placeholder="关联业务"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.status"
-            placeholder="当前流程状态"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.person"
-            placeholder="流程负责人"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.time"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="创建时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-            重置
-          </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="200" align="center">
-            <template #default="scope">
-              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                详情
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                废止
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <!-- 主页面 -->
+      <div v-if="active === 'main'">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.number"
+              placeholder="流程编号"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.name"
+              placeholder="流程名称"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.business"
+              placeholder="关联业务"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.status"
+              placeholder="当前流程状态"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.person"
+              placeholder="流程负责人"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.time"
+              type="datetime"
+              value-format="YYYY/MM/DD HH:mm:ss"
+              placeholder="创建时间"
+            />
+          </search-item>
+          <template #btns>
+            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+              重置
+            </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="200" align="center">
+              <template #default="scope">
+                <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                  编辑
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                  详情
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                  废止
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+      <!-- 编辑 -->
+      <div v-if="active === 'edit'">
+        <edit-process @close="close" />
+      </div>
+      <!-- 详情 -->
+      <div v-if="active === 'detail'">
+        详情
+      </div>
     </app-container>
   </div>
 </template>

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
new file mode 100644
index 0000000..4a92993
--- /dev/null
+++ b/src/views/system/process/editProcess.vue
@@ -0,0 +1,229 @@
+<!-- 编辑流程页面 -->
+<script lang="ts" setup name="EditProcess">
+import { reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import type { Ref } from 'vue'
+import type { Iform } from './process'
+const emits = defineEmits(['close'])
+const ruleFormRef = ref<FormInstance>()
+const form: Ref<Iform> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  desc: '', // 流程描述
+  selectDecision: '', // 选择的决策
+  rejectTo: '', // 可驳回至
+  changeData: '', // 驳回修改数据
+  isMessage: '', // 审批结果通知发起人
+})
+// 可选决策项
+const decision = [
+  {
+    id: 'reject-refuse',
+    title: '同意 驳回 拒绝',
+  },
+  {
+    id: 'reject',
+    title: '同意 驳回',
+  },
+  {
+    id: 'refuse',
+    title: '同意 拒绝',
+  },
+]
+// 可驳回至
+const reject = [
+  {
+    id: 'change',
+    title: '单据修改',
+  },
+]
+// 驳回修改数据
+const rejectChangeData = [
+  {
+    id: 'all',
+    title: '重新按流程走',
+  },
+  {
+    id: 'part',
+    title: '送至驳回节点',
+  },
+]
+// 审批结果通知发起人
+const messageData = [
+  {
+    id: 'yes',
+    title: '是',
+  },
+  {
+    id: 'no',
+    title: '否',
+  },
+]
+const rules = reactive<FormRules>({
+  selectDecision: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  rejectTo: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  changeData: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  isMessage: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+})
+
+// 关闭
+const close = () => {
+  emits('close')
+}
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 调保存接口
+    }
+    else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+// 选择决策项
+const changeDecision = (value: string) => {
+  form.value.selectDecision = value
+}
+const changeRejectTo = (value: string) => {
+  form.value.rejectTo = value
+}
+const changeData = (value: string) => {
+  form.value.changeData = value
+}
+const changeMessage = (value: string) => {
+  form.value.isMessage = value
+}
+</script>
+
+<template>
+  <div class="edit-process">
+    <h5 class="title">
+      流程编辑
+    </h5>
+    <div class="edit">
+      <div class="button-area">
+        <el-button type="primary" @click="save(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="primary" @click="close">
+          关闭
+        </el-button>
+      </div>
+      <el-form ref="ruleFormRef" :model="form" label-width="140px" :rules="rules">
+        <el-form-item label="流程编号">
+          {{ form.number }}
+        </el-form-item>
+        <el-form-item label="流程名称">
+          {{ form.name }}
+        </el-form-item>
+        <el-form-item label="关联业务">
+          {{ form.business }}
+        </el-form-item>
+        <el-form-item label="流程描述">
+          <el-input v-model="form.desc" type="textarea" />
+        </el-form-item>
+        <el-form-item label="可选决策项" prop="selectDecision">
+          <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+            <el-option
+              v-for="item in decision"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+          <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+            <el-option
+              v-for="item in reject"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+          <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+            <el-option
+              v-for="item in rejectChangeData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批结果通知发起人" prop="isMessage">
+          <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+            <el-option
+              v-for="item in messageData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <h5 class="title">
+      流程配置
+    </h5>
+    <div class="set edit" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .edit-process {
+    width: 100%;
+
+    .title {
+      margin: 0;
+    }
+
+    .edit {
+      width: 100%;
+      padding: 12px;
+      background-color: #fff;
+      border-radius: 7px;
+      margin: 20px 0;
+
+      .button-area {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+    }
+
+    .set {
+      height: 200px;
+    }
+  }
+</style>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 554c264..7b12a6a 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -9,3 +9,14 @@
   offset: number
   limit: number
 }
+
+export interface Iform {
+  number: string // 编号
+  name: string // 名称
+  business: string // 关联业务
+  desc?: string // 流程描述
+  selectDecision: string // 选择的决策
+  rejectTo?: string // 可驳回至
+  changeData?: string // 驳回修改数据
+  isMessage: string // 审批结果通知发起人
+}
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 84319b8..f248fe7 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -3,9 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
+import EditProcess from './editProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
 
 const { proxy } = getCurrentInstance() as any
+const active = ref('main')
 const listQuery: IlistQuery = reactive({
   number: '', // 编号
   name: '', // 名称
@@ -104,90 +106,128 @@
   }
   fetchData(true)
 }
+
+// 重置
+const reset = () => {
+  console.log('点击重置')
+}
+// 编辑
+const edit = (row: IlistQuery) => {
+  console.log('编辑')
+  active.value = 'edit'
+}
+// 详情
+const detail = (row: IlistQuery) => {
+  console.log('查看详情')
+  active.value = 'detail'
+}
+// 废止
+const abolish = (row: IlistQuery) => {
+  console.log('废止')
+}
+// 删除
+const del = (row: IlistQuery) => {
+  console.log('删除')
+}
+// 编辑页面点击关闭
+const close = () => {
+  active.value = 'main'
+}
 </script>
 
 <template>
   <div class="process">
     <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.number"
-            placeholder="流程编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.name"
-            placeholder="流程名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.business"
-            placeholder="关联业务"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.status"
-            placeholder="当前流程状态"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.person"
-            placeholder="流程负责人"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.time"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="创建时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-            重置
-          </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="200" align="center">
-            <template #default="scope">
-              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                详情
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                废止
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <!-- 主页面 -->
+      <div v-if="active === 'main'">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.number"
+              placeholder="流程编号"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.name"
+              placeholder="流程名称"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.business"
+              placeholder="关联业务"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.status"
+              placeholder="当前流程状态"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.person"
+              placeholder="流程负责人"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.time"
+              type="datetime"
+              value-format="YYYY/MM/DD HH:mm:ss"
+              placeholder="创建时间"
+            />
+          </search-item>
+          <template #btns>
+            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+              重置
+            </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="200" align="center">
+              <template #default="scope">
+                <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                  编辑
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                  详情
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                  废止
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+      <!-- 编辑 -->
+      <div v-if="active === 'edit'">
+        <edit-process @close="close" />
+      </div>
+      <!-- 详情 -->
+      <div v-if="active === 'detail'">
+        详情
+      </div>
     </app-container>
   </div>
 </template>
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>
 

diff --git a/.eslintrc b/.eslintrc
index 5c6806e..72e93a1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,7 @@
     "curly": ["error", "all"],
     "no-tabs":"off",
     "no-const-assign": "off",
+    "no-console": "off",
     "vue/component-name-in-template-casing": ["error", "kebab-case", {
       "registeredComponentsOnly": false,
       "ignores": []
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 1271d43..113d712 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -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/listArea.vue b/src/views/system/area/listArea.vue
index 7b4c159..335a6fb 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -1,9 +1,12 @@
 <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 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({
@@ -13,7 +16,8 @@
   sort: '',
   order: '',
 }) // 筛选条件
-const columns: any = [
+const columns: Ref<TableColumn[]> = ref([])
+columns.value = [
   {
     text: '区域名称',
     value: 'areaName',
@@ -40,7 +44,7 @@
     width: 80,
     align: 'center',
   },
-]// 显示列
+]
 const list = ref([]) // 列表数据
 const total = ref(0)// 数据总数
 const listLoading = ref(true)// 加载动画
@@ -73,11 +77,6 @@
   fetchData(true)// 获取数据
 })
 
-// 打开详情对话框
-const detail = (row: any) => {
-  // detailwell.initDialog(true, row)
-}
-
 // 新增区域
 const add = () => {
   dialogFormVisible.value = true
@@ -118,7 +117,7 @@
   fetchData(false)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-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/list.log.vue b/src/views/system/log/list.log.vue
deleted file mode 100644
index 5accccb..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 4b7c501..7607022 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..eb10497
--- /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 429e18c..22c649d 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/notice/note.list.vue b/src/views/system/notice/note.list.vue
index 61dd8e9..dd1d289 100644
--- a/src/views/system/notice/note.list.vue
+++ b/src/views/system/notice/note.list.vue
@@ -3,7 +3,9 @@
 import { Delete } from '@element-plus/icons-vue'
 import tableHeader from './table.header.vue'
 import addNotice from './noteAdd.vue'
-import { addNoticeApi, getNoticeeApi } from '@/api/system/notice'
+import noticeDetail from './noticeDetail.vue'
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -79,6 +81,11 @@
 const add = () => {
   addDialog.value.initDialog()
 }
+const detailDialog = ref() // 详情组件弹窗
+// 详情
+const detail = (row: noticeType) => {
+  detailDialog.value.initDialog(row)
+}
 onMounted(() => {
   getNoticeList()
 })
@@ -86,7 +93,7 @@
 
 <template>
   <!-- 布局 -->
-  <AppContainer>
+  <app-container>
     <!-- 筛选条件 -->
     <search-area @search="search">
       <search-item>
@@ -96,12 +103,16 @@
         <el-input v-model.trim="searchQuery.noticeTitle" placeholder="请输入标题" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
-        <el-input v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
-          class="w-50 m-2 normal-input" />
+        <el-input
+          v-model.trim="searchQuery.noticePublisher" placeholder="请输入发布人" clearable
+          class="w-50 m-2 normal-input"
+        />
       </search-item>
       <search-item>
-        <el-date-picker v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间" />
+        <el-date-picker
+          v-model="searchQuery.noticeTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+          placeholder="发布时间"
+        />
       </search-item>
       <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -110,16 +121,24 @@
       </template>
     </search-area>
     <!-- 表头区域 -->
-    <tableHeader title="数据列表">
+    <table-header title="数据列表">
       <template #btns>
-        <el-button type="primary" @click="add">新建</el-button>
-        <el-button type="primary">导出</el-button>
-        <el-button type="primary">打印</el-button>
+        <el-button type="primary" @click="add">
+          新建
+        </el-button>
+        <el-button type="primary">
+          导出
+        </el-button>
+        <el-button type="primary">
+          打印
+        </el-button>
       </template>
-    </tableHeader>
+    </table-header>
     <!-- 表格区域 -->
-    <normal-table :data="list" :total="total" :columns="columns as any" :query="searchQuery"
-      :list-loading="loadingTable" @change="changePage">
+    <normal-table
+      :data="list" :total="total" :columns="columns as any" :query="searchQuery"
+      :list-loading="loadingTable" @change="changePage"
+    >
       <template #preColumns>
         <el-table-column label="#" width="55" align="center">
           <template #default="scope">
@@ -129,16 +148,17 @@
       </template>
       <template #columns>
         <el-table-column label="操作" align="center" width="80">
-          <template #default="scope">
-            <el-button>
+          <template #default="{ row }">
+            <el-button @click="detail(row)">
               查看
             </el-button>
           </template>
         </el-table-column>
       </template>
     </normal-table>
-    <addNotice @reset-data="getNoticeList" ref="addDialog" />
-  </AppContainer>
+    <add-notice ref="addDialog" @reset-data="getNoticeList" />
+    <notice-detail ref="detailDialog" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index f59f470..e6e6204 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -1,5 +1,5 @@
 <!-- 新增通知公告弹窗 -->
-<script lang="ts" setup>
+<script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
new file mode 100644
index 0000000..a9a3b29
--- /dev/null
+++ b/src/views/system/notice/noticeDetail.vue
@@ -0,0 +1,107 @@
+<!-- 通知公告详情弹窗 -->
+<script lang="ts" setup name="noticeDetail">
+import type { noticeType } from './notice_interface'
+import { getNoticeeApi } from '@/api/system/notice'
+const ruleForm = reactive({
+  noticeNo: '', // 通知公告编号
+  noticePublisher: '', // 发布人
+  noticeCompany: '', // 发布单位
+  noticeTime: '', // 发布时间
+  noticeSketch: '', // 内容简述
+  noticeContent: '', // 发布内容
+  minioFileName: '', // 上传文件名
+  noticeTitle: '', // 标题
+}) // 表单
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const baseUrl = 'http://111.198.10.15:21409' + '/static/'
+// 弹窗初始化
+const initDialog = (row: noticeType) => {
+  dialogVisible.value = true
+  // 获取详情信息
+  getNoticeeApi({
+    noticeNo: row.noticeNo,
+    noticePublisher: row.noticePublisher,
+    noticeTime: row.noticeTime,
+    noticeTitle: row.noticeTitle,
+  }).then((res) => {
+    if (res.code === 200 && res.data.rows.length) {
+      ruleForm.noticeNo = res.data.rows[0].noticeNo
+      ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+      ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+      ruleForm.noticeTime = res.data.rows[0].noticeTime
+      ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+      ruleForm.noticeContent = res.data.rows[0].noticeContent
+      ruleForm.minioFileName = res.data.rows[0].minioFileName
+      ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+    }
+  })
+  // ruleForm.noticePublisher = userInfo.$state.name
+  // ruleForm.noticeCompany = userInfo.$state.deptName
+  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
+}
+defineExpose({ initDialog })
+// 提交
+const submitForm = () => {
+  dialogVisible.value = false
+}
+// 取消
+// const resetForm = () => {
+//   dialogVisible.value = false
+// }
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="详情" width="50%" append-to-body>
+    <el-form label-position="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通知公告编号" prop="noticeNo">
+            <el-input :value="ruleForm.noticeNo" placeholder="" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布人" prop="noticePublisher">
+            <el-input v-model.trim="ruleForm.noticePublisher" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="发布单位" prop="noticeCompany">
+            <el-input v-model.trim="ruleForm.noticeCompany" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="noticeTime">
+            <el-input v-model.trim="ruleForm.noticeTime" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="标题" prop="noticeTime">
+        <el-input v-model.trim="ruleForm.noticeTitle" disabled />
+      </el-form-item>
+      <el-form-item label="内容简述" prop="noticeSketch">
+        <el-input v-model.trim="ruleForm.noticeSketch" disabled />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="noticeContent">
+        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" disabled />
+      </el-form-item>
+      <el-form-item label="查看附件">
+        <el-link v-if="ruleForm.minioFileName" :href=" baseUrl + ruleForm.minioFileName" type="primary" target="_blank">
+          附件
+        </el-link>
+        <span v-else>暂无附件</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">
+          确认
+        </el-button>
+        <!-- <el-button @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="ts" scoped></style>
diff --git a/src/views/system/notice/notice_interface.ts b/src/views/system/notice/notice_interface.ts
new file mode 100644
index 0000000..a1fc349
--- /dev/null
+++ b/src/views/system/notice/notice_interface.ts
@@ -0,0 +1,12 @@
+// 通知公告信息类型
+export interface noticeType {
+  id: number //	主键id（列表接口参数）
+  minioFileName: string //	上传文件返回名称	string
+  noticeCompany: string //	发布单位	string
+  noticeContent: string //	发布内容	string
+  noticeNo: string // 	通知公告编号	string
+  noticePublisher: string //	发布人	string
+  noticeSketch: string //	内容简述	string
+  noticeTime: string //	发布时间	string
+  noticeTitle: string //	通知公告标题	string
+}
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
new file mode 100644
index 0000000..4a92993
--- /dev/null
+++ b/src/views/system/process/editProcess.vue
@@ -0,0 +1,229 @@
+<!-- 编辑流程页面 -->
+<script lang="ts" setup name="EditProcess">
+import { reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
+import type { Ref } from 'vue'
+import type { Iform } from './process'
+const emits = defineEmits(['close'])
+const ruleFormRef = ref<FormInstance>()
+const form: Ref<Iform> = ref({
+  number: '', // 编号
+  name: '', // 名称
+  business: '', // 关联业务
+  desc: '', // 流程描述
+  selectDecision: '', // 选择的决策
+  rejectTo: '', // 可驳回至
+  changeData: '', // 驳回修改数据
+  isMessage: '', // 审批结果通知发起人
+})
+// 可选决策项
+const decision = [
+  {
+    id: 'reject-refuse',
+    title: '同意 驳回 拒绝',
+  },
+  {
+    id: 'reject',
+    title: '同意 驳回',
+  },
+  {
+    id: 'refuse',
+    title: '同意 拒绝',
+  },
+]
+// 可驳回至
+const reject = [
+  {
+    id: 'change',
+    title: '单据修改',
+  },
+]
+// 驳回修改数据
+const rejectChangeData = [
+  {
+    id: 'all',
+    title: '重新按流程走',
+  },
+  {
+    id: 'part',
+    title: '送至驳回节点',
+  },
+]
+// 审批结果通知发起人
+const messageData = [
+  {
+    id: 'yes',
+    title: '是',
+  },
+  {
+    id: 'no',
+    title: '否',
+  },
+]
+const rules = reactive<FormRules>({
+  selectDecision: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  rejectTo: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  changeData: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+  isMessage: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: 'change',
+    },
+  ],
+})
+
+// 关闭
+const close = () => {
+  emits('close')
+}
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      // 调保存接口
+    }
+    else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+// 选择决策项
+const changeDecision = (value: string) => {
+  form.value.selectDecision = value
+}
+const changeRejectTo = (value: string) => {
+  form.value.rejectTo = value
+}
+const changeData = (value: string) => {
+  form.value.changeData = value
+}
+const changeMessage = (value: string) => {
+  form.value.isMessage = value
+}
+</script>
+
+<template>
+  <div class="edit-process">
+    <h5 class="title">
+      流程编辑
+    </h5>
+    <div class="edit">
+      <div class="button-area">
+        <el-button type="primary" @click="save(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="primary" @click="close">
+          关闭
+        </el-button>
+      </div>
+      <el-form ref="ruleFormRef" :model="form" label-width="140px" :rules="rules">
+        <el-form-item label="流程编号">
+          {{ form.number }}
+        </el-form-item>
+        <el-form-item label="流程名称">
+          {{ form.name }}
+        </el-form-item>
+        <el-form-item label="关联业务">
+          {{ form.business }}
+        </el-form-item>
+        <el-form-item label="流程描述">
+          <el-input v-model="form.desc" type="textarea" />
+        </el-form-item>
+        <el-form-item label="可选决策项" prop="selectDecision">
+          <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
+            <el-option
+              v-for="item in decision"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
+          <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
+            <el-option
+              v-for="item in reject"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
+          <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
+            <el-option
+              v-for="item in rejectChangeData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批结果通知发起人" prop="isMessage">
+          <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
+            <el-option
+              v-for="item in messageData"
+              :key="item.id"
+              :label="item.title"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <h5 class="title">
+      流程配置
+    </h5>
+    <div class="set edit" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .edit-process {
+    width: 100%;
+
+    .title {
+      margin: 0;
+    }
+
+    .edit {
+      width: 100%;
+      padding: 12px;
+      background-color: #fff;
+      border-radius: 7px;
+      margin: 20px 0;
+
+      .button-area {
+        width: 100%;
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+    }
+
+    .set {
+      height: 200px;
+    }
+  }
+</style>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 554c264..7b12a6a 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -9,3 +9,14 @@
   offset: number
   limit: number
 }
+
+export interface Iform {
+  number: string // 编号
+  name: string // 名称
+  business: string // 关联业务
+  desc?: string // 流程描述
+  selectDecision: string // 选择的决策
+  rejectTo?: string // 可驳回至
+  changeData?: string // 驳回修改数据
+  isMessage: string // 审批结果通知发起人
+}
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 84319b8..f248fe7 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -3,9 +3,11 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
+import EditProcess from './editProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
 
 const { proxy } = getCurrentInstance() as any
+const active = ref('main')
 const listQuery: IlistQuery = reactive({
   number: '', // 编号
   name: '', // 名称
@@ -104,90 +106,128 @@
   }
   fetchData(true)
 }
+
+// 重置
+const reset = () => {
+  console.log('点击重置')
+}
+// 编辑
+const edit = (row: IlistQuery) => {
+  console.log('编辑')
+  active.value = 'edit'
+}
+// 详情
+const detail = (row: IlistQuery) => {
+  console.log('查看详情')
+  active.value = 'detail'
+}
+// 废止
+const abolish = (row: IlistQuery) => {
+  console.log('废止')
+}
+// 删除
+const del = (row: IlistQuery) => {
+  console.log('删除')
+}
+// 编辑页面点击关闭
+const close = () => {
+  active.value = 'main'
+}
 </script>
 
 <template>
   <div class="process">
     <app-container>
-      <!-- 筛选条件 -->
-      <search-area @search="search">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.number"
-            placeholder="流程编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.name"
-            placeholder="流程名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.business"
-            placeholder="关联业务"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.status"
-            placeholder="当前流程状态"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.person"
-            placeholder="流程负责人"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.time"
-            type="datetime"
-            value-format="YYYY/MM/DD HH:mm:ss"
-            placeholder="创建时间"
-          />
-        </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-            重置
-          </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="200" align="center">
-            <template #default="scope">
-              <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                详情
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                废止
-              </el-button>
-              <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <!-- 主页面 -->
+      <div v-if="active === 'main'">
+        <!-- 筛选条件 -->
+        <search-area @search="search">
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.number"
+              placeholder="流程编号"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.name"
+              placeholder="流程名称"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.business"
+              placeholder="关联业务"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.status"
+              placeholder="当前流程状态"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-input
+              v-model.trim="listQuery.person"
+              placeholder="流程负责人"
+              clearable
+            />
+          </search-item>
+          <search-item>
+            <el-date-picker
+              v-model="listQuery.time"
+              type="datetime"
+              value-format="YYYY/MM/DD HH:mm:ss"
+              placeholder="创建时间"
+            />
+          </search-item>
+          <template #btns>
+            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+              重置
+            </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="200" align="center">
+              <template #default="scope">
+                <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                  编辑
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                  详情
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                  废止
+                </el-button>
+                <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+      <!-- 编辑 -->
+      <div v-if="active === 'edit'">
+        <edit-process @close="close" />
+      </div>
+      <!-- 详情 -->
+      <div v-if="active === 'detail'">
+        详情
+      </div>
     </app-container>
   </div>
 </template>
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>
 
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 8f86f10..6c9c338 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="SystemDictListDict">
-import { ElButton, ElCard, ElDatePicker, ElInput, ElMessage, ElMessageBox, ElRadio, ElTableColumn, ElTag, ElTree } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { Delete, EditPen, Key, MagicStick, Plus } from '@element-plus/icons-vue'
 import type { Ref } from 'vue'
 import type { IlistQueryType, TreeStructure, changePageType, userType } from './user-interface'