diff --git a/.env b/.env
index 33a9e5b649c28423761bac64a8c8799f66a51659..97f8c7329703f75a3e546bb6883c6e8d05319937 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # port
-VITE_PORT=3100
+VITE_PORT=3300
 
 # spa-title
 VITE_GLOB_APP_TITLE=Bootx-Platform
diff --git a/.env.development b/.env.development
index 770bf037ed1f1f4fb8bb358ccd39f777eef9a794..954f930e3fe45f3a74670a4c57bfa08afbabb23b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_USE_MOCK=true
 VITE_PUBLIC_PATH=/
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-VITE_PROXY=[["/api","http://localhost:9999"],["/upload","http://localhost:9999/file/upload"]]
+VITE_PROXY=[["/api","http://localhost:9999"],["/upload","http://localhost:9999/file/upload"],["/v3/api-docs"]]
 
 # 控制台不输出console
 VITE_DROP_CONSOLE=false
diff --git a/commitlint.config.js b/commitlint.config.js
index af370982a4724cf8f9ecc8523ffad73e386be3ce..b423359125229bf66b937fa62ed9383e062693e7 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -7,7 +7,7 @@ const scopes = fs
   .filter((dirent) => dirent.isDirectory())
   .map((dirent) => dirent.name.replace(/s$/, ''))
 
-// precomputed scope
+// precomputed data
 const scopeComplete = execSync('git status --porcelain || true')
   .toString()
   .trim()
