diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
new file mode 100644
index 0000000..3226635
--- /dev/null
+++ b/src/views/system/tenant/editTenant.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup name="EditTenant">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IdeviceForm } from './tenant_interface'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+import { addTenant, getDevice, updateTenant } from '@/api/system/tenant'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const dialogStatus = ref('') // 对话框类型：create,update,detail
+const deptShowTop = ref(false)
+// 对话框标题
+const textMap = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+  makeDep: '绑定组织',
+}
+// 表单内容
+let deviceForm: IdeviceForm = reactive({
+  id: '', // 主键
+  tenantCode: '', // 项目编码
+  tenantName: '', // 项目名称
+  linkPerson: '', // 联系人
+  tel: '', // 联系电话
+  clearday: '', // 清除时间
+})
+// 表单校验规则
+const rules = {
+  tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+  tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  deviceForm = {
+    tenantCode: '',
+    tenantName: '',
+    linkPerson: '',
+    tel: '',
+    clearday: '',
+    deptName: '',
+  }
+}
+// 父子组件通信
+const initDialog = (dialogStatus, row = null) => {
+  dialogFormVisible.value = true
+  dialogStatus.value = dialogStatus
+  if (dialogStatus === 'create') {
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
+    deviceForm = {
+      id: row.id,
+      tenantCode: row.tenantCode,
+      tenantName: row.tenantName,
+      linkPerson: row.linkPerson,
+      tel: row.tel,
+      clearday: row.clearday,
+    }
+  }
+}
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      updateTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      addTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model:visible="dialogFormVisible"
+    append-to-body
+    :title="textMap[dialogStatus]"
+  >
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearday">
+            <el-input
+              v-model="deviceForm.clearday"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <DeptSelect
+              v-model="deviceForm.deptName"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择权属单位"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div
+        v-show="dialogStatus === 'detail' ? false : true"
+        class="dialog-footer"
+      >
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
new file mode 100644
index 0000000..3226635
--- /dev/null
+++ b/src/views/system/tenant/editTenant.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup name="EditTenant">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IdeviceForm } from './tenant_interface'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+import { addTenant, getDevice, updateTenant } from '@/api/system/tenant'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const dialogStatus = ref('') // 对话框类型：create,update,detail
+const deptShowTop = ref(false)
+// 对话框标题
+const textMap = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+  makeDep: '绑定组织',
+}
+// 表单内容
+let deviceForm: IdeviceForm = reactive({
+  id: '', // 主键
+  tenantCode: '', // 项目编码
+  tenantName: '', // 项目名称
+  linkPerson: '', // 联系人
+  tel: '', // 联系电话
+  clearday: '', // 清除时间
+})
+// 表单校验规则
+const rules = {
+  tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+  tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  deviceForm = {
+    tenantCode: '',
+    tenantName: '',
+    linkPerson: '',
+    tel: '',
+    clearday: '',
+    deptName: '',
+  }
+}
+// 父子组件通信
+const initDialog = (dialogStatus, row = null) => {
+  dialogFormVisible.value = true
+  dialogStatus.value = dialogStatus
+  if (dialogStatus === 'create') {
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
+    deviceForm = {
+      id: row.id,
+      tenantCode: row.tenantCode,
+      tenantName: row.tenantName,
+      linkPerson: row.linkPerson,
+      tel: row.tel,
+      clearday: row.clearday,
+    }
+  }
+}
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      updateTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      addTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model:visible="dialogFormVisible"
+    append-to-body
+    :title="textMap[dialogStatus]"
+  >
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearday">
+            <el-input
+              v-model="deviceForm.clearday"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <DeptSelect
+              v-model="deviceForm.deptName"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择权属单位"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div
+        v-show="dialogStatus === 'detail' ? false : true"
+        class="dialog-footer"
+      >
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/system/tenant/list.tenant.vue b/src/views/system/tenant/list.tenant.vue
index f651ed0..c434b42 100644
--- a/src/views/system/tenant/list.tenant.vue
+++ b/src/views/system/tenant/list.tenant.vue
@@ -1,12 +1,160 @@
-<script lang="ts" setup name="SystemDictListDict">
-// 逻辑代码
+<script lang="ts" setup name="TenantList">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import RelateDept from './relateDept.vue'
+import EditTenant from './editTenant.vue'
+import type { IlistQuery } from './tenant_interface'
+import { delTenantSys, getTenantList } from '@/api/system/tenant'
+
+const normalTable = ref(null) as any
+const editTenant = ref(null) as any
+const relateDept = ref(null) as any
+
+// 查询条件
+const listQuery: IlistQuery = reactive({
+  tenantName: '',
+  offset: 1,
+  sort: 'id',
+  order: 'asc',
+})
+const columns = [
+  {
+    text: '项目编码',
+    value: 'tenantCode',
+    align: 'center',
+  },
+  {
+    text: '项目名称',
+    value: 'tenantName',
+    align: 'center',
+  },
+  {
+    text: '项目联系人',
+    value: 'linkPerson',
+    align: 'center',
+  },
+  {
+    text: '联系人电话',
+    value: 'tel',
+    align: 'center',
+  },
+  {
+    text: '历史数据保存天数',
+    value: 'clearday',
+    align: 'center',
+  },
+  {
+    text: '关联组织',
+    value: 'deptName',
+    align: 'center',
+  },
+] // 显示列
+const listLoading = ref(false)
+const deviceModelList = ref([]) // 设备类型列表
+const list = ref([]) // 表格数据列表
+// 是否需要序号列
+const options = reactive({
+  needIndex: false,
+})
+
+// 获取数据列表
+const fetchData = () => {
+  listLoading.value = true
+  getTenantList(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
+}
+fetchData()
+
+onMounted(() => {
+  normalTable.value.initColumnsState(false)
+})
+
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除所选项目吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delTenantSys(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+// 新增
+const add = () => {
+  editTenant.value.initDialog('create')
+}
+// 修改
+const edit = (row) => {
+  editTenant.value.initDialog('update', row)
+}
+// 绑定组织
+const makeDep = (row) => {
+  relateDept.value.initDialog(row)
+}
 </script>
 
 <template>
-  <div>
-    <!-- 布局 -->
-    角色管理
-  </div>
+  <app-container>
+    <search-area
+      size="small"
+      @search="fetchData"
+    >
+      <!-- 一般查询条件 -->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          size="small"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template #btns>
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" width="140" align="center">
+          <template #default="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              关联组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditTenant ref="editTenant" @watchChild="fetchData" />
+    <RelateDept ref="relateDept" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
new file mode 100644
index 0000000..3226635
--- /dev/null
+++ b/src/views/system/tenant/editTenant.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup name="EditTenant">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IdeviceForm } from './tenant_interface'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+import { addTenant, getDevice, updateTenant } from '@/api/system/tenant'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const dialogStatus = ref('') // 对话框类型：create,update,detail
+const deptShowTop = ref(false)
+// 对话框标题
+const textMap = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+  makeDep: '绑定组织',
+}
+// 表单内容
+let deviceForm: IdeviceForm = reactive({
+  id: '', // 主键
+  tenantCode: '', // 项目编码
+  tenantName: '', // 项目名称
+  linkPerson: '', // 联系人
+  tel: '', // 联系电话
+  clearday: '', // 清除时间
+})
+// 表单校验规则
+const rules = {
+  tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+  tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  deviceForm = {
+    tenantCode: '',
+    tenantName: '',
+    linkPerson: '',
+    tel: '',
+    clearday: '',
+    deptName: '',
+  }
+}
+// 父子组件通信
+const initDialog = (dialogStatus, row = null) => {
+  dialogFormVisible.value = true
+  dialogStatus.value = dialogStatus
+  if (dialogStatus === 'create') {
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
+    deviceForm = {
+      id: row.id,
+      tenantCode: row.tenantCode,
+      tenantName: row.tenantName,
+      linkPerson: row.linkPerson,
+      tel: row.tel,
+      clearday: row.clearday,
+    }
+  }
+}
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      updateTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      addTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model:visible="dialogFormVisible"
+    append-to-body
+    :title="textMap[dialogStatus]"
+  >
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearday">
+            <el-input
+              v-model="deviceForm.clearday"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <DeptSelect
+              v-model="deviceForm.deptName"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择权属单位"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div
+        v-show="dialogStatus === 'detail' ? false : true"
+        class="dialog-footer"
+      >
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/system/tenant/list.tenant.vue b/src/views/system/tenant/list.tenant.vue
index f651ed0..c434b42 100644
--- a/src/views/system/tenant/list.tenant.vue
+++ b/src/views/system/tenant/list.tenant.vue
@@ -1,12 +1,160 @@
-<script lang="ts" setup name="SystemDictListDict">
-// 逻辑代码
+<script lang="ts" setup name="TenantList">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import RelateDept from './relateDept.vue'
+import EditTenant from './editTenant.vue'
+import type { IlistQuery } from './tenant_interface'
+import { delTenantSys, getTenantList } from '@/api/system/tenant'
+
+const normalTable = ref(null) as any
+const editTenant = ref(null) as any
+const relateDept = ref(null) as any
+
+// 查询条件
+const listQuery: IlistQuery = reactive({
+  tenantName: '',
+  offset: 1,
+  sort: 'id',
+  order: 'asc',
+})
+const columns = [
+  {
+    text: '项目编码',
+    value: 'tenantCode',
+    align: 'center',
+  },
+  {
+    text: '项目名称',
+    value: 'tenantName',
+    align: 'center',
+  },
+  {
+    text: '项目联系人',
+    value: 'linkPerson',
+    align: 'center',
+  },
+  {
+    text: '联系人电话',
+    value: 'tel',
+    align: 'center',
+  },
+  {
+    text: '历史数据保存天数',
+    value: 'clearday',
+    align: 'center',
+  },
+  {
+    text: '关联组织',
+    value: 'deptName',
+    align: 'center',
+  },
+] // 显示列
+const listLoading = ref(false)
+const deviceModelList = ref([]) // 设备类型列表
+const list = ref([]) // 表格数据列表
+// 是否需要序号列
+const options = reactive({
+  needIndex: false,
+})
+
+// 获取数据列表
+const fetchData = () => {
+  listLoading.value = true
+  getTenantList(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
+}
+fetchData()
+
+onMounted(() => {
+  normalTable.value.initColumnsState(false)
+})
+
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除所选项目吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delTenantSys(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+// 新增
+const add = () => {
+  editTenant.value.initDialog('create')
+}
+// 修改
+const edit = (row) => {
+  editTenant.value.initDialog('update', row)
+}
+// 绑定组织
+const makeDep = (row) => {
+  relateDept.value.initDialog(row)
+}
 </script>
 
 <template>
-  <div>
-    <!-- 布局 -->
-    角色管理
-  </div>
+  <app-container>
+    <search-area
+      size="small"
+      @search="fetchData"
+    >
+      <!-- 一般查询条件 -->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          size="small"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template #btns>
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" width="140" align="center">
+          <template #default="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              关联组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditTenant ref="editTenant" @watchChild="fetchData" />
+    <RelateDept ref="relateDept" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/tenant/relateDept.vue b/src/views/system/tenant/relateDept.vue
new file mode 100644
index 0000000..d02c474
--- /dev/null
+++ b/src/views/system/tenant/relateDept.vue
@@ -0,0 +1,108 @@
+<script lang="ts" setup name="RelateDept">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { relatedDept } from '@/api/system/tenant'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const deptShowTop = ref(false)
+// 表单内容
+const dataForm = reactive({
+  tenantId: '',
+  deptId: '',
+})
+// 表单校验规则
+const rules = {
+  deptId: [{ required: true, message: '	组织机构必选', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  dataForm = {
+    tenantId: '',
+    deptId: '',
+  }
+}
+
+// 父子组件通信
+const initDialog = (row = null) => {
+  dialogFormVisible.value = true
+  if (row) {
+    dataForm = {
+      tenantId: row.id,
+      deptId: row.deptId,
+    }
+  }
+}
+// 保存数据
+const saveData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      relatedDept(dataForm).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            message: '绑定成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" append-to-body title="绑定组织">
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="绑定组织" prop="deptId">
+            <DeptSelect
+              v-model="dataForm.deptId"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择组织机构"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>

diff --git a/.env.development b/.env.development
index 6cb6c2e..b34f073 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,8 @@
 # 页面标题
 VITE_APP_TITLE = 后台基础框架
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-VITE_APP_API_BASEURL = http://111.198.10.15:11309
+# VITE_APP_API_BASEURL = http://111.198.10.15:11309
+VITE_APP_API_BASEURL = http://111.198.10.15:21409
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/.eslintrc b/.eslintrc
index 0b36062..5d9c01f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,8 @@
 {
   "extends": "@antfu",
   "rules": {
-    "curly": ["error", "all"]
+    "curly": ["error", "all"],
+    "no-tabs":"off",
+    "no-const-assign": "off"
   }
 }
diff --git a/src/api/system/area.ts b/src/api/system/area.ts
new file mode 100644
index 0000000..07a4c5f
--- /dev/null
+++ b/src/api/system/area.ts
@@ -0,0 +1,79 @@
+/**
+ * 区域管理接口
+ */
+import request from '../index'
+const prefix = 'sys'
+
+// 区域查询
+export function getAreaListPage(params: object) {
+  return request({
+    url: `${prefix}/area/listPage`,
+    method: 'get',
+    params,
+  })
+}
+
+// 根据部门找其默认区域
+export function getAreaByDept(deptid) {
+  return request({
+    url: 'config/getAreaByDept',
+    method: 'get',
+    params: {
+      deptId: deptid,
+    },
+  })
+}
+// 区域查询
+export function getAreaList(pid) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params: {
+      pid,
+    },
+  })
+}
+
+// 区域查询,非分页，加载树用
+export function getAreaTree(params) {
+  return request({
+    url: `${prefix}/area/list`,
+    method: 'get',
+    params,
+  })
+}
+// 区域类型查询
+export function getAreaType() {
+  return request({
+    url: `${prefix}/dict/code/levelType`,
+    method: 'get',
+  })
+}
+
+// 添加区域
+export function addArea(data) {
+  return request({
+    url: `${prefix}/area/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改区域机构
+export function updateArea(data) {
+  return request({
+    url: `${prefix}/area/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除区域机构
+export function delArea(id) {
+  return request({
+    url: `${prefix}/area/delete`,
+    method: 'post',
+    data: {
+      id,
+    },
+  })
+}
+
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index acb8fba..fb4a0e7 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -2,10 +2,11 @@
  * 日志管理接口
  */
 import request from '../index'
+const prefix = 'sys'
 // 操作日志查询
 export function getBizLogList(params) {
   return request({
-    url: 'sys/log/biz/list',
+    url: `${prefix}/log/biz/list`,
     method: 'get',
     params,
   })
@@ -13,14 +14,14 @@
 // 操作日志详情
 export function getBizLogDetail(id: string) {
   return request({
-    url: `sys/log/biz/detail/${id}`,
+    url: `${prefix}/log/biz/detail/${id}`,
     method: 'get',
   })
 }
 // 异常日志查询
 export function getErrorLogList(params) {
   return request({
-    url: 'sys/log/error/list',
+    url: `${prefix}/log/error/list`,
     method: 'get',
     params,
   })
@@ -28,14 +29,14 @@
 // 异常日志详情
 export function getErrorLogDetail(id: string) {
   return request({
-    url: `sys/log/error/detail/${id}`,
+    url: `${prefix}/log/error/detail/${id}`,
     method: 'get',
   })
 }
 // 日志类型查询
 export function getLogType() {
   return request({
-    url: 'sys/dict/code/logType',
+    url: `${prefix}/dict/code/logType`,
     method: 'get',
   })
 }
@@ -43,7 +44,7 @@
 // 删除业务日志
 export function delLog() {
   return request({
-    url: 'sys/log/biz/delLog',
+    url: `${prefix}/log/biz/delLog`,
     method: 'post',
   })
 }
@@ -51,7 +52,7 @@
 // 删除异常日志
 export function delErrorLog() {
   return request({
-    url: 'sys/log/error/delLog',
+    url: `${prefix}/log/error/delLog`,
     method: 'post',
   })
 }
@@ -59,7 +60,7 @@
 // 登录日志查询
 export function getLoginLogList(params) {
   return request({
-    url: 'sys/loginLog/list',
+    url: `${prefix}/loginLog/list`,
     method: 'get',
     params,
   })
@@ -67,7 +68,7 @@
 // 删除日志
 export function delLoginLog() {
   return request({
-    url: 'sys/loginLog/delLoginLog',
+    url: `${prefix}/loginLog/delLoginLog`,
     method: 'post',
   })
 }
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
new file mode 100644
index 0000000..386cd18
--- /dev/null
+++ b/src/api/system/tenant.ts
@@ -0,0 +1,55 @@
+/*
+ * 项目管理接口
+*/
+import qs from 'qs'
+import request from '../index'
+const prefix = 'sys'
+
+// 项目管理查询
+export function getTenantList(params: object) {
+  return request({
+    url: 'bus/tenant/list',
+    method: 'get',
+    params,
+  })
+}
+
+// 添加项目管理
+export function addTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改项目管理
+export function updateTenant(data: object) {
+  return request({
+    url: `${prefix}/tenant/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改项目管理
+export function relatedDept(data: object) {
+  return request({
+    url: 'bus/tenant/relateTenant',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除项目管理
+export function delTenantSys(ids: any) {
+  return request({
+    url: `${prefix}/tenant/delete`,
+    method: 'post',
+    params: {
+      ids,
+    },
+    paramsSerializer: (params) => {
+      return qs.stringify(params, { indices: false })
+    },
+  })
+}
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index f39f4b2..a7d1766 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -179,7 +179,7 @@
     meta: {
       title: '业务日志',
       icon: 'ep:key',
-      auth: '/sys/resource',
+      auth: '/sys/log/biz/list',
     },
     children: [
       {
@@ -188,7 +188,7 @@
         component: () => import('@/views/system/log/list.log.vue'),
         meta: {
           title: '业务日志',
-          auth: '/sys/resource',
+          auth: '/sys/log/biz/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -203,7 +203,7 @@
     meta: {
       title: '异常日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/log/error/list',
     },
     children: [
       {
@@ -212,7 +212,7 @@
         component: () => import('@/views/system/log/listErrorLog.vue'),
         meta: {
           title: '异常日志',
-          auth: '/sys/role',
+          auth: '/sys/log/error/list',
           sidebar: false,
           breadcrumb: true,
         },
@@ -227,7 +227,7 @@
     meta: {
       title: '登录日志',
       icon: 'ep:key',
-      auth: '/sys/role',
+      auth: '/sys/loginLog',
     },
     children: [
       {
@@ -236,7 +236,7 @@
         component: () => import('@/views/system/log/LoginLog.vue'),
         meta: {
           title: '登录日志',
-          auth: '/sys/role',
+          auth: '/sys/loginLog',
           sidebar: false,
           breadcrumb: true,
         },
diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue
new file mode 100644
index 0000000..a6ddd4c
--- /dev/null
+++ b/src/views/system/area/areaSelectTree.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup name="AreaSelectTree">
+import { reactive, ref } from 'vue'
+import type { IlistQuerySelectTree } from './area_interface'
+import { getAreaTree } from '@/api/system/area'
+
+const emits = defineEmits(['selectDone'])
+const dialogFormVisible = ref(false)
+const tree = ref(null) as any
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+  isLeaf: 'leaf',
+}
+const listQuery: IlistQuerySelectTree = reactive({
+  pid: '',
+})
+
+// 初始化对话框
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+
+// 加载数据
+const loadNode = (node, resolve) => {
+  if (node.data && node.data.id) {
+    listQuery.pid = node.data.id
+  }
+  getAreaTree(listQuery).then((response) => {
+    const data = response.data
+    resolve(data)
+  })
+}
+
+// 确认选择后的操作，传给父组件并关闭弹窗
+const confirmSelect = () => {
+  const node = tree.value.getCurrentNode()
+  dialogFormVisible.value = false
+  emits('selectDone', node)
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" custom-class="area-select-dialog" title="选择区域" append-to-body>
+    <el-scrollbar style="height: 400px;">
+      <el-tree
+        ref="tree"
+        :expand-on-click-node="false"
+        :props="defaultProps"
+        :load="loadNode"
+        node-key="id"
+        lazy
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">
+          确定
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss">
+  .area-select-dialog {
+    width: 400px;
+
+    .el-scrollbar__wrap {
+      overflow-x: hidden !important;
+    }
+  }
+</style>
diff --git a/src/views/system/area/area_interface.ts b/src/views/system/area/area_interface.ts
new file mode 100644
index 0000000..627a360
--- /dev/null
+++ b/src/views/system/area/area_interface.ts
@@ -0,0 +1,21 @@
+export interface IlistQuery {
+  keywords: string
+  offset: number
+  limit: number
+  sort: string
+  order: string
+}
+
+export interface IareaForm {
+  id: string // 编号
+  pid: string // 父级编号
+  pName: string // 父级名称
+  areaName: string // 区域名
+  simpleName: string // 别名，
+  level: string
+  num: number // 排序
+}
+
+export interface IlistQuerySelectTree {
+  pid: string
+}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
new file mode 100644
index 0000000..799120c
--- /dev/null
+++ b/src/views/system/area/editArea.vue
@@ -0,0 +1,238 @@
+<script lang="ts" setup name="EditArea">
+import { computed, nextTick, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import AreaSelectTree from './areaSelectTree.vue'
+import type { IareaForm } from './area_interface'
+import { toTreeList } from '@/utils/structure'
+import { addArea, getAreaType, updateArea } from '@/api/system/area'
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const areaSelect = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const isEditMode = ref(true)
+let areaForm: IareaForm = reactive ({
+  id: '', // 编号
+  pid: '', // 父级编号
+  pName: '', // 父级名称
+  areaName: '', // 区域名
+  simpleName: '', // 别名，
+  level: '',
+  num: 99, // 排序
+}) // 表单
+const areaSelectShow = ref(false)
+const areaLevelList = ref([]) // 区域树列表数据
+const textMap = {
+  update: '编辑',
+  create: '新增',
+} // 表头显示标题
+const btnLoading = ref(false) // 保存按钮的加载中状态
+const rules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+  simpleName: [{ required: true, message: '区域简称不能为空', trigger: ['blur', 'change'] }],
+  pName: [{ required: true, message: '上级区域必选', trigger: ['blur', 'change'] }],
+  level: [{ required: true, message: '区域等级必选', trigger: ['blur', 'change'] }],
+  num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
+} // 前端校验规则
+
+const areaTree = computed(() => {
+  const tree = toTreeList(areaTreeList)
+  return tree
+})
+// 重置表单
+const resetForm = () => {
+  areaForm = {
+    id: '', // 编号
+    pid: '', // 父级编号
+    pName: '', // 父级名称
+    areaName: '', // 区域名
+    simpleName: '', // 别名，
+    level: '',
+    num: 99, // 排序
+  }
+}
+// 获取区域类型
+const fetchAreaType = () => {
+  getAreaType().then((response) => {
+    areaLevelList.value = response.data
+  })
+}
+
+fetchAreaType()
+// 初始化对话框
+
+const initDialog = (dialogStatus, row = null) => {
+  dialogStatus.value = dialogStatus
+  dialogFormVisible.value = true
+  btnLoading.value = false
+  if (dialogStatus === 'create') { // 如果是新增，清除验证
+    resetForm()
+    isEditMode.value = false
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+    areaForm = {
+      id: row.id, // 编号
+      pid: row.pid, // 父级编号
+      pName: row.pName, // 父级编号
+      areaName: row.areaName, // 区域名
+      simpleName: row.simpleName, // 别名，
+      level: `${row.level}`,
+      num: row.num, // 排序
+    }
+    isEditMode.value = true
+  }
+}
+
+// 打开区域选择弹窗
+const openAreaSelect = () => {
+  areaSelectShow.value = true
+  setTimeout(areaSelect.value.initDialog(), 200)
+}
+
+// 修改pid
+const changeParent = (node) => {
+  areaForm.pid = node.id
+  areaForm.pName = node.name
+}
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      addArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
+            confirmButtonText: '是',
+            cancelButtonText: '否',
+            type: 'info',
+          }).then(() => { // 选是
+            resetForm()
+            btnLoading.value = false
+            nextTick(() => {
+              dataFormRef.value.clearValidate()
+            })
+          }).catch(() => { // 选否,关闭窗口，并刷新页面
+            emits('watchChild')
+            dialogFormVisible.value = false
+          })
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      btnLoading.value = true
+      updateArea(areaForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+        btnLoading.value = false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+  // this.$emit('watchChild')
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model.trim="areaForm.areaName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域简称" prop="simpleName">
+            <el-input v-model.trim="areaForm.simpleName" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域编码" prop="id">
+            <el-input v-model.trim="areaForm.id" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上级区域" prop="pName">
+            <el-input :value="areaForm.pName" type="text" placeholder="必选" @focus="openAreaSelect" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="区域等级" prop="level">
+            <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option
+                v-for="item in areaLevelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="排序" prop="num">
+            <el-input-number v-model.number="areaForm.num" style="width: 100%;" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button :loading="btnLoading" type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+
+    <AreaSelectTree ref="areaSelect" @selectDone="changeParent" />
+  </el-dialog>
+</template>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/area/list.area.vue b/src/views/system/area/list.area.vue
index e620b3d..d071f14 100644
--- a/src/views/system/area/list.area.vue
+++ b/src/views/system/area/list.area.vue
@@ -1,14 +1,169 @@
-<script lang="ts" setup name="SystemAreaList">
-// 逻辑代码
+<script lang="ts" setup name="ListArea">
+import { computed, onActivated, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IlistQuery } from './area_interface'
+import EditArea from './editArea.vue'
+import { delArea, getAreaListPage } from '@/api/system/area'
+const { proxy } = getCurrentInstance() as any
+const editarea = ref(null) as any
+const listQuery: IlistQuery = reactive({
+  keywords: '',
+  offset: 1,
+  limit: 20,
+  sort: '',
+  order: '',
+}) // 筛选条件
+const columns = [
+  {
+    text: '区域名称',
+    value: 'areaName',
+    align: 'center',
+  },
+  {
+    text: '区域编码',
+    value: 'id',
+    align: 'center',
+  },
+  {
+    text: '区域等级',
+    value: 'levelName',
+    align: 'center',
+  },
+  {
+    text: '所属区域',
+    value: 'pName',
+    align: 'center',
+  },
+  {
+    text: '区域排序',
+    value: 'num',
+    width: 80,
+    align: 'center',
+  },
+]// 显示列
+const list = ref([]) // 列表数据
+const total = ref(0)// 数据总数
+const listLoading = ref(true)// 加载动画
+const fullscreenLoading = ref(false) // 全屏加载动画
+const dialogFormVisible = ref(false) // 是否显示编辑框
+
+// 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+const showOperate = computed(() => {
+  return proxy.hasPerm('/sys/area/update') || proxy.hasPerm('/sys/area/delete')
+})
+
+// 获取区域数据
+const fetchData = (isNowPage: boolean) => {
+  listLoading.value = true
+  if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getAreaListPage(listQuery).then((response) => {
+    if (response.code === 200) {
+      list.value = response.data.rows
+      total.value = parseInt(response.data.total)
+      listLoading.value = false
+    }
+  })
+}
+
+fetchData(true)// 获取数据
+
+onActivated(() => {
+  fetchData(true)// 获取数据
+})
+
+// 打开详情对话框
+const detail = (row) => {
+  editarea.value.detailwell.initDialog(true, row)
+}
+
+// 新增区域
+const add = () => {
+  dialogFormVisible.value = true
+  editarea.value.editarea.initDialog('create')
+}
+
+// 编辑区域信息
+const edit = (row) => {
+  dialogFormVisible.value = true
+  // editShow = true
+  editarea.value.editarea.initDialog('update', row)
+}
+// 删除区域
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除区域吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delArea(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData(true)
+}
 </script>
 
 <template>
-  <AppContainer>
-    <div>
-      <!-- 布局 -->
-      区域管理
-    </div>
-  </AppContainer>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="区域名称/编码" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template #default="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+          <template #default="scope">
+            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditArea v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/dict/list.dict.vue b/src/views/system/dict/list.dict.vue
index 2730e6c..f84accc 100644
--- a/src/views/system/dict/list.dict.vue
+++ b/src/views/system/dict/list.dict.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup name="SystemDictList">
 import type { Ref } from 'vue'
-import { computed, getCurrentInstance, reactive, ref } from 'vue'
-import { ElButton, ElInput, ElMessage, ElMessageBox, ElOption, ElSelect, ElTable, ElTableColumn } from 'element-plus'
-import { Plus, Switch } from '@element-plus/icons-vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElButton, ElInput, ElMessage, ElMessageBox, ElTableColumn } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
 import type { DictListInfo } from './dict_interface'
 import SystemEditDict from './edit.dict.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { delDict, getDictList } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 
 const { proxy } = getCurrentInstance() as any
 
@@ -33,10 +32,9 @@
 const columns: Ref<TableColumn[]> = ref([])
 columns.value = [
   { text: '字典名称', value: 'name', width: 180, align: 'center' },
-  { text: '字典编码', value: 'code', width: 130, align: 'center' },
+  { text: '字典编码', value: 'code', width: 180, align: 'center' },
   { text: '字典描述', value: 'tips', width: 180, align: 'center' },
   { text: '字典详情', value: 'detail', align: 'center' },
-  { text: '字典排序', value: 'num', width: 80, align: 'center' },
 ]
 // 数据列表
 const list: Ref<DictListInfo[]> = ref([])
@@ -82,6 +80,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+
 onMounted(() => {
   fetchData()
 })
@@ -100,7 +109,7 @@
           新增
         </ElButton>
       </template>
-      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false">
+      <NormalTable :query="listQuery" :loading="loading" :columns="columns" :data="list" :total="total" :border="false" @change="changePage">
         <template #columns>
           <ElTableColumn v-if="proxy.hasPerm('/sys/dict/update') || proxy.hasPerm('/sys/dict/delete')" label="操作" width="140" align="center">
             <template #default="scope">
diff --git a/src/views/system/log/list.log.vue b/src/views/system/log/list.log.vue
index 3ada883..4d40eef 100644
--- a/src/views/system/log/list.log.vue
+++ b/src/views/system/log/list.log.vue
@@ -1,6 +1,7 @@
 <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,
@@ -118,15 +119,14 @@
 </script>
 
 <template>
-  <div>
+  <div class="list-log">
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
-      <search-area size="small" @search="search">
+      <search-area @search="search">
         <search-item>
           <el-input
             v-model.trim="listQuery.keywords"
-            size="small"
             placeholder="日志名称"
             clearable
           />
@@ -135,8 +135,7 @@
           <el-date-picker
             v-model="listQuery.beginTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择开始时间"
           />
         </search-item>
@@ -144,8 +143,7 @@
           <el-date-picker
             v-model="listQuery.endTime"
             type="datetime"
-            size="small"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="YYYY/MM/DD HH:mm:ss"
             placeholder="选择结束时间"
           />
         </search-item>
@@ -153,9 +151,8 @@
           <el-button
             v-if="proxy.hasPerm('/sys/log/biz/delLog')"
             class="filter-item"
-            size="small"
             type="info"
-            icon="el-icon-delete"
+            :icon="Delete"
             @click="cleanAll"
           >
             清空日志
@@ -194,3 +191,15 @@
   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 b17e2c3..afd1ee7 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup name="LoginLog">
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistQueryError } from './log_interface'
+import { Delete } from '@element-plus/icons-vue'
+import type { IlistQuery } from './log_interface'
 import {
   delErrorLog,
   getErrorLogDetail,
   getErrorLogList,
 } from '@/api/system/log'
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQueryError = reactive({
+const listQuery: IlistQuery = reactive({
   keywords: '', // 日志名称
   beginTime: '', // 开始时间
   endTime: '', // 结束时间
@@ -90,58 +91,57 @@
 </script>
 
 <template>
-  <app-container>
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/log/error/delLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-icon-delete"
-          @click="cleanAll"
-        >
-          清空日志
-        </el-button>
-      </template>
-    </search-area>
-    <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 type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-  </app-container>
+  <div class="list-erroe-log">
+    <app-container>
+      <search-area @search="search">
+        <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/error/delLog')"
+            class="filter-item"
+            type="info"
+            :icon="Delete"
+            @click="cleanAll"
+          >
+            清空日志
+          </el-button>
+        </template>
+      </search-area>
+      <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 type="text" size="small" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </app-container>
+  </div>
 </template>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -149,3 +149,16 @@
   width: 800px;
 }
 </style>
+
+<style lang="scss">
+  .list-erroe-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/log/log_interface.ts b/src/views/system/log/log_interface.ts
index 9269bdd..09be72c 100644
--- a/src/views/system/log/log_interface.ts
+++ b/src/views/system/log/log_interface.ts
@@ -2,18 +2,7 @@
   keywords: string
   beginTime: string
   endTime: string
-  // logType: '业务日志',
-  offset: number
-  limit: number
-  sort: string
-  order: string
-}
-
-export interface IlistQueryError {
-  keywords: string
-  beginTime: string
-  endTime: string
-  logType: string
+  logType?: string
   offset: number
   limit: number
   sort: string
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 068b97b..0f40674 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="LoginLog">
 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 { delLoginLog, getLoginLogList } from '@/api/system/log'
+
 const { proxy } = getCurrentInstance() as any
-const listQuery: IlistQuery = {
+const listQuery: IlistQuery = reactive({
   keywords: '',
   beginTime: '',
   endTime: '',
@@ -12,7 +14,7 @@
   limit: 20,
   sort: '',
   order: '',
-}
+})
 const columns = [
   {
     text: '日志名称',
@@ -105,56 +107,67 @@
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.keywords"
-          size="small"
-          placeholder="日志名称"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.beginTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择开始时间"
-        />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="listQuery.endTime"
-          type="datetime"
-          size="small"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择结束时间"
-        />
-      </search-item>
-      <template #btns>
-        <el-button
-          v-if="proxy.hasPerm('/sys/loginLog/delLoginLog')"
-          class="filter-item"
-          size="small"
-          type="info"
-          icon="el-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"
-    />
-  </app-container>
+  <div class="list-login-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/loginLog/delLoginLog')"
+            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"
+      />
+    </app-container>
+  </div>
 </template>
+
+<style lang="scss">
+  .list-login-log {
+    .el-button + .el-button {
+      margin-top: -10px;
+    }
+  }
+
+  .el-message-box {
+    overflow: auto;
+  }
+</style>
+
diff --git a/src/views/system/role/data.perm.vue b/src/views/system/role/data.perm.vue
new file mode 100644
index 0000000..7276e21
--- /dev/null
+++ b/src/views/system/role/data.perm.vue
@@ -0,0 +1,187 @@
+<script lang="ts" setup name="DataPerm">
+import type { Ref } from 'vue'
+import { Switch } from '@element-plus/icons-vue'
+import { ElButton, ElDialog, ElMessage } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import type { RoleInfo } from './role_interface'
+import { dataAuthor } from '@/api/system/role'
+import { getDeptTreeByRole } from '@/api/system/dept'
+import { getShowItem, toTreeList } from '@/utils/structure'
+
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+// 对话框是否显示
+const dialogVisible = ref(false)
+// 显示标题-角色名称
+const roleName = ref('数据权限')
+// 角色id
+const roleId = ref('')
+// 树列表配置项
+const defaultProps = {
+  label: 'name',
+  children: 'children',
+}
+// 过滤文字
+const filterText = ref('')
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 组织树列表数据
+const treeList = ref([])
+// 默认展开项
+const defaultExpanded: Ref<string[]> = ref([])
+// 默认选中项
+const defaultChecked: Ref<string[]> = ref([])
+// 树展开状态
+const treeExpand = ref(false)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+// 保存按钮加载状态
+const btnLoading = ref(false)
+// 列表加载状态
+const loading = ref(false)
+
+const tree = ref()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 提交表单
+function submitForm() {
+  const ids: string[] = tree.value.getCheckedKeys()
+  btnLoading.value = true
+  dataAuthor(roleId.value, ids).then((res) => {
+    ElMessage.success('权限配置成功')
+    btnLoading.value = false
+    dialogClose()
+  }).catch((_) => { // 异常情况，loading置为false
+    btnLoading.value = false
+  })
+}
+
+// 获取当前角色的功能权限
+function fetchDeptTree(roleid: string) {
+  loading.value = true
+  getDeptTreeByRole(roleid).then((response) => {
+    if (response.data) {
+      allDeptIds.value = response.data.map((item: { id: string }) => item.id)
+      treeList.value = toTreeList(response.data)
+      const temp = getShowItem(response.data) // 获取展开项和选中项
+      defaultExpanded.value = temp.expandList
+      defaultChecked.value = temp.openedList
+      loading.value = false
+    }
+  })
+}
+
+interface treeItem {
+  expanded: boolean
+  childNodes?: treeItem[]
+}
+/**
+     * 改变树节点展开状态，递归
+     * @param node 改变的节点
+     * @param value 展开/折叠
+     */
+function changeTreeNodeStatus(node: treeItem, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: boolean) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
+const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
+
+// 监控查询框
+watch(filterText, (val) => {
+  tree.value!.filter(val)
+})
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: RoleInfo) {
+  roleName.value = row.name
+  roleId.value = row.id
+  dialogVisible.value = true
+  btnLoading.value = false
+  fetchDeptTree(row.id)
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <ElDialog
+    v-model="dialogVisible"
+    :title="roleName"
+    width="400"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <div class="tool-line">
+      <ElButton :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </ElButton>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll($event)">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
+    <el-input v-model="filterText" placeholder="关键词过滤" style="margin-bottom: 15px;" />
+    <el-scrollbar height="300px">
+      <el-tree
+        ref="tree"
+        v-loading="loading"
+        :props="defaultProps"
+        :data="treeList"
+        :default-expanded-keys="defaultExpanded"
+        :default-checked-keys="defaultChecked"
+        :check-strictly="!treeCheckStrictly"
+        :filter-node-method="filterNode"
+        show-checkbox
+        node-key="id"
+      />
+    </el-scrollbar>
+    <template #footer>
+      <div class="dialog-footer">
+        <ElButton :loading="btnLoading" type="primary" @click="submitForm">
+          保存
+        </ElButton>
+        <ElButton @click="dialogClose">
+          取消
+        </ElButton>
+      </div>
+    </template>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped>
+.tool-line {
+  margin-bottom: 5px;
+  margin-top: -15px;
+}
+</style>
diff --git a/src/views/system/role/function.perm.vue b/src/views/system/role/function.perm.vue
index 178e924..294dc9f 100644
--- a/src/views/system/role/function.perm.vue
+++ b/src/views/system/role/function.perm.vue
@@ -24,6 +24,8 @@
   children: 'children',
 }
 const filterText = ref('')
+// 所有资源id
+const resourceIds = ref([])
 // 资源树列表数据
 const treeList = ref([])
 // 默认展开项
@@ -65,10 +67,12 @@
   loading.value = true
   getResourceListByRole(roleid).then((response) => {
     if (response.data) {
+      resourceIds.value = response.data.map((item: { id: string }) => item.id)
       treeList.value = toTreeList(response.data)
       const temp = getShowItem(response.data) // 获取展开项和选中项
       defaultExpanded.value = temp.expandList
       defaultChecked.value = temp.openedList
+      tree.value.setCheckedKeys(temp.openedList)
       loading.value = false
     }
   })
@@ -101,7 +105,7 @@
 }
 // 全选或全不选
 function handleCheckedTreeNodeAll(value: boolean) {
-  tree.value.setCheckedNodes(value ? treeList.value : [])
+  tree.value.setCheckedKeys(value ? resourceIds.value : [])
 }
 const filterNode = (value: string, data: { name: string }) => data.name?.includes(value)
 
diff --git a/src/views/system/role/list.role.vue b/src/views/system/role/list.role.vue
index 96f4dfb..be01103 100644
--- a/src/views/system/role/list.role.vue
+++ b/src/views/system/role/list.role.vue
@@ -6,12 +6,21 @@
 import type { DataScopeTypeInfo, RoleInfo } from './role_interface'
 import SystemEditRole from './edit.role.vue'
 import FunctionPerm from './function.perm.vue'
+import DataPerm from './data.perm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
 
+// 数据权限类型字典
+const dataScopeTypeDict: { [key: string]: string } = {
+  1: '所有数据',
+  2: '所属及下属部门',
+  3: '本部门',
+  4: '自定义',
+}
+
 // 默认查询条件
 const defaultQuery = {
   keyword: '',
@@ -27,8 +36,9 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  { text: '排序', value: 'num', width: 80 },
+  { text: '数据权限类型', value: 'dataScopeTypeName' },
   { text: '别名', value: 'tips' },
+  { text: '排序', value: 'num', width: 80 },
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
@@ -42,7 +52,13 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const treeData = toTreeList<RoleInfo>(res.data)
+    const data = res.data.map((item: RoleInfo): RoleInfo => {
+      return {
+        ...item,
+        dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
+      }
+    })
+    const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
   })
@@ -81,10 +97,17 @@
   editDialog.value.initDialog('create')
 }
 
+// 打开功能权限菜单
 const functionPerm = ref()
 function openFunctionPerm(row: RoleInfo) {
   functionPerm.value.initDialog(row)
 }
+
+// 打开数据权限菜单
+const dataPerm = ref()
+function openDataPerm(row: RoleInfo) {
+  dataPerm.value.initDialog(row)
+}
 // 表格组件
 const table = ref()
 const expansion = ref(false)
@@ -126,26 +149,28 @@
       </template>
       <ElTable ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
         <ElTableColumn v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
-        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="center">
+        <ElTableColumn v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="280" align="left" header-align="center">
           <template #default="scope">
-            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
-              功能权限
-            </ElButton>
-            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
-              数据权限
-            </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/update')" type="primary" text size="small" class="table-text-button" @click="edit(scope.row)">
               修改
             </ElButton>
             <ElButton v-if="proxy.hasPerm('/sys/role/delete')" type="primary" text size="small" class="table-text-button" @click="del(scope.row)">
               删除
             </ElButton>
+            <ElButton v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" text size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+              功能权限
+            </ElButton>
+            <!-- 只有自定义显示配置数据权限按钮 -->
+            <ElButton v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" text size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+              数据权限
+            </ElButton>
           </template>
         </ElTableColumn>
       </ElTable>
     </TableContainer>
     <SystemEditRole ref="editDialog" :role-type-list="roleTypeList" @close-refresh="search" />
     <FunctionPerm ref="functionPerm" />
+    <DataPerm ref="dataPerm" />
   </appcontainer>
 </template>
 
diff --git a/src/views/system/role/role_interface.ts b/src/views/system/role/role_interface.ts
index 47032e6..d3847c3 100644
--- a/src/views/system/role/role_interface.ts
+++ b/src/views/system/role/role_interface.ts
@@ -10,6 +10,7 @@
   name: string // 角色名
   tips: string // 别名
   dataScopeType: string // 数据权限类型
+  dataScopeTypeName?: string // 数据权限类型名称
   pid: string // 父角色
   deptId: string // 组织机构
   num: number // 排序
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
new file mode 100644
index 0000000..3226635
--- /dev/null
+++ b/src/views/system/tenant/editTenant.vue
@@ -0,0 +1,206 @@
+<script lang="ts" setup name="EditTenant">
+import { nextTick, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IdeviceForm } from './tenant_interface'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+import { addTenant, getDevice, updateTenant } from '@/api/system/tenant'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const dialogStatus = ref('') // 对话框类型：create,update,detail
+const deptShowTop = ref(false)
+// 对话框标题
+const textMap = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+  makeDep: '绑定组织',
+}
+// 表单内容
+let deviceForm: IdeviceForm = reactive({
+  id: '', // 主键
+  tenantCode: '', // 项目编码
+  tenantName: '', // 项目名称
+  linkPerson: '', // 联系人
+  tel: '', // 联系电话
+  clearday: '', // 清除时间
+})
+// 表单校验规则
+const rules = {
+  tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+  tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  deviceForm = {
+    tenantCode: '',
+    tenantName: '',
+    linkPerson: '',
+    tel: '',
+    clearday: '',
+    deptName: '',
+  }
+}
+// 父子组件通信
+const initDialog = (dialogStatus, row = null) => {
+  dialogFormVisible.value = true
+  dialogStatus.value = dialogStatus
+  if (dialogStatus === 'create') {
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
+    deviceForm = {
+      id: row.id,
+      tenantCode: row.tenantCode,
+      tenantName: row.tenantName,
+      linkPerson: row.linkPerson,
+      tel: row.tel,
+      clearday: row.clearday,
+    }
+  }
+}
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      updateTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      addTenant(deviceForm).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '新增成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'update') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'create') {
+    createData()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model:visible="dialogFormVisible"
+    append-to-body
+    :title="textMap[dialogStatus]"
+  >
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearday">
+            <el-input
+              v-model="deviceForm.clearday"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <DeptSelect
+              v-model="deviceForm.deptName"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择权属单位"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div
+        v-show="dialogStatus === 'detail' ? false : true"
+        class="dialog-footer"
+      >
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/system/tenant/list.tenant.vue b/src/views/system/tenant/list.tenant.vue
index f651ed0..c434b42 100644
--- a/src/views/system/tenant/list.tenant.vue
+++ b/src/views/system/tenant/list.tenant.vue
@@ -1,12 +1,160 @@
-<script lang="ts" setup name="SystemDictListDict">
-// 逻辑代码
+<script lang="ts" setup name="TenantList">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import RelateDept from './relateDept.vue'
+import EditTenant from './editTenant.vue'
+import type { IlistQuery } from './tenant_interface'
+import { delTenantSys, getTenantList } from '@/api/system/tenant'
+
+const normalTable = ref(null) as any
+const editTenant = ref(null) as any
+const relateDept = ref(null) as any
+
+// 查询条件
+const listQuery: IlistQuery = reactive({
+  tenantName: '',
+  offset: 1,
+  sort: 'id',
+  order: 'asc',
+})
+const columns = [
+  {
+    text: '项目编码',
+    value: 'tenantCode',
+    align: 'center',
+  },
+  {
+    text: '项目名称',
+    value: 'tenantName',
+    align: 'center',
+  },
+  {
+    text: '项目联系人',
+    value: 'linkPerson',
+    align: 'center',
+  },
+  {
+    text: '联系人电话',
+    value: 'tel',
+    align: 'center',
+  },
+  {
+    text: '历史数据保存天数',
+    value: 'clearday',
+    align: 'center',
+  },
+  {
+    text: '关联组织',
+    value: 'deptName',
+    align: 'center',
+  },
+] // 显示列
+const listLoading = ref(false)
+const deviceModelList = ref([]) // 设备类型列表
+const list = ref([]) // 表格数据列表
+// 是否需要序号列
+const options = reactive({
+  needIndex: false,
+})
+
+// 获取数据列表
+const fetchData = () => {
+  listLoading.value = true
+  getTenantList(listQuery).then((response) => {
+    list.value = response.data
+    listLoading.value = false
+  })
+}
+fetchData()
+
+onMounted(() => {
+  normalTable.value.initColumnsState(false)
+})
+
+const del = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除所选项目吗？',
+    '确认操作',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delTenantSys(row.id).then((response) => {
+      if (response.code === 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success',
+        })
+        fetchData()
+      }
+    })
+  })
+}
+// 新增
+const add = () => {
+  editTenant.value.initDialog('create')
+}
+// 修改
+const edit = (row) => {
+  editTenant.value.initDialog('update', row)
+}
+// 绑定组织
+const makeDep = (row) => {
+  relateDept.value.initDialog(row)
+}
 </script>
 
 <template>
-  <div>
-    <!-- 布局 -->
-    角色管理
-  </div>
+  <app-container>
+    <search-area
+      size="small"
+      @search="fetchData"
+    >
+      <!-- 一般查询条件 -->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          size="small"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template #btns>
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template #columns>
+        <el-table-column label="操作" width="140" align="center">
+          <template #default="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              关联组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <EditTenant ref="editTenant" @watchChild="fetchData" />
+    <RelateDept ref="relateDept" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/system/tenant/relateDept.vue b/src/views/system/tenant/relateDept.vue
new file mode 100644
index 0000000..d02c474
--- /dev/null
+++ b/src/views/system/tenant/relateDept.vue
@@ -0,0 +1,108 @@
+<script lang="ts" setup name="RelateDept">
+import { onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { relatedDept } from '@/api/system/tenant'
+import DeptSelect from '@/components/DeptSelect/index.vue'
+
+const emits = defineEmits(['watchChild'])
+const dataFormRef = ref(null) as any
+const dialogFormVisible = ref(false) // 对话框显示隐藏
+const deptShowTop = ref(false)
+// 表单内容
+const dataForm = reactive({
+  tenantId: '',
+  deptId: '',
+})
+// 表单校验规则
+const rules = {
+  deptId: [{ required: true, message: '	组织机构必选', trigger: ['blur', 'change'] }],
+}
+
+// 重置表单
+const resetForm = () => {
+  dataForm = {
+    tenantId: '',
+    deptId: '',
+  }
+}
+
+// 父子组件通信
+const initDialog = (row = null) => {
+  dialogFormVisible.value = true
+  if (row) {
+    dataForm = {
+      tenantId: row.id,
+      deptId: row.deptId,
+    }
+  }
+}
+// 保存数据
+const saveData = () => {
+  dataFormRef.value.validate((valid) => {
+    if (valid) {
+      relatedDept(dataForm).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            message: '绑定成功',
+            type: 'success',
+          })
+          emits('watchChild')
+          dialogFormVisible.value = false
+        }
+      })
+    }
+  })
+}
+</script>
+
+<template>
+  <el-dialog v-model:visible="dialogFormVisible" append-to-body title="绑定组织">
+    <el-form
+      ref="dataFormRef"
+      :rules="rules"
+      :model="dataForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="绑定组织" prop="deptId">
+            <DeptSelect
+              v-model="dataForm.deptId"
+              :need-top="deptShowTop"
+              dept-type="03"
+              placeholder="选择组织机构"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="dialogFormVisible = false">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenant_interface.ts b/src/views/system/tenant/tenant_interface.ts
new file mode 100644
index 0000000..d13898d
--- /dev/null
+++ b/src/views/system/tenant/tenant_interface.ts
@@ -0,0 +1,15 @@
+export interface IlistQuery {
+  tenantName: string
+  offset: number
+  sort: string
+  order: string
+}
+export interface IdeviceForm {
+  id: string // 主键
+  tenantCode: string // 项目编码
+  tenantName: string // 项目名称
+  linkPerson: string // 联系人
+  tel: string // 联系电话
+  clearday: string // 清除时间
+}
+