@@ -59,7 +59,7 @@ module.exports = {
     // 中英文对照版
     // messages: {
     //   type: '选择你要提交的类型 :',
-    //   scope: '选择一个提交范围 (可选):',
+    //   data: '选择一个提交范围 (可选):',
     //   customScope: '请输入自定义的提交范围 :',
     //   subject: '填写简短精炼的变更描述 :\n',
     //   body: '填写更加详细的变更描述 (可选)。使用 "|" 换行 :\n',
diff --git a/package.json b/package.json
index 69bb240b5ee0e89dd4e7098b45d917997c651ec8..3a7aa539c746c03d9951ecb3830726710cd240b7 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "vue-json-pretty": "^2.0.6",
     "vue-router": "^4.0.16",
     "vue-types": "^4.1.1",
-    "vxe-table": "^4.4.2",
+    "vxe-table": "^4.5.14",
     "xe-utils": "^3.5.7",
     "xlsx": "^0.18.5"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b34bc5c23dac4c5ace55d60887fa7c44aee567ce..6f9b92ce69dbb9f65f746b3d0d3a1127d36e3c36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -118,7 +118,7 @@ specifiers:
   vue-router: ^4.0.16
   vue-tsc: ^0.33.9
   vue-types: ^4.1.1
-  vxe-table: ^4.4.2
+  vxe-table: ^4.5.14
   xe-utils: ^3.5.7
   xlsx: ^0.18.5
 
@@ -161,7 +161,7 @@ dependencies:
   vue-json-pretty: 2.2.4_vue@3.3.4
   vue-router: 4.1.6_vue@3.3.4
   vue-types: 4.2.1_vue@3.3.4
-  vxe-table: 4.4.2_vue@3.3.4+xe-utils@3.5.7
+  vxe-table: 4.5.14_vue@3.3.4+xe-utils@3.5.7
   xe-utils: 3.5.7
   xlsx: 0.18.5
 
@@ -4859,6 +4859,10 @@ packages:
       entities: 4.5.0
     dev: true
 
+  /dom-zindex/1.0.1:
+    resolution: {integrity: sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==}
+    dev: false
+
   /dom7/3.0.0:
     resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
     dependencies:
@@ -11003,12 +11007,13 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /vxe-table/4.4.2_vue@3.3.4+xe-utils@3.5.7:
-    resolution: {integrity: sha512-3UdfSeMZ/D5nfTohcnZQQ2gkFZnhvf0v83usOCwx3B1nzBNKAJumg3QviMEox5SdikT8pq9z4vz3a0pesPPrJw==}
+  /vxe-table/4.5.14_vue@3.3.4+xe-utils@3.5.7:
+    resolution: {integrity: sha512-S+6pAYQsoY5DZj9qLXQLDKcA/+AO5CSrs9tGn+/By8WxYWJNLw3i5cjbXsriUaJeuj8Qi1aYfdhrNfeMCwE9Iw==}
     peerDependencies:
       vue: ^3.2.28
       xe-utils: ^3.5.0
     dependencies:
+      dom-zindex: 1.0.1
       vue: 3.3.4
       xe-utils: 3.5.7
     dev: false
diff --git a/src/api/common/FileUpload.ts b/src/api/common/FileUpload.ts
index e596cbda27535ee6c25c977b957674deb3821ad1..ecce2294f6990b8716b55c638679c3b1cb47f5d3 100644
--- a/src/api/common/FileUpload.ts
+++ b/src/api/common/FileUpload.ts
@@ -52,14 +52,50 @@ export function uploadFile(params: UploadFileParams, onUploadProgress: (progress
  * 上传文件信息
  */
 export interface UpdateFileInfo {
-  // 文件id
-  id: string
+  // id
+  id?: number
+  // 文件访问地址
+  url?: string
+  // 文件大小，单位字节
+  size?: string
   // 文件名称
-  fileName: string
-  // 文件后缀
-  fileSuffix: string
-  // 文件类型
-  fileType: string
-  // 文件大小
-  fileSize: number
+  filename?: string
+  // 原始文件名
+  originalFilename?: string
+  // 基础存储路径
+  basePath?: string
+  // 存储路径
+  path?: string
+  // 文件扩展名
+  ext?: string
+  // MIME类型
+  contentType?: string
+  // 存储平台
+  platform?: string
+  // 缩略图访问路径
+  thUrl?: string
+  // 缩略图名称
+  thFilename?: string
+  // 缩略图大小，单位字节
+  thSize?: string
+  // 缩略图MIME类型
+  thContentType?: string
+  // 文件所属对象id
+  objectId?: string
+  // 文件所属对象类型，例如用户头像，评价图片
+  objectType?: string
+  // 文件元数据
+  metadata?: string
+  // 文件用户元数据
+  userMetadata?: string
+  // 缩略图元数据
+  thMetadata?: string
+  // 缩略图用户元数据
+  thUserMetadata?: string
+  // 附加属性
+  attr?: string
+  // 文件ACL
+  fileAcl?: string
+  // 缩略图文件ACL
+  thFileAcl?: string
 }
diff --git a/src/components/Basic/src/BasicTitle.vue b/src/components/Basic/src/BasicTitle.vue
index 41ec3d8d6349ae6821b3f1deeb3fc84697a8512e..5cacee5ebe26c387706804d4d51fbcc8e7564c82 100644
--- a/src/components/Basic/src/BasicTitle.vue
+++ b/src/components/Basic/src/BasicTitle.vue
@@ -46,7 +46,7 @@
     position: relative;
     display: flex;
     padding-left: 7px;
-    font-size: 16px;
+    font-size: 14px;
     font-weight: 500;
     line-height: 24px;
     color: @text-color-base;
diff --git a/src/components/Bootx/Query/QueryItem.vue b/src/components/Bootx/Query/QueryItem.vue
index 943c0ab5091b655873e47b10119fa23b73282249..e5e9a156b0af788a31f303be796f1eebbaa8f778 100644
--- a/src/components/Bootx/Query/QueryItem.vue
+++ b/src/components/Bootx/Query/QueryItem.vue
@@ -37,7 +37,7 @@
         v-else-if="field.type === DATE"
         style="width: 100%"
         :placeholder="field.placeholder ? field.placeholder : '请选择日期'"
-        :valueFormat="field.format ? field.format : 'yyyy-MM-DD'"
+        :valueFormat="field.format ? field.format : 'YYYY-MM-DD'"
         v-model:value="queryParams[field.field]"
       />
       <!-- 时间 -->
@@ -56,7 +56,7 @@
         v-else-if="field.type === DATE_TIME"
         style="width: 100%"
         :placeholder="field.placeholder ? field.placeholder : '请选择日期时间'"
-        :valueFormat="field.format ? field.format : 'yyyy-MM-DD HH:mm:ss'"
+        :valueFormat="field.format ? field.format : 'YYYY-MM-DD HH:mm:ss'"
         v-model:value="queryParams[field.field]"
       />
       <!-- 默认文本输入 -->
diff --git a/src/components/VxeTable/black.scss b/src/components/VxeTable/black.scss
index 0da066c05e87b8831ad2cf5e2b39ee9203c05893..42f34cd6c03b64a280a0f89713cd5c59187de5b4 100644
--- a/src/components/VxeTable/black.scss
+++ b/src/components/VxeTable/black.scss
@@ -164,9 +164,6 @@ html[data-theme='dark'] {
 
   /*textarea*/
   --vxe-textarea-background-color: #{$vxe-textarea-background-color};
-  --vxe-textarea-count-color: #{$vxe-textarea-count-color};
-  --vxe-textarea-count-background-color: #{$vxe-textarea-count-background-color};
-  --vxe-textarea-count-error-color: #{$vxe-textarea-count-error-color};
 
   /*form*/
   --vxe-form-background-color: #{$vxe-form-background-color};
diff --git a/src/hooks/bootx/useTablePage.ts b/src/hooks/bootx/useTablePage.ts
index ea118cfa435dd16bbbdbb4c8f34cd186409843d3..82c42235456d4aef30e646e47441955f804eec06 100644
--- a/src/hooks/bootx/useTablePage.ts
+++ b/src/hooks/bootx/useTablePage.ts
@@ -22,7 +22,11 @@ export default function <T>(queryPageCallback: CallableFunction) {
   const batchOperateFlag = ref(false)
   // 超级查询条件生效状态
   const superQueryFlag = ref(false)
-
+  // 排序条件
+  const sortParam = reactive({
+    sortField: null,
+    asc: false,
+  })
   // 不可以被重新赋值, 否则会失去绑定
   const { pages, pagination } = model
   /**
@@ -43,6 +47,14 @@ export default function <T>(queryPageCallback: CallableFunction) {
     pages.size = pageSize
     queryPageCallback()
   }
+  /**
+   * 排序条件变动
+   */
+  function sortChange({ order, property }) {
+    sortParam.sortField = order ? property : null
+    sortParam.asc = order === 'asc'
+    queryPageCallback()
+  }
   /**
    * 重置当前页数
    */
@@ -87,7 +99,9 @@ export default function <T>(queryPageCallback: CallableFunction) {
     pagination,
     batchOperateFlag,
     superQueryFlag,
+    sortParam,
     query,
+    sortChange,
     resetPage,
     pageQueryResHandel,
     handleTableChange,
diff --git a/src/hooks/web/useDesign.ts b/src/hooks/web/useDesign.ts
index f32b14637d6201c6d85c75e412feacc1a3b19def..272ccaed83116dc2cb9a13209d38cc8f77da39c4 100644
--- a/src/hooks/web/useDesign.ts
+++ b/src/hooks/web/useDesign.ts
@@ -14,7 +14,7 @@ export function useDesign(scope: string) {
   //   });
   // }
   return {
-    // prefixCls: computed(() => `${values.prefixCls}-${scope}`),
+    // prefixCls: computed(() => `${values.prefixCls}-${data}`),
     prefixCls: `${values.prefixCls}-${scope}`,
     prefixVar: values.prefixCls,
     // style,
diff --git a/src/locales/setupI18n.ts b/src/locales/setupI18n.ts
index 889d36e24504843678bf341ee91875d330812e94..c062bf1dae90f2e31f01215aa827b705adb659e4 100644
--- a/src/locales/setupI18n.ts
+++ b/src/locales/setupI18n.ts
@@ -29,7 +29,7 @@ async function createI18nOptions(): Promise<I18nOptions> {
       [locale]: message,
     },
     availableLocales: availableLocales,
-    sync: true, //If you don’t want to inherit locale from global scope, you need to set sync of i18n component option to false.
+    sync: true, //If you don’t want to inherit locale from global data, you need to set sync of i18n component option to false.
     silentTranslationWarn: true, // true - warning off
     missingWarn: false,
     silentFallbackWarn: true,
diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts
index 1794ff40a39d9124063ecb603e11eea1652ac990..19ae8da797c61ccb44f3cfd48c1264b884d5013c 100644
--- a/src/router/guard/index.ts
+++ b/src/router/guard/index.ts
@@ -117,12 +117,9 @@ function createScrollGuard(router: Router) {
 export function createMessageGuard(router: Router) {
   const { closeMessageOnSwitch } = projectSetting
 
-  console.log(projectSetting)
-  console.log(closeMessageOnSwitch)
   router.beforeEach(async () => {
     try {
       if (closeMessageOnSwitch) {
-        console.log(666444)
         Modal.destroyAll()
         notification.destroy()
       }
diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts
index 5b09aa71be92fb29e04633f943615e71725c3f87..7f88ceffb7a5a3d23c3cd2c7c91bf3d11f3a47fe 100644
--- a/src/router/routes/basic.ts
+++ b/src/router/routes/basic.ts
@@ -101,7 +101,7 @@ export const DASHBOARD: AppRouteModule = {
       component: () => import('/@/views/dashboard/analysis/index.vue'),
       meta: {
         // affix: true,
-        title: '分析页',
+        title: '主页',
       },
     },
   ],
diff --git a/src/utils/dataUtil.ts b/src/utils/dataUtil.ts
index 3da9ef549158b26443c86c5b0f9fa1f2ac2b0657..1fc56e0f3fa87feb24fa5656ff10b356498de3a4 100644
--- a/src/utils/dataUtil.ts
+++ b/src/utils/dataUtil.ts
@@ -11,6 +11,10 @@ import { LabeledValue } from 'ant-design-vue/lib/select'
  */
 export function treeDataTranslate(data, value = 'value', title = 'title', children = 'children') {
   const temp = [] as Tree[]
+  if (!data) {
+    return []
+  }
+
   for (let i = 0; i < data.length; i++) {
     const p = {
       key: data[i][value],
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 6fe25c446d3cc056ca7bd47aec90d996b3da9eb7..414371b328a70b04670ed52185a0699e3b8bdcba 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -175,6 +175,7 @@ export function validateEmail(email) {
 
 /**
  * 判断手机号码是否正确
+ * @return
  */
 export function validateMobile(phone) {
   let result = false
@@ -188,7 +189,7 @@ export function validateMobile(phone) {
         result = true
       }
     } else {
-      msg = '手机号码长度不为11位'
+      msg = '手机号码格式不正确'
     }
   } else {
     msg = '手机号码不能为空'
diff --git a/src/views/dashboard/analysis/index.vue b/src/views/dashboard/analysis/index.vue
index a2eecf8eeb2c54a2d913ebc5cd3780e8c3e3b9e8..97831f86eaa627155f1d3261fe6f35a22866bd15 100644
--- a/src/views/dashboard/analysis/index.vue
+++ b/src/views/dashboard/analysis/index.vue
@@ -1,21 +1,12 @@
 <template>
   <div class="p-4">
-    <GrowCard :loading="loading" class="enter-y" />
-    <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
-    <div class="md:flex enter-y">
-      <VisitRadar class="md:w-1/3 w-full" :loading="loading" />
-      <VisitSource class="md:w-1/3 !md:mx-4 !md:my-0 !my-4 w-full" :loading="loading" />
-      <SalesProductPie class="md:w-1/3 w-full" :loading="loading" />
-    </div>
+    <a-card :bordered="false" :loading="loading">
+      <h1>欢迎使用后台管理系统</h1>
+    </a-card>
   </div>
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
-  import GrowCard from './components/GrowCard.vue'
-  import SiteAnalysis from './components/SiteAnalysis.vue'
-  import VisitSource from './components/VisitSource.vue'
-  import VisitRadar from './components/VisitRadar.vue'
-  import SalesProductPie from './components/SalesProductPie.vue'
 
   const loading = ref(true)
 
diff --git a/src/views/login/LoginForm.vue b/src/views/login/LoginForm.vue
index 703c963cc6097ac6cff7a53ce9993bb7ee83a160..fdd21e0caa85b833e0c7a7448c49d0e15ed50ff7 100644
--- a/src/views/login/LoginForm.vue
+++ b/src/views/login/LoginForm.vue
@@ -95,8 +95,8 @@
 
   const form = reactive({
     client: '',
-    account: 'bootx',
-    password: '123456',
+    account: '',
+    password: '',
     loginType: 'password',
     captchaKey: '',
     captcha: '',
diff --git a/src/views/modules/baseapi/quartz/QuartzJobLogList.vue b/src/views/modules/baseapi/quartz/QuartzJobLogList.vue
index 6039485f5b8938a548d011ba78135ef9e896775d..4ef7a0b7570752a2525ff966d24abe13cb9aa9f5 100644
--- a/src/views/modules/baseapi/quartz/QuartzJobLogList.vue
+++ b/src/views/modules/baseapi/quartz/QuartzJobLogList.vue
@@ -99,8 +99,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
   defineExpose({
     init,
diff --git a/src/views/modules/demo/ws/WebsocketDemo.vue b/src/views/modules/demo/ws/WebsocketDemo.vue
index cbe4d03e091f96b350cbb3f54f0acababc862d4e..ae146467634de6f873e35128de0d6eadc8b290e1 100644
--- a/src/views/modules/demo/ws/WebsocketDemo.vue
+++ b/src/views/modules/demo/ws/WebsocketDemo.vue
@@ -34,10 +34,8 @@
 
   function initWs() {
     // 建立连接对象
-    const userStore = useUserStore()
-    userId = userStore.getUserInfo.userId
     findByParamKey('WebsocketServerUrl').then(({ data: url }) => {
-      websocketUrl = url + '/test/ws/' + userId
+      websocketUrl = url + '/test/ws/'
       initWebSocket()
     })
   }
diff --git a/src/views/modules/develop/file/FileUpload.api.ts b/src/views/modules/develop/file/FileUpload.api.ts
index c87f6df8a1ddb56051e3440cd7fb05d9f424265a..05a28b1b119043e405d8977b6bef0263a884c66e 100644
--- a/src/views/modules/develop/file/FileUpload.api.ts
+++ b/src/views/modules/develop/file/FileUpload.api.ts
@@ -1,12 +1,12 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
-import { BaseEntity } from '/#/web'
+import { UpdateFileInfo } from "/@/api/common/FileUpload";
 
 /**
  * 分页
  */
 export const page = (params) => {
-  return defHttp.get<Result<PageResult<FileUpload>>>({
+  return defHttp.get<Result<PageResult<UpdateFileInfo>>>({
     url: '/file/page',
     params,
   })
@@ -16,7 +16,7 @@ export const page = (params) => {
  * 获取单条
  */
 export const get = (id) => {
-  return defHttp.get<Result<FileUpload>>({
+  return defHttp.get<Result<UpdateFileInfo>>({
     url: '/file/findById',
     params: { id },
   })
@@ -25,7 +25,7 @@ export const get = (id) => {
 /**
  * 添加
  */
-export const add = (obj: FileUpload) => {
+export const add = (obj: UpdateFileInfo) => {
   return defHttp.post({
     url: '/file/add',
     data: obj,
@@ -35,7 +35,7 @@ export const add = (obj: FileUpload) => {
 /**
  * 更新
  */
-export const update = (obj: FileUpload) => {
+export const update = (obj: UpdateFileInfo) => {
   return defHttp.post({
     url: '/file/update',
     data: obj,
@@ -56,25 +56,7 @@ export const del = (id) => {
  * 查询全部
  */
 export const findAll = () => {
-  return defHttp.get<Result<Array<FileUpload>>>({
+  return defHttp.get<Result<UpdateFileInfo>>({
     url: '/file/findAll',
   })
 }
-
-/**
- * 上传文件信息
- */
-export interface FileUpload extends BaseEntity {
-  // 存储位置
-  filePath: string
-  // 文件名称
-  fileName: string
-  // 文件类型
-  fileType: string
-  // 文件后缀
-  fileSuffix: string
-  // 文件大小
-  fileSize: number
-  // 外部关联id
-  externalStorageId: string
-}
diff --git a/src/views/modules/develop/file/FileUploadInfo.vue b/src/views/modules/develop/file/FileUploadInfo.vue
new file mode 100644
index 0000000000000000000000000000000000000000..dbba966c2e03533f43ff91da3a9d571d765445f2
--- /dev/null
+++ b/src/views/modules/develop/file/FileUploadInfo.vue
@@ -0,0 +1,43 @@
+<template>
+  <basic-modal v-bind="$attrs" :loading="confirmLoading" width="50%" title="查看" :visible="visible" @cancel="visible = false">
+    <description :column="1" :data="data" :schema="schema" />
+    <template #footer>
+      <a-button key="cancel" @click="visible = false">取消</a-button>
+    </template>
+  </basic-modal>
+</template>
+
+<script setup lang="ts">
+  import BasicModal from '/@/components/Modal/src/BasicModal.vue'
+  import { DescItem, Description } from '/@/components/Description'
+  import { UpdateFileInfo } from '/@/api/common/FileUpload'
+  import { get } from '/@/views/modules/develop/file/FileUpload.api'
+  import { $ref } from 'vue/macros'
+
+  let data = $ref<UpdateFileInfo>({})
+  let confirmLoading = $ref<boolean>(false)
+  let visible = $ref<boolean>(false)
+  let schema = [
+    { field: 'id', label: '主键' },
+    { field: 'filename', label: '文件储存名称' },
+    { field: 'originalFilename', label: '原始文件名' },
+    { field: 'ext', label: '文件扩展名' },
+    { field: 'contentType', label: 'MIME类型' },
+    { field: 'platform', label: '存储平台' },
+    { field: 'objectId', label: '关联外部ID' },
+    { field: 'createTime', label: '创建时间' },
+  ] as DescItem[]
+
+  /**
+   * 初始化数据
+   */
+  function init(id) {
+    visible = true
+    get(id).then((res) => {
+      data = res.data
+    })
+  }
+  defineExpose({ init })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/modules/develop/file/FileUploadList.vue b/src/views/modules/develop/file/FileUploadList.vue
index d5874feb84f2fa3417f09475beb988ee680df6be..ded5d0f19e32d8366a5414faa220f887423dabb0 100644
--- a/src/views/modules/develop/file/FileUploadList.vue
+++ b/src/views/modules/develop/file/FileUploadList.vue
@@ -1,7 +1,31 @@
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+      <a-form class="page-query" layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="名称">
+              <a-input allowClear v-model:value="model.queryParam.originalFilename" placeholder="请输入文件名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="扩展名">
+              <a-input allowClear v-model:value="model.queryParam.ext" placeholder="请输入文件扩展名" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="MIME">
+              <a-input allowClear v-model:value="model.queryParam.contentType" placeholder="请输入文件MIME类型" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-space>
+              <a-button type="primary" @click="query">查询</a-button>
+              <a-button @click="resetQueryParams">重置</a-button>
+            </a-space>
+          </a-col>
+        </a-row>
+      </a-form>
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
@@ -20,15 +44,17 @@
       </vxe-toolbar>
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" width="60" />
-        <vxe-column field="fileName" title="文件名称" />
-        <vxe-column field="fileSuffix" title="文件后缀" />
-        <vxe-column field="fileType" title="文件类型" />
+        <vxe-column field="originalFilename" title="原始文件名" />
+        <vxe-column field="ext" title="扩展名" />
+        <vxe-column field="contentType" title="文件类型" />
         <vxe-column field="fileSize" title="文件大小" />
         <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" width="200" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a href="javascript:" @click="show(row)">查看</a>
             <a-divider type="vertical" />
+            <a href="javascript:" @click="preview(row)">预览</a>
+            <a-divider type="vertical" />
             <a href="javascript:" @click="down(row)">下载</a>
             <a-divider type="vertical" />
             <a href="javascript:" style="color: red" @click="remove(row)">删除</a>
@@ -44,6 +70,7 @@
         @page-change="handleTableChange"
       />
     </div>
+    <file-upload-info ref="fileUploadInfo" />
   </div>
 </template>
 
@@ -53,16 +80,16 @@
   import { page, del } from './FileUpload.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { QueryField } from '/@/components/Bootx/Query/Query'
   import { getFileDownloadUrl, getFilePreviewUrl } from '/@/api/common/FileUpload'
   import { useUserStoreWithOut } from '/@/store/modules/user'
   import { getAppEnvConfig } from '/@/utils/env'
   import { useUpload } from '/@/hooks/bootx/useUpload'
+  import FileUploadInfo from './FileUploadInfo.vue'
 
   // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, query, pagination, pages, model, loading } = useTablePage(queryPage)
   const { notification, createMessage, createConfirm } = useMessage()
   const useUserStore = useUserStoreWithOut()
   const { VITE_GLOB_API_URL } = getAppEnvConfig()
@@ -70,10 +97,11 @@
   const { tokenHeader, uploadAction } = useUpload('/file/upload')
 
   // 查询条件
-  const fields = [] as QueryField[]
+  const fields = [{}] as QueryField[]
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
+  const fileUploadInfo = $ref<any>()
 
   onMounted(() => {
     vxeBind()
@@ -112,10 +140,17 @@
     })
     return Promise.resolve()
   }
+
   /**
    * 查看
    */
   function show(record) {
+    fileUploadInfo.init(record.id)
+  }
+  /**
+   * 预览
+   */
+  function preview(record) {
     getFilePreviewUrl(record.id).then((res) => {
       window.open(res.data)
     })
diff --git a/src/views/modules/develop/template/GeneralTemplate.api.ts b/src/views/modules/develop/template/GeneralTemplate.api.ts
index 0d2b7a4f71f9f07c7be245edcc1779d5c6a180f6..c41b8c1abc1d7cebff3f9941466c92fef088d6e6 100644
--- a/src/views/modules/develop/template/GeneralTemplate.api.ts
+++ b/src/views/modules/develop/template/GeneralTemplate.api.ts
@@ -1,7 +1,6 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
-import { deleteBatchUserAssign } from "/@/views/modules/system/scope/DataScope.api";
 
 /**
  * 分页
diff --git a/src/views/modules/monitor/login/LoginLogList.vue b/src/views/modules/monitor/login/LoginLogList.vue
index c32c030c901736775453adbf3ce7fc72781d73b9..bc7aa5d119b2a0d271a82e10c15e6ec7b50d85e5 100644
--- a/src/views/modules/monitor/login/LoginLogList.vue
+++ b/src/views/modules/monitor/login/LoginLogList.vue
@@ -46,13 +46,13 @@
         </vxe-column>
       </vxe-table>
       <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
+      size="medium"
+      :loading="loading"
+      :current-page="pagination.current"
+      :page-size="pagination.size"
+      :total="pagination.total"
+      @page-change="handleTableChange"
+    />
       <login-log-info :clients="clients" :login-types="loginTypes" ref="loginLogInfo" />
     </div>
   </div>
@@ -142,7 +142,6 @@
       ...model.queryParam,
       ...pages,
     }).then(({ data }) => {
-      data.records[0].loginTime
       pageQueryResHandel(data)
     })
   }
diff --git a/src/views/modules/monitor/user/online/OnlineUser.api.ts b/src/views/modules/monitor/user/online/OnlineUser.api.ts
new file mode 100644
index 0000000000000000000000000000000000000000..82aa776f0e2f915bd88208a353c0b8bd65f27d4c
--- /dev/null
+++ b/src/views/modules/monitor/user/online/OnlineUser.api.ts
@@ -0,0 +1,34 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export const page = (params) => {
+  return defHttp.get<Result<PageResult<OnlineUserInfo>>>({
+    url: '/online/user/page',
+    params,
+  })
+}
+
+/**
+ * 获取单条
+ */
+export const get = (id) => {
+  return defHttp.get<Result<OnlineUserInfo>>({
+    url: '/online/user/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 在线用户信息
+ */
+export interface OnlineUserInfo extends BaseEntity {
+  name: string
+  username: string
+  phone: string
+  email: string
+  status: string
+}
diff --git a/src/views/modules/monitor/user/online/OnlineUserList.vue b/src/views/modules/monitor/user/online/OnlineUserList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d4dfc192a4f2859baa81ba416547de45e34985b9
--- /dev/null
+++ b/src/views/modules/monitor/user/online/OnlineUserList.vue
@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="username" title="账号" />
+        <vxe-column field="name" title="名称" />
+        <vxe-column field="phone" title="手机号" />
+        <vxe-column field="email" title="邮箱" />
+        <vxe-column field="status" title="用户状态">
+          <template #default="{ row }">
+            {{ dictConvert('UserStatusCode', row.status) }}
+          </template>
+        </vxe-column>
+        <vxe-column fixed="right" width="170" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <a-link>查看</a-link>
+            <a-divider type="vertical" />
+            <a-link danger @click="logout(row.id)">登出</a-link>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  // 使用hooks
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { page } from './OnlineUser.api'
+  import { useDict } from '/@/hooks/bootx/useDict'
+  import { onMounted } from 'vue'
+  import ALink from '/@/components/Link/Link.vue'
+
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+  const { notification, createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
+
+  /**
+   * 页面加载函数
+   */
+  onMounted(() => {
+    queryPage()
+  })
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+  }
+
+  /**
+   *
+   * @param userId
+   */
+  function logout(userId) {
+    createConfirm({
+      iconType: 'warning',
+      title: '确认登出',
+      content: '是否确认登出？',
+      onOk: () => {
+        loading.value = true
+        createMessage.success('登出成功')
+        queryPage()
+      },
+    })
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/modules/notice/site/sender/SiteMessageList.vue b/src/views/modules/notice/site/sender/SiteMessageList.vue
index 6a404e9b4b1c975bd2d69b7f96ce5be253b231e3..3fe12e312938c65d7ff8960bbf222a169604837b 100644
--- a/src/views/modules/notice/site/sender/SiteMessageList.vue
+++ b/src/views/modules/notice/site/sender/SiteMessageList.vue
@@ -135,8 +135,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
 
   //发送
diff --git a/src/views/modules/system/client/ClientList.vue b/src/views/modules/system/client/ClientList.vue
index a6e8b672e77a3e8aa2bf76bb8e96011fe27e430d..0cc665eda4c63521c1f371c2fa92dd6a6f839b89 100644
--- a/src/views/modules/system/client/ClientList.vue
+++ b/src/views/modules/system/client/ClientList.vue
@@ -120,8 +120,8 @@
   function remove(record) {
     del(record.id).then(() => {
       notification.success({ message: '删除成功' })
+      queryPage()
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/dict/DictItemList.vue b/src/views/modules/system/dict/DictItemList.vue
index 2a0119204c4d1e8ad0c114ea66b08efb7458d4ac..5814c5d0c05121dd924a7aa8549070f1517650b6 100644
--- a/src/views/modules/system/dict/DictItemList.vue
+++ b/src/views/modules/system/dict/DictItemList.vue
@@ -112,8 +112,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
   defineExpose({
     init,
diff --git a/src/views/modules/system/dict/DictList.vue b/src/views/modules/system/dict/DictList.vue
index f7dfeaebda9669e1b4c2b41435d51f5aabc4fbde..7a3e4483fa08bb5048bf6d1af888cf0207820b96 100644
--- a/src/views/modules/system/dict/DictList.vue
+++ b/src/views/modules/system/dict/DictList.vue
@@ -131,8 +131,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/loginType/LoginTypeList.vue b/src/views/modules/system/loginType/LoginTypeList.vue
index 0eb3509296b0d67120c94ddab0d187e450b24fdf..5c5cbfe9f44224cf7bca44d5eed95a661f3b22e1 100644
--- a/src/views/modules/system/loginType/LoginTypeList.vue
+++ b/src/views/modules/system/loginType/LoginTypeList.vue
@@ -126,8 +126,8 @@
   function remove(record) {
     del(record.id).then(() => {
       notification.success({ message: '删除成功' })
+      queryPage()
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/menu/Menu.api.ts b/src/views/modules/system/menu/Menu.api.ts
index 171682782ef7cfd8023c050598af244936517771..6da112536745efe3e1212cca0f426179879280b4 100644
--- a/src/views/modules/system/menu/Menu.api.ts
+++ b/src/views/modules/system/menu/Menu.api.ts
@@ -3,7 +3,7 @@ import { Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
 
 /**
- * 树列表
+ * 菜单树列表
  */
 export const menuTree = (clientCode: string) => {
   return defHttp.get<Result<Array<Menu>>>({
@@ -11,6 +11,15 @@ export const menuTree = (clientCode: string) => {
     params: { clientCode },
   })
 }
+/**
+ * 获取菜单和权限码树
+ */
+export const menuAndPermCodeTree = (clientCode: string) => {
+  return defHttp.get<Result<Array<Menu>>>({
+    url: '/perm/menu/menuAndPermCodeTree',
+    params: { clientCode },
+  })
+}
 
 /**
  * 获取单条
@@ -78,16 +87,6 @@ export const existsByPermCodeNotId = (permCode, id) => {
   })
 }
 
-/**
- * 菜单和权限码树
- * @param clientCode
- */
-export function allTree(clientCode) {
-  return defHttp.get<Result<MenuTree[]>>({
-    url: '/perm/menu/allTree',
-    params: { clientCode },
-  })
-}
 
 /**
  * 权限_菜单
diff --git a/src/views/modules/system/menu/MenuEdit.vue b/src/views/modules/system/menu/MenuEdit.vue
index 002d1796f933d57fba47fb3b09b7874b9e33a579..974aeb38d8e2be409024c662a99d1733ab58edfa 100644
--- a/src/views/modules/system/menu/MenuEdit.vue
+++ b/src/views/modules/system/menu/MenuEdit.vue
@@ -131,7 +131,7 @@
   // 事件
   const emits = defineEmits(['ok'])
   // 入口
-  function init(id, editType: FormEditType, clientCode, row) {
+  function init(id: any, editType: FormEditType, clientCode: string | undefined, row: any) {
     initMenuTree(clientCode)
     initFormEditType(editType)
     resetForm()
@@ -166,7 +166,6 @@
           form.parentId = row.id
           form.path = row.path
         }).then()
-        // 复制
       } else {
         // 复制
         const { data } = await get(id)
diff --git a/src/views/modules/system/menu/MenuList.vue b/src/views/modules/system/menu/MenuList.vue
index 09bace5e3e10870a53b1cd814f82a0a50df89655..a819c9ac2adf432271b2e58070593c7f67c76d9f 100644
--- a/src/views/modules/system/menu/MenuList.vue
+++ b/src/views/modules/system/menu/MenuList.vue
@@ -43,15 +43,7 @@
           <a-button style="margin-left: 8px" @click="allTreeExpand(false)">关闭所有</a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table
-        resizable
-        ref="xTable"
-        border="inner"
-        :stripe="false"
-        :loading="loading"
-        :tree-config="{ children: 'children' }"
-        :data="tableData"
-      >
+      <vxe-table resizable ref="xTable" border="inner" :loading="loading" :tree-config="{ children: 'children' }" :data="tableData">
         <vxe-column field="title" title="菜单名称" tree-node />
         <vxe-column field="name" title="路由名称" />
         <vxe-column field="menuType" title="菜单类型" :visible="false">
@@ -115,7 +107,7 @@
   import { nextTick, onMounted } from 'vue'
   import { Client, findAll } from '/@/views/modules/system/client/Client.api'
   import XEUtils from 'xe-utils'
-  import { menuTree, Menu, del, allTree } from './Menu.api'
+  import { menuTree, Menu, del, menuAndPermCodeTree } from './Menu.api'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import MenuEdit from './MenuEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -158,7 +150,7 @@
   async function queryPage() {
     loading = true
     if (showPermCode) {
-      const { data } = await allTree(clientCode)
+      const { data } = await menuAndPermCodeTree(clientCode)
       remoteTableData = data
     } else {
       const { data } = await menuTree(clientCode)
diff --git a/src/views/modules/system/param/SystemParamList.vue b/src/views/modules/system/param/SystemParamList.vue
index 59b5b8a994de36615a3c79aa6b5bba3d7b538dde..ddecc13a17c4e370ac179bb75af04b7686a9ef78 100644
--- a/src/views/modules/system/param/SystemParamList.vue
+++ b/src/views/modules/system/param/SystemParamList.vue
@@ -130,8 +130,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/path/PermPathEdit.vue b/src/views/modules/system/path/PermPathEdit.vue
index 29a805d86e84995b7c61d5cc07aa2f9a2734e3ab..69fc1ff8ab6b7f20b9bb9d54a9d7d3a966dc52d4 100644
--- a/src/views/modules/system/path/PermPathEdit.vue
+++ b/src/views/modules/system/path/PermPathEdit.vue
@@ -5,13 +5,16 @@
     :loading="confirmLoading"
     :title="title"
     :visible="visible"
-    :mask-closable="showable"
+    :mask-closable="false"
     @cancel="handleCancel"
   >
     <a-form class="small-from-item" ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
+      <a-form-item name="generate" :hidden="true">
+        <a-switch v-model:checked="form.generate" />
+      </a-form-item>
       <a-form-item label="请求路径" name="path">
         <a-input v-model:value="form.path" :disabled="showable" placeholder="请输入请求路径" />
       </a-form-item>
@@ -98,6 +101,7 @@
   function init(id, editType: FormEditType) {
     initFormEditType(editType)
     resetForm()
+    console.log(form.generate)
     getInfo(id, editType)
   }
   // 获取信息
diff --git a/src/views/modules/system/path/PermPathList.vue b/src/views/modules/system/path/PermPathList.vue
index f84ed0ee15e20efd0676fb6f2a9b418f8f9761d2..f08baf7f0f8b4e9ed6f3a2249ad70a33ba2d382d 100644
--- a/src/views/modules/system/path/PermPathList.vue
+++ b/src/views/modules/system/path/PermPathList.vue
@@ -152,8 +152,8 @@
   function remove(record) {
     del(record.id).then(() => {
       notification.success({ message: '删除成功' })
+      queryPage()
     })
-    queryPage()
   }
   // 批量删除
   function removeDataScopeBatch() {
diff --git a/src/views/modules/system/role/Role.api.ts b/src/views/modules/system/role/Role.api.ts
index 9a4ed9312a7b97070e64ef065ccb891b6f315af8..72c54c972f83f659aeefd19334fce188420d83ff 100644
--- a/src/views/modules/system/role/Role.api.ts
+++ b/src/views/modules/system/role/Role.api.ts
@@ -1,6 +1,8 @@
 import { defHttp } from '/@/utils/http/axios'
 import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
+import { MenuTree } from '/@/views/modules/system/menu/Menu.api'
+import { PermPath } from '/@/views/modules/system/path/PermPath.api'
 
 /**
  * 分页
@@ -11,6 +13,14 @@ export const page = (params) => {
     params,
   })
 }
+/**
+ * 分页
+ */
+export const tree = () => {
+  return defHttp.get<Result<RoleTree[]>>({
+    url: '/role/tree',
+  })
+}
 
 /**
  * 获取单条
@@ -105,7 +115,7 @@ export const existsByNameNotId = (name: string, id) => {
 }
 
 /**
- * 查询全部
+ * 查询全部角色
  */
 export const findAll = () => {
   return defHttp.get<Result<Array<Role>>>({
@@ -114,7 +124,7 @@ export const findAll = () => {
 }
 
 /**
- * 根据用户获取拥有的权限
+ * 根据角色获取拥有的权限
  */
 export function findPermissionIdsByRole(roleId, clientCode) {
   return defHttp.get<Result<string[]>>({
@@ -124,11 +134,12 @@ export function findPermissionIdsByRole(roleId, clientCode) {
 }
 
 /**
- * 根据用户id获取角色授权(请求权限列表)
+ * 获取当前用户角色下可见的菜单树(分配时用)
  */
-export function findPathsByUser() {
-  return defHttp.get<Result<string[]>>({
-    url: `/role/path/findPathsByUser`,
+export function findTreeByRole(roleId, clientCode) {
+  return defHttp.get<Result<MenuTree[]>>({
+    url: '/perm/menu/findTreeByRole',
+    params: { roleId, clientCode },
   })
 }
 
@@ -136,22 +147,41 @@ export function findPathsByUser() {
  * 根据角色id获取关联请求权限id
  */
 export function findPathIdsByRole(roleId) {
-  return defHttp.get<Result>({
+  return defHttp.get<Result<string[]>>({
     url: `/role/path/findIdsByRole`,
     params: { roleId },
   })
 }
 
+/**
+ * 获取当前用户角色下可见的请求权限列表(分配时用)
+ */
+export function findPathsByRole(roleId) {
+  return defHttp.get<Result<PermPath[]>>({
+    url: `/role/path/findPathsByRole`,
+    params: { roleId },
+  })
+}
+
 /**
  * 角色
  */
 export interface Role extends BaseEntity {
   // 编码
-  code: string
+  code?: string
+  // 父ID
+  pid?: number
   // 名称
-  name: string
+  name?: string
   // 是否系统内置
   internal?: boolean
   // 说明
-  remark: string
+  remark?: string
+}
+
+/**
+ * 角色树
+ */
+export interface RoleTree extends Role {
+  children?: RoleTree[]
 }
diff --git a/src/views/modules/system/role/RoleEdit.vue b/src/views/modules/system/role/RoleEdit.vue
index 357093b04066e8d2083ebbbab33ff0129f448e08..e009171bedf8995a0344da9172166172f070f686 100644
--- a/src/views/modules/system/role/RoleEdit.vue
+++ b/src/views/modules/system/role/RoleEdit.vue
@@ -1,9 +1,26 @@
 <template>
-  <basic-modal :loading="confirmLoading" v-bind="$attrs" :title="title" :visible="visible" :mask-closable="showable" @cancel="handleCancel">
+  <basic-modal
+    :loading="confirmLoading"
+    v-bind="$attrs"
+    :width="750"
+    :title="title"
+    :visible="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
     <a-form class="small-from-item" :model="form" ref="formRef" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
+      <a-form-item v-show="addable" label="上级菜单" name="parentId">
+        <a-tree-select
+          style="width: 100%"
+          :tree-data="treeData"
+          v-model:value="form.pid"
+          placeholder="请选择上级角色"
+          :disabled="showable"
+        />
+      </a-form-item>
       <a-form-item label="编码" name="code">
         <a-input v-model:value="form.code" :disabled="showable" placeholder="请输入编码" />
       </a-form-item>
@@ -27,14 +44,27 @@
   import { nextTick, reactive } from 'vue'
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { add, get, update, existsByCode, existsByCodeNotId, existsByName, existsByNameNotId, Role } from './Role.api'
+  import { add, get, update, existsByCode, existsByCodeNotId, existsByName, existsByNameNotId, Role, tree } from './Role.api'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { BasicModal } from '/@/components/Modal'
   import { useValidate } from '/@/hooks/bootx/useValidate'
+  import { treeDataTranslate } from '/@/utils/dataUtil'
 
-  const { initFormEditType, handleCancel, search, labelCol, wrapperCol, title, confirmLoading, visible, editable, showable, formEditType } =
-    useFormEdit()
+  const {
+    initFormEditType,
+    handleCancel,
+    search,
+    labelCol,
+    wrapperCol,
+    title,
+    confirmLoading,
+    visible,
+    editable,
+    addable,
+    showable,
+    formEditType,
+  } = useFormEdit()
   const { existsByServer } = useValidate()
 
   // 表单
@@ -42,9 +72,13 @@
   let form = $ref({
     id: null,
     code: '',
+    pid: undefined,
     name: '',
     remark: '',
   } as Role)
+
+  let treeData = $ref<any[]>()
+
   // 校验
   const rules = reactive({
     name: [
@@ -59,21 +93,39 @@
   // 事件
   const emits = defineEmits(['ok'])
   // 入口
-  function init(id, editType: FormEditType) {
+  function init(id, editType: FormEditType, roleId) {
+    initRoleTree()
     initFormEditType(editType)
     resetForm()
-    getInfo(id, editType)
+    getInfo(id, editType, roleId)
   }
-  // 获取信息
-  function getInfo(id, editType: FormEditType) {
+  /**
+   * 查询树
+   */
+  function initRoleTree() {
+    tree().then((res) => {
+      treeData = treeDataTranslate(res.data, 'id', 'name')
+    })
+  }
+
+  /**
+   * 获取信息
+   */
+  function getInfo(id, editType: FormEditType, roleId) {
     if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
       confirmLoading.value = true
       get(id).then(({ data }) => {
         form = data
         confirmLoading.value = false
       })
-    } else {
+    } else if (editType === FormEditType.Add) {
       confirmLoading.value = false
+      // 添加下级
+      if (roleId) {
+        nextTick(() => {
+          form.pid = roleId
+        }).then()
+      }
     }
   }
   // 保存
diff --git a/src/views/modules/system/role/RoleList.vue b/src/views/modules/system/role/RoleList.vue
index fe198059bc522c091e5c5bc44c9cbc3be869dcc9..f6f62eab706328acdc6cd32ab2e42e0530ad9f51 100644
--- a/src/views/modules/system/role/RoleList.vue
+++ b/src/views/modules/system/role/RoleList.vue
@@ -1,7 +1,24 @@
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+      <a-form class="page-query" layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="8" :sm="24">
+            <a-form-item label="查询">
+              <a-input-search
+                v-model:value="searchName"
+                @search="search"
+                @keyup.enter="search"
+                allow-clear
+                placeholder="请输入角色名称或编码"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="queryPage">查询</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
@@ -11,25 +28,21 @@
           </a-space>
         </template>
       </vxe-toolbar>
-      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
-        <vxe-column type="seq" width="60" />
+      <vxe-table resizable ref="xTable" border="inner" :loading="loading" :tree-config="{ children: 'children' }" :data="tableData">
+        <vxe-column field="name" title="名称" tree-node>
+          <template #default="{ row }">
+            <a-link @click="show(row)">{{ row.name }}</a-link>
+          </template>
+        </vxe-column>
         <vxe-column field="code" title="编码" />
-        <vxe-column field="name" title="名称" />
         <vxe-column field="remark" title="说明" />
-        <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="210" :showOverflow="false" title="操作">
+        <vxe-column fixed="right" width="270" :showOverflow="false" title="操作">
           <template #default="{ row }">
-            <span>
-              <a href="javascript:" @click="show(row)">查看</a>
-            </span>
+            <a-link @click="addChildren(row)">添加子角色</a-link>
             <a-divider type="vertical" />
-            <span>
-              <a href="javascript:" @click="edit(row)">编辑</a>
-            </span>
+            <a-link @click="edit(row)">编辑</a-link>
             <a-divider type="vertical" />
-            <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
-              <a href="javascript:" style="color: red">删除</a>
-            </a-popconfirm>
+            <a-link danger @click="remove(row)">删除</a-link>
             <a-divider type="vertical" />
             <a-dropdown>
               <a> 授权 <Icon icon="ant-design:down-outlined" :size="12" /> </a>
@@ -47,14 +60,6 @@
           </template>
         </vxe-column>
       </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
       <role-edit ref="roleEdit" @ok="queryPage" />
       <role-menu-modal ref="roleMenuModal" />
       <role-path-modal ref="rolePathModal" />
@@ -63,24 +68,29 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref } from 'vue'
-  import { del, page } from './Role.api'
+  import { nextTick, onMounted, ref } from 'vue'
+  import { del, RoleTree, tree } from './Role.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import RoleEdit from './RoleEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { $ref } from 'vue/macros'
   import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import Icon from '/@/components/Icon/src/Icon.vue'
-  import RoleMenuModal from "./RoleMenuModal.vue";
-  import RolePathModal from "./RolePathModal.vue";
+  import RoleMenuModal from './RoleMenuModal.vue'
+  import RolePathModal from './RolePathModal.vue'
+  import ALink from '/@/components/Link/Link.vue'
+  import XEUtils from 'xe-utils'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
-  const { createMessage } = useMessage()
+  const { createMessage, createConfirm } = useMessage()
 
+  let searchName = $ref<string>()
+  let tableData = $ref<RoleTree[]>([])
+  let remoteTableData = $ref<RoleTree[]>([])
+  let treeExpand = $ref(false)
   const roleEdit = $ref<any>()
   const roleMenuModal = $ref<any>()
   const rolePathModal = $ref<any>()
@@ -103,11 +113,10 @@
   // 分页查询
   function queryPage() {
     loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
+    tree().then(({ data }) => {
+      remoteTableData = data
+      search()
+      loading.value = false
     })
     return Promise.resolve()
   }
@@ -115,6 +124,9 @@
   function add() {
     roleEdit.init(null, FormEditType.Add)
   }
+  function addChildren(record) {
+    roleEdit.init(null, FormEditType.Add, record.id)
+  }
   // 查看
   function edit(record) {
     roleEdit.init(record.id, FormEditType.Edit)
@@ -123,20 +135,53 @@
   function show(record) {
     roleEdit.init(record.id, FormEditType.Show)
   }
-  // 菜单授权处理
+  /**
+   * 菜单授权处理
+   */
   function handleRoleMenu(record) {
-    roleMenuModal.init(record.id)
+    roleMenuModal.init(record)
   }
-  // 请求授权处理
+  /**
+   * 请求授权处理
+   */
   function handleRolePath(record) {
-    rolePathModal.init(record.id)
+    rolePathModal.init(record)
   }
-  // 删除
+  /**
+   * 删除
+   */
   function remove(record) {
-    del(record.id).then(() => {
-      createMessage.success('删除成功')
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否删除该数据',
+      onOk: () => {
+        del(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+
+  /**
+   * 搜索
+   */
+  function search() {
+    const search = XEUtils.toValueString(searchName).trim().toLowerCase()
+    if (search) {
+      const searchProps = ['name', 'code']
+      tableData = XEUtils.searchTree(remoteTableData, (item) =>
+        searchProps.some((key) => XEUtils.toValueString(item[key]).toLowerCase().indexOf(search) > -1),
+      )
+      // 搜索状态默认展开
+      treeExpand = true
+    } else {
+      tableData = remoteTableData
+    }
+    nextTick(() => {
+      xTable?.setAllTreeExpand(treeExpand)
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/role/RoleMenuModal.vue b/src/views/modules/system/role/RoleMenuModal.vue
index 9ed7282cebdc4ef51f6cad5216eae8bb6fe87bdd..3a36c68438a0507d5a85232d9d19fc6878eae3cd 100644
--- a/src/views/modules/system/role/RoleMenuModal.vue
+++ b/src/views/modules/system/role/RoleMenuModal.vue
@@ -53,15 +53,17 @@
   import { $ref } from 'vue/macros'
   import { findAll as findClients, Client } from '/@/views/modules/system/client/Client.api'
   import { getAppEnvConfig } from '/@/utils/env'
-  import { findPermissionIdsByRole, saveRoleMenu } from '/@/views/modules/system/role/Role.api'
+  import { findPermissionIdsByRole, findTreeByRole, RoleTree, saveRoleMenu } from '/@/views/modules/system/role/Role.api'
   import { Tree, treeDataTranslate } from '/@/utils/dataUtil'
   import XEUtils from 'xe-utils'
-  import { allTree, MenuTree } from '/@/views/modules/system/menu/Menu.api'
+  import { MenuTree } from '/@/views/modules/system/menu/Menu.api'
+  import { useMessage } from '/@/hooks/web/useMessage'
 
   const { VITE_GLOB_APP_CLIENT } = getAppEnvConfig()
+  const { createMessage, createConfirm } = useMessage()
 
   let loading = $ref(false)
-  let roleId = $ref('')
+  let currentRole = $ref<RoleTree>({})
   let visible = $ref(false)
   // 终端列表
   let clients = $ref([] as Client[])
@@ -80,31 +82,36 @@
   let treeData = $ref<Tree[]>([])
   let treeList = $ref<MenuTree[]>([])
 
-  function init(id) {
-    roleId = id
+  function init(record: RoleTree) {
+    currentRole = record
     initData()
     initAssign()
   }
 
+  /**
+   * 初始化终端列表
+   */
   function initData() {
     findClients().then(({ data }) => {
       clients = data
     })
   }
 
-  // 初始化菜单分配信息
+  /**
+   * 初始化菜单分配信息
+   */
   async function initAssign() {
     visible = true
     loading = true
     searchName = ''
     expandedKeys = []
-    // 权限树
-    await allTree(clientCode).then((res) => {
+    // 当前角色的菜单和权限码树
+    await findTreeByRole(currentRole.id, clientCode).then((res) => {
       treeData = treeDataTranslate(res.data, 'id', 'title')
       generateTreeList(res.data)
     })
     // 当前角色已经选择的
-    await findPermissionIdsByRole(roleId, clientCode).then((res) => {
+    await findPermissionIdsByRole(currentRole.id, clientCode).then((res) => {
       checkedKeys = res.data
     })
     // 所有的key值
@@ -112,23 +119,52 @@
     loading = false
   }
 
-  // 保存
+  /**
+   * 保存
+   */
   function handleSubmit() {
+    // 是否级联更新子角色
+    if (currentRole.children) {
+      createConfirm({
+        iconType: 'warning',
+        title: '警告',
+        cancelText: '不应用',
+        okText: '应用',
+        content: '将新增的权限应用到下级子角色中，注意：删除权限时无论如何选择，都将会下级角色的权限被级联删除',
+        onOk: () => {
+          save(true)
+        },
+        onCancel: () => {
+          save(false)
+        },
+      })
+    } else {
+      save(false)
+    }
+  }
+
+  function save(updateChildren: boolean) {
     loading = true
     saveRoleMenu({
-      roleId,
+      roleId: currentRole.id,
       clientCode,
+      updateChildren,
       permissionIds: checkedKeys,
     }).then(() => {
+      createMessage.success('保存成功')
       handleCancel()
     })
   }
+
   // 取消
   function handleCancel() {
     visible = false
   }
   // 树数据铺平
   function generateTreeList(treeData) {
+    if (!treeData) {
+      return
+    }
     for (let i = 0; i < treeData.length; i++) {
       const node = treeData[i]
       treeList.push(node)
diff --git a/src/views/modules/system/role/RolePathModal.vue b/src/views/modules/system/role/RolePathModal.vue
index 52b3968c7b05283b9585659538d05a09fd36399b..ec91d62703b38126ec4e1d21a3c43498a3609e28 100644
--- a/src/views/modules/system/role/RolePathModal.vue
+++ b/src/views/modules/system/role/RolePathModal.vue
@@ -29,25 +29,38 @@
   import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
   import { $ref } from 'vue/macros'
   import { VxeTableInstance } from 'vxe-table'
-  import { findPathIdsByRole, findPathsByUser, saveRoleMenu, saveRolePath } from "./Role.api";
+  import { findPathIdsByRole, findPathsByRole, RoleTree, saveRolePath } from './Role.api'
   import XEUtils from 'xe-utils'
+  import { useMessage } from '/@/hooks/web/useMessage'
+
+  const { createMessage, createConfirm } = useMessage()
 
   const xTable = $ref<VxeTableInstance>()
 
   let loading = $ref(false)
   let roleId = $ref('')
+  let currentRole = $ref<RoleTree>({})
   let visible = $ref(false)
   let checkedKeys = $ref<string[]>([])
   let tableData = $ref<string[]>([])
 
-  async function init(id) {
+  async function init(record: RoleTree) {
     visible = true
     loading = true
-    roleId = id
-    await findPathIdsByRole(roleId).then(({ data }) => {
+    currentRole = record
+    initAssign()
+  }
+
+  /**
+   * 初始化分配信息
+   */
+  async function initAssign() {
+    // 已经勾选的
+    await findPathIdsByRole(currentRole.id).then(({ data }) => {
       checkedKeys = data
     })
-    await findPathsByUser().then(({ data }) => {
+    // 可以被分配的
+    await findPathsByRole(currentRole.id).then(({ data }) => {
       const result = [] as any[]
       // 对数据进行分组
       XEUtils.each(XEUtils.groupBy(data, 'groupName'), (children, key) => {
@@ -57,27 +70,58 @@
         })
       })
       tableData = result
-      xTable.reloadData(tableData)
+      xTable?.reloadData(tableData)
       loading = false
     })
   }
 
-  // 保存
+  /**
+   * 保存
+   */
   function handleSubmit() {
+    loading = true
+    // 是否级联更新子角色
+    if (currentRole.children) {
+      createConfirm({
+        iconType: 'warning',
+        title: '警告',
+        cancelText: '不应用',
+        okText: '应用',
+        content: '将新增的权限应用到下级子角色中，注意：删除权限时无论如何选择，都将会下级角色的权限被级联删除',
+        onOk: () => {
+          save(true)
+        },
+        onCancel: () => {
+          save(false)
+        },
+      })
+    } else {
+      save(false)
+    }
+  }
+
+  /**
+   * 保存
+   */
+  function save(updateChildren: boolean) {
     loading = true
     const checkedKeys = xTable
-      .getCheckboxRecords()
+      ?.getCheckboxRecords()
       .map((res) => res.id)
       .filter((id) => id.indexOf('row_') === -1)
     saveRolePath({
-      roleId,
+      roleId: currentRole.id,
+      updateChildren,
       permissionIds: checkedKeys,
     }).then(() => {
+      createMessage.success('保存成功')
       handleCancel()
     })
   }
 
-  // 取消
+  /**
+   * 取消
+   */
   function handleCancel() {
     visible = false
   }
diff --git a/src/views/modules/system/scope/DataScope.api.ts b/src/views/modules/system/scope/DataRole.api.ts
similarity index 70%
rename from src/views/modules/system/scope/DataScope.api.ts
rename to src/views/modules/system/scope/DataRole.api.ts
index 4059124371c693799c037dbbb56683cbbba866e7..8e4701d19afba32b97f2446fbd8daa575c92edf1 100644
--- a/src/views/modules/system/scope/DataScope.api.ts
+++ b/src/views/modules/system/scope/DataRole.api.ts
@@ -6,8 +6,8 @@ import { BaseEntity } from '/#/web'
  * 分页
  */
 export const page = (params) => {
-  return defHttp.get<Result<PageResult<DataScope>>>({
-    url: '/data/scope/page',
+  return defHttp.get<Result<PageResult<DataRole>>>({
+    url: '/data/role/page',
     params,
   })
 }
@@ -16,8 +16,8 @@ export const page = (params) => {
  * 获取单条
  */
 export const get = (id) => {
-  return defHttp.get<Result<DataScope>>({
-    url: '/data/scope/findById',
+  return defHttp.get<Result<DataRole>>({
+    url: '/data/role/findById',
     params: { id },
   })
 }
@@ -25,9 +25,9 @@ export const get = (id) => {
 /**
  * 添加
  */
-export const add = (obj: DataScope) => {
+export const add = (obj: DataRole) => {
   return defHttp.post({
-    url: '/data/scope/add',
+    url: '/data/role/add',
     data: obj,
   })
 }
@@ -35,9 +35,9 @@ export const add = (obj: DataScope) => {
 /**
  * 更新
  */
-export const update = (obj: DataScope) => {
+export const update = (obj: DataRole) => {
   return defHttp.post({
-    url: '/data/scope/update',
+    url: '/data/role/update',
     data: obj,
   })
 }
@@ -47,7 +47,7 @@ export const update = (obj: DataScope) => {
  */
 export const del = (id) => {
   return defHttp.delete({
-    url: '/data/scope/delete',
+    url: '/data/role/delete',
     params: { id },
   })
 }
@@ -56,8 +56,8 @@ export const del = (id) => {
  * 查询全部
  */
 export const findAll = () => {
-  return defHttp.get<Result<Array<DataScope>>>({
-    url: '/data/scope/findAll',
+  return defHttp.get<Result<Array<DataRole>>>({
+    url: '/data/role/findAll',
   })
 }
 
@@ -66,13 +66,13 @@ export const findAll = () => {
  */
 export function existsByCode(code: string) {
   return defHttp.get<Result<boolean>>({
-    url: '/data/scope/existsByCode',
+    url: '/data/role/existsByCode',
     params: { code },
   })
 }
 export function existsByCodeNotId(code, id) {
   return defHttp.get<Result<boolean>>({
-    url: '/data/scope/existsByCodeNotId',
+    url: '/data/role/existsByCodeNotId',
     params: { code, id },
   })
 }
@@ -82,13 +82,13 @@ export function existsByCodeNotId(code, id) {
  */
 export function existsByName(name: string) {
   return defHttp.get<Result<boolean>>({
-    url: '/data/scope/existsByName',
+    url: '/data/role/existsByName',
     params: { name },
   })
 }
 export function existsByNameNotId(name: string, id) {
   return defHttp.get<Result<boolean>>({
-    url: '/data/scope/existsByNameNotId',
+    url: '/data/role/existsByNameNotId',
     params: { name, id },
   })
 }
@@ -98,7 +98,7 @@ export function existsByNameNotId(name: string, id) {
  */
 export function getDeptIds(id) {
   return defHttp.get<Result<string[]>>({
-    url: '/data/scope/getDeptIds',
+    url: '/data/role/getDeptIds',
     params: { id },
   })
 }
@@ -108,7 +108,7 @@ export function getDeptIds(id) {
  */
 export function saveDeptAssign(obj) {
   return defHttp.post({
-    url: '/data/scope/saveDeptAssign',
+    url: '/data/role/saveDeptAssign',
     data: obj,
   })
 }
@@ -116,9 +116,9 @@ export function saveDeptAssign(obj) {
 /**
  * 获取关联的用户列表
  */
-export function findUsersByDataScopeId(id) {
+export function findUsersByDataRoleId(id) {
   return defHttp.get<Result<DataScopeUser[]>>({
-    url: '/data/scope/findUsersByDataScopeId',
+    url: '/data/role/findUsersByDataRoleId',
     params: { id },
   })
 }
@@ -128,7 +128,7 @@ export function findUsersByDataScopeId(id) {
  */
 export function saveUserAssign(obj) {
   return defHttp.post({
-    url: '/data/scope/saveUserAssign',
+    url: '/data/role/saveUserAssign',
     data: obj,
   })
 }
@@ -138,7 +138,7 @@ export function saveUserAssign(obj) {
  */
 export function deleteBatchUserAssign(obj) {
   return defHttp.delete({
-    url: '/data/scope/deleteUserAssigns',
+    url: '/data/role/deleteUserAssigns',
     data: obj,
   })
 }
@@ -146,13 +146,13 @@ export function deleteBatchUserAssign(obj) {
 /**
  * 数据范围权限
  */
-export interface DataScope extends BaseEntity {
+export interface DataRole extends BaseEntity {
   // 编码
   code?: string
   // 名称
   name?: string
   // 类型
-  type?: number
+  type?: string
   // 说明
   remark?: string
 }
diff --git a/src/views/modules/system/scope/DataScopeEdit.vue b/src/views/modules/system/scope/DataRoleEdit.vue
similarity index 84%
rename from src/views/modules/system/scope/DataScopeEdit.vue
rename to src/views/modules/system/scope/DataRoleEdit.vue
index e23ac4b38d78425a8425167abf386de5f6b6707b..0fb5694de842a98f27e5482bb84a968c634123a0 100644
--- a/src/views/modules/system/scope/DataScopeEdit.vue
+++ b/src/views/modules/system/scope/DataRoleEdit.vue
@@ -18,8 +18,14 @@
       <a-form-item label="编码" name="code">
         <a-input v-model:value="form.code" :disabled="showable" placeholder="请输入编码" />
       </a-form-item>
-      <a-form-item label="类型" name="type">
-        <a-select :disabled="!addable" :options="dataScopeTypes" v-model:value="form.type" style="width: 100%" placeholder="选择支付方式" />
+      <a-form-item label="权限类型" name="type">
+        <a-select
+          :disabled="showable"
+          :options="dataScopeTypes"
+          v-model:value="form.type"
+          style="width: 100%"
+          placeholder="选择管理数据权限类型"
+        />
       </a-form-item>
       <a-form-item label="说明" name="remark">
         <a-input v-model:value="form.remark" :disabled="showable" placeholder="请输入说明" />
@@ -38,7 +44,7 @@
   import { nextTick, reactive } from 'vue'
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { add, get, update, existsByCode, existsByCodeNotId, existsByName, existsByNameNotId, DataScope } from './DataScope.api'
+  import { add, get, update, existsByCode, existsByCodeNotId, existsByName, existsByNameNotId, DataRole } from './DataRole.api'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { BasicModal } from '/@/components/Modal'
@@ -47,7 +53,7 @@
   import { useDict } from '/@/hooks/bootx/useDict'
 
   const { existsByServer } = useValidate()
-  const { dictDropDownNumber } = useDict()
+  const { dictDropDown } = useDict()
   const {
     initFormEditType,
     handleCancel,
@@ -67,12 +73,11 @@
   // 表单
   const formRef = $ref<FormInstance>()
   let form = $ref({
-    id: null,
     code: '',
     name: '',
-    type: 1,
+    type: undefined,
     remark: '',
-  } as DataScope)
+  } as DataRole)
   // 校验
   const rules = reactive({
     name: [
@@ -87,9 +92,12 @@
   } as Record<string, Rule[]>)
   // 事件
   const emits = defineEmits(['ok'])
-  // 入口
-  function init(id, editType: FormEditType) {
-    dataScopeTypes = dictDropDownNumber('DataScopePerm')
+  /**
+   * 入口
+   */
+  async function init(id, editType: FormEditType) {
+    dataScopeTypes = await dictDropDown('DataScopePerm')
+    console.log(dataScopeTypes)
     initFormEditType(editType)
     resetForm()
     getInfo(id, editType)
@@ -130,11 +138,6 @@
   async function validateCode() {
     const { code, id } = form
     return existsByServer(code, id, formEditType.value, existsByCode, existsByCodeNotId)
-    if (!code) {
-      return Promise.resolve()
-    }
-    const res = formEditType.value === FormEditType.Edit ? await existsByCodeNotId(code, id) : await existsByCode(code)
-    return res.data ? Promise.reject('该编码已存在!') : Promise.resolve()
   }
   async function validateName() {
     const { name, id } = form
diff --git a/src/views/modules/system/scope/DataScopeList.vue b/src/views/modules/system/scope/DataRoleList.vue
similarity index 78%
rename from src/views/modules/system/scope/DataScopeList.vue
rename to src/views/modules/system/scope/DataRoleList.vue
index 96e412a0310b1de692d4f562d5aa266a980a7ab9..75c22004c120968b5a29b730ef5379a8dc3c8f72 100644
--- a/src/views/modules/system/scope/DataScopeList.vue
+++ b/src/views/modules/system/scope/DataRoleList.vue
@@ -35,17 +35,17 @@
             <a-popconfirm title="是否删除" @confirm="remove(row)" okText="是" cancelText="否">
               <a href="javascript:" style="color: red">删除</a>
             </a-popconfirm>
-            <template v-if="[2, 3, 4].includes(row.type)">
+            <template v-if="['user', 'dept', 'dept_and_user'].includes(row.type)">
               <a-divider type="vertical" />
               <a-dropdown>
                 <a class="ant-dropdown-link"> 关联 <icon icon="ant-design:down-outlined" :size="12" /> </a>
                 <template #overlay>
                   <a-menu>
-                    <a-menu-item :disabled="![2, 4].includes(row.type)">
-                      <a :disabled="![2, 4].includes(row.type) ? true : null" href="javascript:" @click="handleUserScope(row)">关联用户</a>
+                    <a-menu-item v-if="['user', 'dept_and_user'].includes(row.type)">
+                      <a href="javascript:" @click="handleUserScope(row)">关联用户</a>
                     </a-menu-item>
-                    <a-menu-item :disabled="![3, 4].includes(row.type)">
-                      <a href="javascript:" :disabled="![3, 4].includes(row.type) ? true : null" @click="handleDeptScope(row)">关联部门</a>
+                    <a-menu-item v-if="['dept', 'dept_and_user'].includes(row.type)">
+                      <a href="javascript:" @click="handleDeptScope(row)">关联部门</a>
                     </a-menu-item>
                   </a-menu>
                 </template>
@@ -62,9 +62,9 @@
         :total="pagination.total"
         @page-change="handleTableChange"
       />
-      <data-scope-edit ref="dataScopeEdit" @ok="queryPage" />
-      <dept-scope-modal ref="deptScopeModal" />
-      <user-scope-modal ref="userScopeModal" />
+      <data-role-edit ref="dataRoleEdit" @ok="queryPage" />
+      <dept-role-modal ref="deptRoleModal" />
+      <user-role-modal ref="userRoleModal" />
     </div>
   </div>
 </template>
@@ -72,18 +72,19 @@
 <script lang="ts" setup>
   import { onMounted, ref } from 'vue'
   import { $ref } from 'vue/macros'
-  import { del, page } from './DataScope.api'
+  import { del, page } from './DataRole.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
-  import DataScopeEdit from './DataScopeEdit.vue'
+  import DataRoleEdit from './DataRoleEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { STRING } from '/@/components/Bootx/Query/Query'
   import { useDict } from '/@/hooks/bootx/useDict'
-  import DeptScopeModal from './DeptScopeModal.vue'
-  import UserScopeModal from './UserScopeModal.vue'
+  import DeptRoleModal from './DeptRoleModal.vue'
+  import UserRoleModal from './UserRoleModal.vue'
   import Icon from '/@/components/Icon/src/Icon.vue'
+  import ALink from "/@/components/Link/Link.vue";
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
@@ -98,9 +99,9 @@
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
-  const dataScopeEdit = $ref<any>()
-  const deptScopeModal = $ref<any>()
-  const userScopeModal = $ref<any>()
+  const dataRoleEdit = $ref<any>()
+  const deptRoleModal = $ref<any>()
+  const userRoleModal = $ref<any>()
 
   onMounted(() => {
     vxeBind()
@@ -123,31 +124,31 @@
   }
   // 新增
   function add() {
-    dataScopeEdit.init(null, FormEditType.Add)
+    dataRoleEdit.init(null, FormEditType.Add)
   }
   // 查看
   function edit(record) {
-    dataScopeEdit.init(record.id, FormEditType.Edit)
+    dataRoleEdit.init(record.id, FormEditType.Edit)
   }
   // 查看
   function show(record) {
-    dataScopeEdit.init(record.id, FormEditType.Show)
+    dataRoleEdit.init(record.id, FormEditType.Show)
   }
   // 用户范围
   function handleUserScope(record) {
-    userScopeModal.init(record.id)
+    userRoleModal.init(record.id)
   }
   // 部门范围
   function handleDeptScope(record) {
-    deptScopeModal.init(record.id)
+    deptRoleModal.init(record.id)
   }
 
   // 删除
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
 </script>
 
diff --git a/src/views/modules/system/scope/DeptScopeModal.vue b/src/views/modules/system/scope/DeptRoleModal.vue
similarity index 96%
rename from src/views/modules/system/scope/DeptScopeModal.vue
rename to src/views/modules/system/scope/DeptRoleModal.vue
index 7d573f08551e59ac3d35a738e4c80cae658a67a4..1495f30c47f4c0482b11ef26afe843ee20a41a16 100644
--- a/src/views/modules/system/scope/DeptScopeModal.vue
+++ b/src/views/modules/system/scope/DeptRoleModal.vue
@@ -44,14 +44,14 @@
 <script lang="ts" setup>
   import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
   import { $ref } from 'vue/macros'
-  import { getDeptIds, saveDeptAssign } from '/@/views/modules/system/scope/DataScope.api'
+  import { getDeptIds, saveDeptAssign } from '/@/views/modules/system/scope/DataRole.api'
   import XEUtils from 'xe-utils'
   import { treeDataTranslate } from '/@/utils/dataUtil'
   import { tree } from '/@/views/modules/system/dept/Dept.api'
 
   let loading = $ref(false)
   let visible = $ref(false)
-  let dataScopeId = $ref<string>()
+  let dataRoleId = $ref<string>()
   let searchName = $ref()
   let allTreeKeys = $ref<string[]>([])
   let expandedKeys = $ref<string[]>([])
@@ -66,7 +66,7 @@
   async function init(id) {
     visible = true
     loading = true
-    dataScopeId = id
+    dataRoleId = id
     expandedKeys = []
     // 权限树
     await tree().then(({ data }) => {
@@ -74,7 +74,7 @@
       generateTreeList(data)
     })
     // 当前用户已经分配的数据权限
-    await getDeptIds(dataScopeId).then(({ data }) => {
+    await getDeptIds(dataRoleId).then(({ data }) => {
       checkedKeys = data
     })
     // 所有的key值
@@ -111,7 +111,7 @@
   function handleSubmit() {
     loading = true
     saveDeptAssign({
-      dataScopeId,
+      dataRoleId,
       deptIds: checkedKeys.checked,
     }).then(() => {
       handleCancel()
diff --git a/src/views/modules/system/scope/UserScopeModal.vue b/src/views/modules/system/scope/UserRoleModal.vue
similarity index 92%
rename from src/views/modules/system/scope/UserScopeModal.vue
rename to src/views/modules/system/scope/UserRoleModal.vue
index 0a74c63c9d701343f1cd27c6b83fdc2566a23a96..682ad605796d16cbb1e6b3328caf31667cb23d86 100644
--- a/src/views/modules/system/scope/UserScopeModal.vue
+++ b/src/views/modules/system/scope/UserRoleModal.vue
@@ -29,28 +29,28 @@
 <script lang="ts" setup>
   import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
   import { $ref } from 'vue/macros'
-  import { DataScopeUser, deleteBatchUserAssign, findUsersByDataScopeId, saveUserAssign } from '/@/views/modules/system/scope/DataScope.api'
+  import { DataScopeUser, deleteBatchUserAssign, findUsersByDataRoleId, saveUserAssign } from '/@/views/modules/system/scope/DataRole.api'
   import BUserSelectModal from '/@/components/Bootx/UserSelectModal/BUserSelectModal.vue'
   import { VxeTableInstance } from 'vxe-table'
 
   let loading = $ref(false)
   let visible = $ref(false)
   let selectIds = $ref<string[]>([])
-  let dataScopeId = $ref<string>()
+  let dataRoleId = $ref<string>()
 
   let tableData = $ref<DataScopeUser[]>([])
   const userSelectModal = $ref<any>()
   const xTable = $ref<VxeTableInstance>()
 
   function init(id) {
-    dataScopeId = id
+    dataRoleId = id
     visible = true
     queryList()
   }
   // 查询关联用户信息
   function queryList() {
     loading = true
-    findUsersByDataScopeId(dataScopeId).then(({ data }) => {
+    findUsersByDataRoleId(dataRoleId).then(({ data }) => {
       tableData = data
       loading = false
     })
@@ -63,7 +63,7 @@
   function selectUser(userIds) {
     loading = true
     saveUserAssign({
-      dataScopeId,
+      dataRoleId,
       userIds,
     }).then(() => {
       queryList()
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.vue b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
index e793303e2d33f624b02f23b9be2f8e136025921d..914a15423f8d5dcff3143cd2d6ced8ffd7e14327 100644
--- a/src/views/modules/system/security/password/PasswordSecurityConfig.vue
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
@@ -71,8 +71,9 @@
           </a-row>
           <a-row>
             <a-col :push="8">
-              <a-button :disabled="!edit" type="primary" @click="update">保存信息</a-button>
-              <a-button style="margin-left: 50px" :disabled="edit" @click="edit = true">编辑信息</a-button>
+              <a-button v-if="edit" @click="initData">取消</a-button>
+              <a-button v-if="edit" style="margin-left: 50px" type="primary" @click="update">保存信息</a-button>
+              <a-button v-if="!edit" @click="edit = true">编辑信息</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -97,7 +98,14 @@
   const formRef = $ref<FormInstance>()
   let edit = $ref(false)
 
-  const rules = reactive({} as Record<string, Rule[]>)
+  const rules = reactive({
+    maxPwdErrorCount: [{ required: true, message: '请输入最大密码错误数', trigger: 'blur' }],
+    errorLockTime: [{ required: true, message: '请输入密码错误锁定时间(分钟)', trigger: 'blur' }],
+    updateFrequency: [{ required: true, message: '请输入密码更新频率(天)', trigger: 'blur' }],
+    expireRemind: [{ required: true, message: '请输入到期提醒(天)', trigger: 'blur' }],
+    recentPassword: [{ required: true, message: '请输入不能与近期多少次密码相同', trigger: 'blur' }],
+    sameAsLoginName: [{ required: true, message: '请选择是否允许密码与登录名相同', trigger: 'blur' }],
+  } as Record<string, Rule[]>)
 
   onMounted(() => initData())
 
@@ -105,6 +113,7 @@
    * 初始化数据
    */
   function initData() {
+    edit = false
     loading = true
     getDefault().then(({ data }) => {
       form = data
@@ -117,13 +126,14 @@
    */
   async function update() {
     await formRef?.validate()
-    loading = true
     createConfirm({
       iconType: 'warning',
       title: '警告',
       content: '是否更新密码安全配置信息',
       onOk: async () => {
+        loading = true
         await addOrUpdate(form)
+        edit = false
         createMessage.success('更新密码安全配置成功')
         initData()
       },
diff --git a/src/views/modules/system/user/UserAdd.vue b/src/views/modules/system/user/UserAdd.vue
index 056248811181485a82d109bf14e9132cab5ce2f0..6ce14ea544994ecb3662cdb2a412941fd58fc3c8 100644
--- a/src/views/modules/system/user/UserAdd.vue
+++ b/src/views/modules/system/user/UserAdd.vue
@@ -31,21 +31,21 @@
         <a-form-item label="确认密码" name="confirmPassword">
           <a-input-password v-model:value="form.confirmPassword" placeholder="请重新输入登录密码" />
         </a-form-item>
-        <a-form-item label="关联应用" name="clientIdList">
+        <a-form-item label="关联应用" name="clientIds">
           <a-select
             allowClear
             mode="multiple"
-            v-model:value="form.clientIdList"
-            :default-value="form.clientIdList"
+            v-model:value="form.clientIds"
+            :default-value="form.clientIds"
             :filter-option="search"
             :options="clients"
             placeholder="请选择关联适用的终端"
           />
         </a-form-item>
-        <a-form-item label="手机号" name="phone">
+        <a-form-item label="手机号" validate-first name="phone">
           <a-input v-model:value="form.phone" placeholder="请输入用户手机号" />
         </a-form-item>
-        <a-form-item label="邮箱" name="email">
+        <a-form-item label="邮箱" validate-first name="email">
           <a-input v-model:value="form.email" placeholder="请输入用户邮箱" />
         </a-form-item>
       </a-form>
@@ -76,7 +76,7 @@
     username: '',
     phone: '',
     email: '',
-    clientIdList: [],
+    clientIds: [],
     password: '',
     confirmPassword: '',
   })
@@ -157,6 +157,9 @@
    */
   function validateEmailRule() {
     const { email } = form
+    if (!email) {
+      return Promise.resolve()
+    }
     const { msg, result } = validateEmail(email)
     return result ? Promise.resolve() : Promise.reject(msg)
   }
@@ -173,6 +176,9 @@
    */
   function validatePhone() {
     const { phone } = form
+    if (!phone) {
+      return Promise.resolve()
+    }
     const { msg, result } = validateMobile(phone)
     return result ? Promise.resolve() : Promise.reject(msg)
   }
diff --git a/src/views/modules/system/user/UserAssign.api.ts b/src/views/modules/system/user/UserAssign.api.ts
index 67b6dae4b7370b4f665e42fc673c0d839fbbaf7f..3066c3c502b0542e353a5a926293fa49af1454e4 100644
--- a/src/views/modules/system/user/UserAssign.api.ts
+++ b/src/views/modules/system/user/UserAssign.api.ts
@@ -1,9 +1,8 @@
 import { defHttp } from '/@/utils/http/axios'
-import { PageResult, Result } from '/#/axios'
-import { BaseEntity } from '/#/web'
-import { Role } from "/@/views/modules/system/role/Role.api";
-import { DataScope } from "/@/views/modules/system/scope/DataScope.api";
-import { Dept } from "/@/views/modules/system/dept/Dept.api";
+import { Result } from '/#/axios'
+import { Role } from '/@/views/modules/system/role/Role.api'
+import { DataRole } from '/@/views/modules/system/scope/DataRole.api'
+import { Dept } from '/@/views/modules/system/dept/Dept.api'
 
 /**
  * 获取用户拥有部门id集合
@@ -88,9 +87,9 @@ export function addUserRoleBatch(data) {
 /**
  * 获取用户拥有数据权限id集合
  */
-export function getDataScopeIdByUser(id) {
+export function getDataRoleIdByUser(id) {
   return defHttp.get<Result<string>>({
-    url: `/user/data/scope/findDataScopeIdByUser`,
+    url: `/user/data/role/findDataRoleIdByUser`,
     params: { id },
   })
 }
@@ -99,8 +98,8 @@ export function getDataScopeIdByUser(id) {
  * 获取用户拥有数据权限集合
  */
 export function getDataScopeByUser(id) {
-  return defHttp.get<Result<DataScope>>({
-    url: `/user/data/scope/findDataScopeByUser`,
+  return defHttp.get<Result<DataRole>>({
+    url: `/user/data/role/findDataRoleByUser`,
     params: { id },
   })
 }
@@ -110,7 +109,7 @@ export function getDataScopeByUser(id) {
  */
 export function addUserDataScope(data) {
   return defHttp.post({
-    url: `/user/data/scope/saveAssign`,
+    url: `/user/data/role/saveAssign`,
     data: data,
   })
 }
@@ -120,7 +119,7 @@ export function addUserDataScope(data) {
  */
 export function addUserDataScopeBatch(data) {
   return defHttp.post({
-    url: `/user/data/scope/saveAssignBatch`,
+    url: `/user/data/role/saveAssignBatch`,
     data: data,
   })
 }
diff --git a/src/views/modules/system/user/UserEdit.vue b/src/views/modules/system/user/UserEdit.vue
index f31950432e920de38283f0c425fd9f0d62c2f599..8d62f4828fb487053f56923599c972964bacdee3 100644
--- a/src/views/modules/system/user/UserEdit.vue
+++ b/src/views/modules/system/user/UserEdit.vue
@@ -35,10 +35,10 @@
             placeholder="请选择关联适用的终端"
           />
         </a-form-item>
-        <a-form-item label="手机号" name="phone">
+        <a-form-item label="手机号" validate-first name="phone">
           <a-input v-model:value="form.phone" placeholder="请输入用户手机号" />
         </a-form-item>
-        <a-form-item label="邮箱" name="email">
+        <a-form-item label="邮箱" validate-first name="email">
           <a-input v-model:value="form.email" placeholder="请输入用户邮箱" />
         </a-form-item>
       </a-form>
@@ -132,7 +132,7 @@
   function handleOk() {
     formRef?.validate().then(async () => {
       confirmLoading.value = true
-      await update({ ...form, ...diffForm(rawForm, form, 'username', 'password') })
+      await update({ ...form, ...diffForm(rawForm, form, 'username', 'password', 'phone', 'email') })
       createMessage.success('用户更改成功')
       confirmLoading.value = false
       emits('ok')
@@ -153,7 +153,7 @@
    */
   function validateEmailRule() {
     const { email } = form
-    if (rawForm.email === email) {
+    if (!email) {
       return Promise.resolve()
     }
     const { msg, result } = validateEmail(email)
@@ -175,9 +175,9 @@
    */
   function validatePhone() {
     const { phone } = form
-    // if (rawForm.phone === phone) {
-    //   return Promise.resolve()
-    // }
+    if (!phone) {
+      return Promise.resolve()
+    }
     const { msg, result } = validateMobile(phone)
     return result ? Promise.resolve() : Promise.reject(msg)
   }
@@ -186,9 +186,6 @@
    */
   async function validateBindPhone() {
     const { phone, id } = form
-    // if (rawForm.phone === phone) {
-    //   return Promise.resolve()
-    // }
     const { data } = await existsPhoneNotId(phone, id)
     return data ? Promise.reject('手机号已被使用') : Promise.resolve()
   }
diff --git a/src/views/modules/system/user/UserList.vue b/src/views/modules/system/user/UserList.vue
index dce84facadb3fdea3d96f9e32eb822cbb4bd23a2..88c14ea04e5af673fb5a363d57e5a6374c22f296 100644
--- a/src/views/modules/system/user/UserList.vue
+++ b/src/views/modules/system/user/UserList.vue
@@ -19,7 +19,7 @@
                     <a @click="assignDeptBatch()">部门分配</a>
                   </a-menu-item>
                   <a-menu-item>
-                    <a @click="assignDataScopeBatch()">数据权限分配</a>
+                    <a @click="assignDataScopeBatch()">数据角色分配</a>
                   </a-menu-item>
                   <a-menu-item>
                     <a @click="lockUserConfirmBatch(true)">锁定账号</a>
@@ -60,7 +60,6 @@
             {{ dictConvert('UserStatusCode', row.status) }}
           </template>
         </vxe-column>
-        <vxe-column field="registerTime" title="注册时间" />
         <vxe-column fixed="right" width="170" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a href="javascript:" @click="show(row)">查看</a>
@@ -72,20 +71,20 @@
               <template #overlay>
                 <a-menu>
                   <a-menu-item>
-                    <a @click="assignRoles(row)">角色分配</a>
+                    <a-link @click="assignRoles(row)">角色分配</a-link>
                   </a-menu-item>
                   <a-menu-item>
-                    <a @click="assignDept(row)">部门分配</a>
+                    <a-link @click="assignDept(row)">部门分配</a-link>
                   </a-menu-item>
                   <a-menu-item>
-                    <a @click="assignDataScope(row)">数据权限分配</a>
+                    <a-link @click="assignDataScope(row)">数据角色分配</a-link>
                   </a-menu-item>
                   <a-menu-item>
-                    <a @click="resetPwd(row)">重置密码</a>
+                    <a-link @click="resetPwd(row)">重置密码</a-link>
                   </a-menu-item>
-                  <a-menu-item>
-                    <a v-if="row.status === 1" @click="lockUserConfirm(row.id, true)">封禁账号</a>
-                    <a v-if="row.status === 3" @click="lockUserConfirm(row.id, false)">解锁账号</a>
+                  <a-menu-item v-if="[1, 3].includes(row.status)">
+                    <a-link v-if="row.status === 1" @click="lockUserConfirm(row.id, true)">封禁账号</a-link>
+                    <a-link v-if="row.status === 3" @click="lockUserConfirm(row.id, false)">解锁账号</a-link>
                   </a-menu-item>
                 </a-menu>
               </template>
@@ -132,8 +131,8 @@
   import UserShow from './UserShow.vue'
   import UserRoleAssign from './role/UserRoleAssign.vue'
   import UserRoleAssignBatch from './role/UserRoleAssignBatch.vue'
-  import UserDataScopeAssign from './scope/UserDataScopeAssign.vue'
-  import UserDataScopeAssignBatch from './scope/UserDataScopeAssignBatch.vue'
+  import UserDataScopeAssign from '/@/views/modules/system/user/data/UserDataRoleAssign.vue'
+  import UserDataScopeAssignBatch from '/@/views/modules/system/user/data/UserDataRoleAssignBatch.vue'
   import UserDeptAssign from './dept/UserDeptAssign.vue'
   import UserDeptAssignBatch from './dept/UserDeptAssignBatch.vue'
   import UserResetPwd from './UserResetPwd.vue'
diff --git a/src/views/modules/system/user/UserShow.vue b/src/views/modules/system/user/UserShow.vue
index 7217315b7404f6e7b44236c2cc4378542fe12e3c..26800580782af33f70873617f99f10ed8972dd35 100644
--- a/src/views/modules/system/user/UserShow.vue
+++ b/src/views/modules/system/user/UserShow.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-drawer
     show-footer
-    title="添加用户"
+    title="用户信息"
     v-bind="$attrs"
     :width="modalWidth"
     :visible="visible"
@@ -34,8 +34,8 @@
         <a-form-item label="终端列表">
           <a-tag color="green" v-for="o in clientList" :key="o.id">{{ o.name }}</a-tag>
         </a-form-item>
-        <a-form-item label="数据权限">
-          <a-tag color="green" v-show="dataScope.name">{{ dataScope.name }}</a-tag>
+        <a-form-item label="数据角色">
+          <a-tag color="green" v-show="dataRole.name">{{ dataRole.name }}</a-tag>
         </a-form-item>
         <a-form-item label="部门列表">
           <a-tag color="green" v-for="o in deptList" :key="o.id">{{ o.deptName }}</a-tag>
@@ -56,7 +56,7 @@
   import { Role } from '/@/views/modules/system/role/Role.api'
   import { get, UserInfo } from '/@/views/modules/system/user/User.api'
   import { getDataScopeByUser, getDeptList, getRoles } from '/@/views/modules/system/user/UserAssign.api'
-  import { DataScope } from '/@/views/modules/system/scope/DataScope.api'
+  import { DataRole } from '/@/views/modules/system/scope/DataRole.api'
   import { Dept } from '/@/views/modules/system/dept/Dept.api'
   import { useDict } from '/@/hooks/bootx/useDict'
   import { onMounted } from 'vue'
@@ -71,7 +71,7 @@
   let roles = $ref<Role[]>([])
   let clients = $ref<Client[]>([])
   let clientList = $ref<Client[]>([])
-  let dataScope = $ref<DataScope>({})
+  let dataRole = $ref<DataRole>({})
   let deptList = $ref<Dept[]>([])
 
   async function init(id) {
@@ -88,14 +88,14 @@
       deptList = res.data
     })
     await getDataScopeByUser(id).then((res) => {
-      dataScope = res.data
+      dataRole = res.data
     })
     confirmLoading.value = false
   }
 
   // 获取用户关联终端信息
   function getClientList() {
-    const clientIds = form.clientIdList as string[]
+    const clientIds = form.clientIds as string[]
     return clientIds.map((clientId) => {
       return getClientById(clientId)
     })
diff --git a/src/views/modules/system/user/scope/UserDataScopeAssign.vue b/src/views/modules/system/user/data/UserDataRoleAssign.vue
similarity index 82%
rename from src/views/modules/system/user/scope/UserDataScopeAssign.vue
rename to src/views/modules/system/user/data/UserDataRoleAssign.vue
index 14b66ff71938f1fce6e69268088f97e41641bce7..5d7c06433a6075e9325546f3af0f44ff4dd48e7b 100644
--- a/src/views/modules/system/user/scope/UserDataScopeAssign.vue
+++ b/src/views/modules/system/user/data/UserDataRoleAssign.vue
@@ -17,12 +17,12 @@
         <a-form-item label="用户名称" name="name">
           <a-input :disabled="true" v-model:value="userInfo.name" />
         </a-form-item>
-        <a-form-item label="数据权限" name="dataScopeId">
+        <a-form-item label="数据权限" name="dataRoleId">
           <a-select
             allowClear
-            v-model:value="form.dataScopeId"
+            v-model:value="form.dataRoleId"
             style="width: 100%"
-            :default-value="form.dataScopeId"
+            :default-value="form.dataRoleId"
             :filter-option="search"
             :options="dataScopes"
             placeholder="选择数据权限"
@@ -42,9 +42,9 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { nextTick } from 'vue'
   import { dropdownTranslate } from '/@/utils/dataUtil'
-  import { addUserDataScope, getDataScopeIdByUser } from '/@/views/modules/system/user/UserAssign.api'
+  import { addUserDataScope, getDataRoleIdByUser } from '/@/views/modules/system/user/UserAssign.api'
   import BasicModal from '/@/components/Modal/src/BasicModal.vue'
-  import { findAll as dataScopeList } from '/@/views/modules/system/scope/DataScope.api'
+  import { findAll as dataRoleList } from '/@/views/modules/system/scope/DataRole.api'
 
   const { createMessage } = useMessage()
   const { initFormEditType, handleCancel, search, labelCol, wrapperCol, modalWidth, confirmLoading, visible } = useFormEdit()
@@ -56,7 +56,7 @@
   let dataScopes = $ref<LabeledValue[]>([])
   let form = $ref({
     userId: '',
-    dataScopeId: undefined as undefined | string,
+    dataRoleId: undefined as undefined | string,
   })
 
   async function init(info: UserInfo) {
@@ -68,13 +68,13 @@
     })
     form.userId = info.id as string
     // 获取数据权限列表
-    await dataScopeList().then(({ data }) => {
+    await dataRoleList().then(({ data }) => {
       dataScopes = dropdownTranslate(data, 'name', 'id')
     })
 
     // 获取关联权限信息
-    await getDataScopeIdByUser(userInfo.id).then(({ data }) => {
-      form.dataScopeId = data || undefined
+    await getDataRoleIdByUser(userInfo.id).then(({ data }) => {
+      form.dataRoleId = data || undefined
     })
     confirmLoading.value = false
   }
diff --git a/src/views/modules/system/user/scope/UserDataScopeAssignBatch.vue b/src/views/modules/system/user/data/UserDataRoleAssignBatch.vue
similarity index 87%
rename from src/views/modules/system/user/scope/UserDataScopeAssignBatch.vue
rename to src/views/modules/system/user/data/UserDataRoleAssignBatch.vue
index 01bb424fb7f3987baaa7f0a846d459873093892e..580659ac5c917678ac8a0c3047ccaf92c4b33ce6 100644
--- a/src/views/modules/system/user/scope/UserDataScopeAssignBatch.vue
+++ b/src/views/modules/system/user/data/UserDataRoleAssignBatch.vue
@@ -16,12 +16,12 @@
         </a-col>
       </a-row>
       <a-form class="small-from-item" ref="formRef" :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-form-item label="数据权限" name="dataScopeId">
+        <a-form-item label="数据权限" name="dataRoleId">
           <a-select
             allowClear
-            v-model:value="form.dataScopeId"
+            v-model:value="form.dataRoleId"
             style="width: 100%"
-            :default-value="form.dataScopeId"
+            :default-value="form.dataRoleId"
             :filter-option="search"
             :options="dataScopes"
             placeholder="选择数据权限"
@@ -40,7 +40,7 @@
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { nextTick } from 'vue'
-  import { findAll as dataScopeList } from '/@/views/modules/system/scope/DataScope.api'
+  import { findAll as dataRoleList } from '/@/views/modules/system/scope/DataRole.api'
   import { dropdownTranslate } from '/@/utils/dataUtil'
   import { addUserDataScopeBatch } from '/@/views/modules/system/user/UserAssign.api'
 
@@ -50,7 +50,7 @@
   let dataScopes = $ref<LabeledValue[]>([])
   let form = $ref({
     userIds: [],
-    dataScopeId: undefined as undefined | string,
+    dataRoleId: undefined as undefined | string,
   })
   async function init(ids) {
     visible.value = true
@@ -60,7 +60,7 @@
     })
     form.userIds = ids
     // 获取数据权限列表
-    await dataScopeList().then(({ data }) => {
+    await dataRoleList().then(({ data }) => {
       dataScopes = dropdownTranslate(data, 'name', 'id')
     })
     confirmLoading.value = false
diff --git a/src/views/modules/third/wechat/media/WechatMediaSelect.vue b/src/views/modules/third/wechat/media/WechatMediaSelect.vue
index 7bfb98f389c4e29a116bae159f842ca874d7f8e0..2ef4d3455d4a29528d3d2789e03d3a92cdb660e2 100644
--- a/src/views/modules/third/wechat/media/WechatMediaSelect.vue
+++ b/src/views/modules/third/wechat/media/WechatMediaSelect.vue
@@ -68,8 +68,8 @@
     loading.value = true
     dictDropDown('WeChatMediaType').then((res) => {
       mediaTypes = res
+      queryPage()
     })
-    queryPage()
   }
 
   function queryPage() {
diff --git a/src/views/modules/third/wechat/template/WechatTemplateList.vue b/src/views/modules/third/wechat/template/WechatTemplateList.vue
index 2eea708746c1d0a277f62099e84ccb94b4f3be52..eab3e244ad3c204056cecce2a63cf356066e4bb3 100644
--- a/src/views/modules/third/wechat/template/WechatTemplateList.vue
+++ b/src/views/modules/third/wechat/template/WechatTemplateList.vue
@@ -104,8 +104,8 @@
   function remove(record) {
     del(record.id).then(() => {
       createMessage.success('删除成功')
+      queryPage()
     })
-    queryPage()
   }
   // 同步
   function syncInfo() {
diff --git a/src/views/security/remind/UserRemind.api.ts b/src/views/security/remind/UserRemind.api.ts
index 6c08328cac0e669f8328e8341e0734d9a37a6462..2f6c2cfcdb29ce54b10d55307fb5376c8432afb0 100644
--- a/src/views/security/remind/UserRemind.api.ts
+++ b/src/views/security/remind/UserRemind.api.ts
@@ -6,7 +6,7 @@ import { Result } from '/#/axios'
  */
 export function checkPasswordSecurity() {
   return defHttp.get<Result<passwordSecurityCheckResult>>({
-    url: `/security/password/checkPasswordSecurity`,
+    url: `/security/password/check`,
   })
 }