调整页面

.env.base

@@ -8,4 +8,4 @@ VITE_API_BASE_PATH=base
 VITE_BASE_PATH=/
 
 # 标题
-VITE_APP_TITLE=企业端管理系统
+VITE_APP_TITLE=机构端管理系统

.env.dev

@@ -20,4 +20,4 @@ VITE_SOURCEMAP=true
 VITE_OUT_DIR=dist-dev
 
 # 标题
-VITE_APP_TITLE=企业端管理系统
+VITE_APP_TITLE=机构端管理系统

.env.gitee

@@ -20,4 +20,4 @@ VITE_SOURCEMAP=false
 VITE_OUT_DIR=dist-pro
 
 # 标题
-VITE_APP_TITLE=企业端管理系统
+VITE_APP_TITLE=机构端管理系统

.env.pro

@@ -20,4 +20,4 @@ VITE_SOURCEMAP=false
 VITE_OUT_DIR=dist-pro
 
 # 标题
-VITE_APP_TITLE=企业端管理系统
+VITE_APP_TITLE=机构端管理系统

.env.test

@@ -20,4 +20,4 @@ VITE_SOURCEMAP=true
 VITE_OUT_DIR=dist-test
 
 # 标题
-VITE_APP_TITLE=企业端管理系统
+VITE_APP_TITLE=机构端管理系统

README.md

@@ -13,132 +13,4 @@ vue-element-plus-admin is a free and open source middle and background template
 
 vue-element-plus-admin is positioned as a background integration scheme, which is not suitable for secondary development as a basic template. Because it integrates many functions that you may not use, it will cause a lot of code redundancy. If your project doesn't pay attention to this problem, you can also directly carry out secondary development based on it.
 
-If you need a basic template, please switch to the `mini` branch. `mini` simply integrates some common layout functions such as layout and dynamic menu, which is more suitable for developers to carry out secondary development.
-
-## Feature
-
-- **State of The Art Development**：Use front-end front-end technology development such as Vue3/vite4
-- **TypeScript**: Application-level JavaScript language
-- **Theming**: Configurable themes
-- **International**：Built-in complete internationalization program
-- **Mock Server** Built-in mock data scheme
-- **Authority** Built-in complete dynamic routing permission generation scheme.
-- **Component** Multiple commonly used components are encapsulated twice
-- **Examples** Built-in rich examples
-
-## Preview
-
-- [vue-element-plus-admin](https://element-plus-admin.cn/) - Full version of the github site
-- [vue-element-plus-admin](https://kailong110120130.gitee.io/vue-element-plus-admin) - Full version of the gitee site
-
-account: **admin/admin**
-
-Online examples do not apply to menu filtering by default, but directly use Static routing
-
-## Documentation
-
-[Document Github](https://element-plus-admin-doc.cn/)
-
-[Document Gitee](https://kailong110120130.gitee.io/vue-element-plus-admin-doc)
-
-## Preparation
-
-- [node](http://nodejs.org/) and [git](https://git-scm.com/) - Project development environment
-- [Vite4](https://vitejs.dev/) - Familiar with vite features
-- [Vue3](https://v3.vuejs.org/) - Familiar with Vue basic syntax
-- [TypeScript](https://www.typescriptlang.org/) - Familiar with the basic syntax of `TypeScript`
-- [Es6+](http://es6.ruanyifeng.com/) - Familiar with es6 basic syntax
-- [Vue-Router-Next](https://next.router.vuejs.org/) - Familiar with the basic use of vue-router
-- [Element-Plus](https://element-plus.org/) - Familiar with the basic use of element-plus
-- [Mock.js](https://github.com/nuysoft/Mock) - mockjs basic syntax
-
-## Install and use
-
-- Get the project code
-
-```bash
-git clone https://github.com/kailong321200875/vue-element-plus-admin.git
-```
-
-- Installation dependencies
-
-```bash
-cd vue-element-plus-admin
-
-pnpm install
-
-```
-
-- run
-
-```bash
-pnpm run dev
-```
-
-- build
-
-```bash
-pnpm run build:pro
-```
-
-## Change Log
-
-[CHANGELOG](./CHANGELOG.md)
-
-## How to contribute
-
-You can [Raise an issue](https://github.com/kailong321200875/vue-element-plus-admin/issues/new) Or submit a Pull Request.
-
-**Pull Request:**
-
-1. Fork code
-2. Create your own branch: `git checkout -b feat/xxxx`
-3. Submit your changes: `git commit -am 'feat(function): add xxxxx'`
-4. Push your branch: `git push origin feat/xxxx`
-5. submit `pull request`
-
-## Git Contribution submission specification
-
-- `feat` New features
-- `fix` Fix bugs
-- `docs` document
-- `style` Format and style (changes that do not affect code operation)
-- `refactor` Refactor
-- `perf` Optimize related, such as improving performance and experience
-- `test` Add test
-- `build` Compilation related modifications, changes to project construction or dependencies
-- `ci` Continuous integration modification
-- `chore` Changes in the construction process or auxiliary tools
-- `revert` Rollback to previous version
-- `workflow` Workflow improvement
-- `mod` Uncertain modification classification
-- `wip` Under development
-- `types` type
-
-## Browser support
-
-The `Chrome 80+` browser is recommended for local development
-
-Support modern browsers, not IE
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## Donate
-
-If you find this project helpful, welcome sponsorship to show your support~
-
-[Paypal Me](https://www.paypal.com/paypalme/ckl94)
-
-<img src="https://github.com/kailong321200875/my-image/raw/master/pay.jpg" />
-
-## Group
-
-If you want to join the technical communication group for discussion, please add me as a friend
-
-<img src="https://github.com/kailong321200875/my-image/raw/master/me.jpg" />
-
-## License
-
-[MIT](./LICENSE)
+If you need a basic template, please switch to the `mini` branch. `mini` simply integrates some common layout functions such as layout and dynamic menu, which is more suitable for developers to carry out secondary development.

README.zh-CN.md

@@ -11,134 +11,4 @@
 
 vue-element-plus-admin 是一个基于 `element-plus` 免费开源的中后台模版。使用了最新的`vue3`，`vite`，`TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，可以用来作为项目的启动模版，也可用于学习参考。并且时刻关注着最新技术动向，尽可能的第一时间更新。
 
-vue-element-plus-admin 的定位是后台集成方案，不太适合当基础模板来进行二次开发。因为集成了很多你可能用不到的功能，会造成不少的代码冗余。如果你的项目不关注这方面的问题，也可以直接基于它进行二次开发。
-
-如需要基础模版，请切换到 `mini` 分支，`mini` 只简单集成了一些如：布局、动态菜单等常用布局功能，更适合开发者进行二次开发。
-
-## 特性
-
-- **最新技术栈**：使用 Vue3/vite4 等前端前沿技术开发
-- **TypeScript**: 应用程序级 JavaScript 的语言
-- **主题**: 可配置的主题
-- **国际化**：内置完善的国际化方案
-- **自定义数据** 内置 Mock 数据方案
-- **权限** 内置完善的动态路由权限生成方案
-- **组件** 二次封装了多个常用的组件
-- **示例** 内置丰富的示例
-
-## 预览
-
-- [vue-element-plus-admin](https://element-plus-admin.cn/) - 完整版 github 站点
-- [vue-element-plus-admin](https://kailong110120130.gitee.io/vue-element-plus-admin) - 完整版 gitee 站点
-
-帐号：**admin/admin**
-
-在线例子默认不适用菜单过滤，而是直接使用静态路由表
-
-## 文档
-
-[文档地址 Github](https://element-plus-admin-doc.cn/)
-
-[文档地址 Gitee](https://kailong110120130.gitee.io/vue-element-plus-admin-doc)
-
-## 前序准备
-
-- [node](http://nodejs.org/) 和 [git](https://git-scm.com/) - 项目开发环境
-- [Vite4](https://vitejs.dev/) - 熟悉 vite 特性
-- [Vue3](https://v3.vuejs.org/) - 熟悉 Vue 基础语法
-- [TypeScript](https://www.typescriptlang.org/) - 熟悉 `TypeScript` 基本语法
-- [Es6+](http://es6.ruanyifeng.com/) - 熟悉 es6 基本语法
-- [Vue-Router-Next](https://next.router.vuejs.org/) - 熟悉 vue-router 基本使用
-- [Element-Plus](https://element-plus.org/) - element-plus 基本使用
-- [Mock.js](https://github.com/nuysoft/Mock) - mockjs 基本语法
-
-## 安装和使用
-
-- 获取代码
-
-```bash
-git clone https://github.com/kailong321200875/vue-element-plus-admin.git
-```
-
-- 安装依赖
-
-```bash
-cd vue-element-plus-admin
-
-pnpm install
-
-```
-
-- 运行
-
-```bash
-pnpm run dev
-```
-
-- 打包
-
-```bash
-pnpm run build:pro
-```
-
-## 更新日志
-
-[更新日志](./CHANGELOG.md)
-
-## 如何贡献
-
-你可以[提一个 issue](https://github.com/kailong321200875/vue-element-plus-admin/issues/new) 或者提交一个 Pull Request。
-
-**Pull Request:**
-
-1. Fork 代码
-2. 创建自己的分支: `git checkout -b feat/xxxx`
-3. 提交你的修改: `git commit -am 'feat(function): add xxxxx'`
-4. 推送您的分支: `git push origin feat/xxxx`
-5. 提交 `pull request`
-
-## Git 贡献提交规范
-
-- `feat` 新功能
-- `fix` 修补 bug
-- `docs` 文档
-- `style` 格式、样式(不影响代码运行的变动)
-- `refactor` 重构(即不是新增功能，也不是修改 BUG 的代码)
-- `perf` 优化相关，比如提升性能、体验
-- `test` 添加测试
-- `build` 编译相关的修改，对项目构建或者依赖的改动
-- `ci` 持续集成修改
-- `chore` 构建过程或辅助工具的变动
-- `revert` 回滚到上一个版本
-- `workflow` 工作流改进
-- `mod` 不确定分类的修改
-- `wip` 开发中
-- `types` 类型
-
-## 浏览器支持
-
-本地开发推荐使用 `Chrome 80+` 浏览器
-
-支持现代浏览器, 不支持 IE
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/archive/internet-explorer_9-11/internet-explorer_9-11_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| :-: | :-: | :-: | :-: | :-: |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## Donate
-
-如果你觉得这个项目有帮助，欢迎赞助以示支持~
-
-[Paypal Me](https://www.paypal.com/paypalme/ckl94)
-
-<img src="https://gitee.com/kailong110120130/my-image/raw/master/pay.jpg" />
-
-## 交流群
-
-如果你想进入技术交流群讨论，请添加我为好友
-
-<img src="https://gitee.com/kailong110120130/my-image/raw/master/me.jpg" />
-
-## 许可证
-
-[MIT](./LICENSE)
+vue-element-plus-admin 的定位是后台集成方案，不太适合当基础模板来进行二次开发。因为集成了很多你可能用不到的功能，会造成不少的代码冗余。如果你的项目不关注这方面的问题，也可以直接基于它进行二次开发。

src/api/department/index.ts

@@ -1,40 +1,20 @@
 import request from '@/config/axios'
 
-export const getDepartmentItemApi = (id: string) => {
-  return request.get({ url: `/oms/organization/info/${id}` })
+export const getListApi = (params: any) => {
+  return request.get({ url: '/oms/dept/list', params })
 }
 
-export const getUserListByIdApi = (params: any) => {
-  return request.get({ url: '/oms/emp/list', params })
+export const saveApi = (data: any) => {
+  return request.post({ url: '/oms/dept/save', data })
 }
-
-export const getUserByIdApi = (id: string) => {
-  return request.get({ url: `/oms/emp/info/${id}`, params })
-}
-
-export const deleteUserByIdApi = (data: any) => {
-  return request.post({ url: '/oms/emp/delete', data })
-}
-
-export const saveUserApi = (data: any) => {
-  return request.post({ url: '/oms/emp/save', data })
-}
-export const updateUserApi = (data: any) => {
-  return request.post({ url: '/oms/emp/update', data })
-}
-
-export const saveDepartmentApi = (data: any) => {
-  return request.post({ url: '/oms/organization/save', data })
-}
-
-export const updateDepartmentApi = (data: any) => {
-  return request.post({ url: '/oms/organization/update', data })
+export const updateApi = (data: any) => {
+  return request.post({ url: '/oms/dept/update', data })
 }
 
-export const deleteDepartmentApi = (ids: string[] | number[]) => {
-  return request.post({ url: '/oms/organization/delete', data: ids })
+export const deleteApi = (ids: string[] | number[]) => {
+  return request.post({ url: '/oms/dept/delete', data: ids })
 }
 
-export const getDepartmentTableApi = (params: any) => {
-  return request.get({ url: '/oms/organization/list', params })
+export const getOptionsApi = () => {
+  return request.get({ url: '/oms/dept/items' })
 }

src/api/login/index.ts

@@ -6,15 +6,15 @@ interface RoleParams {
 }
 
 export const loginApi = (data: UserLoginType): Promise<IResponse<UserType>> => {
-  return request.post({ url: '/sys/login', data })
+  return request.post({ url: '/oms/login', data })
 }
 
 export const loginOutApi = (): Promise<IResponse> => {
-  return request.post({ url: '/sys/logout' })
+  return request.post({ url: '/oms/logout' })
 }
 
 export const getUserInfo = (): Promise<IResponse> => {
-  return request.get({ url: '/sys/info' })
+  return request.get({ url: '/oms/info' })
 }
 
 export const getUserListApi = ({ params }: AxiosConfig) => {

src/api/manage/company.ts

@@ -1,18 +0,0 @@
-import request from '@/config/axios'
-// import type { FileData } from './types'
-
-export const getTableListApi = (data: any) => {
-  return request.post({ url: '/api/company/page', data })
-}
-
-export const delTableListApi = (id: string | number): Promise<IResponse> => {
-  return request.delete({ url: `/api/company/${id}` })
-}
-
-export const saveTableApi = (data: any) => {
-  return request.post({ url: '/api/company', data })
-}
-
-export const updateTableApi = (data: any) => {
-  return request.put({ url: '/api/company', data })
-}

src/api/manage/file.ts

@@ -1,18 +0,0 @@
-import request from '@/config/axios'
-// import type { FileData } from './types'
-
-export const getTableListApi = (data: any) => {
-  return request.post({ url: '/api/sysApk/page', data })
-}
-
-export const delTableListApi = (id: string | number): Promise<IResponse> => {
-  return request.post({ url: `/api/sysApk/deleteApkById/${id}` })
-}
-
-export const saveTableApi = (data: any) => {
-  return request.post({ url: '/api/sysApk/addSysApk', data })
-}
-
-export const updateTableApi = (data: any) => {
-  return request.post({ url: '/api/sysApk/updateSysApk', data })
-}

src/api/manage/img.ts

@@ -1,18 +0,0 @@
-import request from '@/config/axios'
-// import type { FileData } from './types'
-
-export const getTableListApi = (data: any) => {
-  return request.post({ url: '/api/banner/page', data })
-}
-
-export const delTableListApi = (id: string | number): Promise<IResponse> => {
-  return request.delete({ url: `/api/banner/${id}` })
-}
-
-export const saveTableApi = (data: any) => {
-  return request.post({ url: '/api/banner', data })
-}
-
-export const updateTableApi = (data: any) => {
-  return request.put({ url: '/api/banner', data })
-}

src/api/manage/news.ts

@@ -1,22 +0,0 @@
-import request from '@/config/axios'
-import type { NewsTableData } from './types'
-
-export const getTableListApi = (data: any) => {
-  return request.post({ url: '/api/article/page', data })
-}
-
-export const saveTableApi = (data: Partial<NewsTableData>): Promise<IResponse> => {
-  return request.post({ url: '/api/article', data })
-}
-
-export const updateTableApi = (data: Partial<NewsTableData>): Promise<IResponse> => {
-  return request.put({ url: '/api/article', data })
-}
-
-export const getTableDetApi = (id: string): Promise<IResponse<NewsTableData>> => {
-  return request.get({ url: `/api/article/${id}` })
-}
-
-export const delTableListApi = (id: string | number): Promise<IResponse> => {
-  return request.delete({ url: `/api/article/${id}` })
-}

src/api/manage/product.ts

@@ -1,22 +0,0 @@
-import request from '@/config/axios'
-import type { ProductTableData } from './types'
-
-export const getTableListApi = (data: any) => {
-  return request.post({ url: '/api/product/page', data })
-}
-
-export const saveTableApi = (data: Partial<ProductTableData>): Promise<IResponse> => {
-  return request.post({ url: '/api/product', data })
-}
-
-export const updateTableApi = (data: Partial<ProductTableData>): Promise<IResponse> => {
-  return request.put({ url: '/api/product', data })
-}
-
-export const getTableDetApi = (id: string): Promise<IResponse<ProductTableData>> => {
-  return request.get({ url: `/api/product/${id}` })
-}
-
-export const delTableListApi = (id: string | number): Promise<IResponse> => {
-  return request.delete({ url: `/api/product/${id}` })
-}

src/api/manage/types.ts

@@ -1,76 +0,0 @@
-export type FileData = {
-  id?: string
-  virtualPath: string
-  updateTime?: string
-  fileName?: string
-  filePath?: string
-}
-
-export type ProductTableData = {
-  id?: string
-  productName: string
-  productPic: string
-  productSpecifications?: string
-  productIntroduction?: string
-  productDetailed?: string
-  productCharacteristic?: string
-  productPrice: number
-  productStock: number
-  remark: string
-}
-
-export type NewsTableData = {
-  id?: string
-  articleContent: string
-  articlePic: string
-  articleTitle: string
-  categoryId?: string
-  articleViews: number
-  introduce: string
-  remark: string
-  updateTime: string
-  videoUrl: string
-  weight: number
-}
-
-export type CompanyData = {
-  id?: string
-  companyAddress?: string
-  companyBrief?: string
-  companyEmail?: string
-  companyName: string
-  companyPhone?: string
-  isActive?: string
-  name?: string
-  phone?: string
-  wechat?: string
-  wechatImg: string
-}
-
-export type ImgData = {
-  id?: string
-  bannerUrl: string
-  updateTime?: string
-  bannerType?: string
-  bannerTarget?: string
-}
-
-export type DictData = {
-  id?: string
-  code?: string
-  name?: string
-  pid?: string
-  showText?: string
-  description?: number
-  isActive?: string
-}
-
-export type DictRowData = {
-  id: string
-  code: string
-  name: string
-  pid?: string
-  showText?: string
-  description?: number
-  isActive: string
-}

src/api/menu/index.ts

@@ -1,17 +1,17 @@
 import request from '@/config/axios'
 
-export const getMenuListApi = () => {
-  return request.get({ url: '/sys/menu/tree' })
+export const getMenuListApi = (params: any) => {
+  return request.get({ url: '/oms/menu/tree', params })
 }
 
 export const saveMenu = (data: any) => {
-  return request.post({ url: '/sys/menu/save', data })
+  return request.post({ url: '/oms/menu/save', data })
 }
 
 export const deleteMenu = (data: any) => {
-  return request.post({ url: '/sys/menu/delete', data })
+  return request.post({ url: '/oms/menu/delete', data })
 }
 
 export const updateMenu = (data: any) => {
-  return request.post({ url: '/sys/menu/update', data })
+  return request.post({ url: '/oms/menu/update', data })
 }

src/api/role/index.ts

@@ -1,29 +1,33 @@
 import request from '@/config/axios'
 
 export const getRoleListApi = (params: any) => {
-  return request.get({ url: '/sys/role/list', params })
+  return request.get({ url: '/oms/role/list', params })
 }
 
 export const getRoleInfo = (params: any) => {
-  return request.get({ url: `/sys/role/info/${params.id}`, params })
+  return request.get({ url: `/oms/role/info/${params.id}`, params })
 }
 
 export const getRoleMenu = (params: any) => {
-  return request.get({ url: `/sys/role/roleMenu/${params.id}`, params })
+  return request.get({ url: `/oms/role/roleMenu/${params.id}`, params })
 }
 
 export const saveRole = (data: any) => {
-  return request.post({ url: `/sys/role/save`, data })
+  return request.post({ url: `/oms/role/save`, data })
 }
 
 export const updateRole = (data: any) => {
-  return request.post({ url: `/sys/role/update`, data })
+  return request.post({ url: `/oms/role/update`, data })
 }
 
 export const getRoleOptionsApi = () => {
-  return request.get({ url: 'sys/role/items' })
+  return request.get({ url: '/oms/role/items' })
 }
 
 export const deleteApi = (data: any) => {
-  return request.post({ url: '/sys/role/delete', data })
+  return request.post({ url: '/oms/role/delete', data })
+}
+
+export const saveAllocMenu = (data: any) => {
+  return request.post({ url: '/oms/role/allocMenu', data })
 }

src/api/user/index.ts

@@ -1,21 +1,25 @@
 import request from '@/config/axios'
 
 export const getListApi = (params: any) => {
-  return request.get({ url: '/sys/user/list', params })
+  return request.get({ url: '/oms/emp/list', params })
 }
 
 export const getInfoApi = (params: any) => {
-  return request.get({ url: `/sys/user/info/${params.id}`, params })
+  return request.get({ url: `/oms/emp/info/${params.id}`, params })
 }
 
 export const saveApi = (data: any) => {
-  return request.post({ url: `/sys/user/save`, data })
+  return request.post({ url: `/oms/emp/save`, data })
 }
 
 export const updateApi = (data: any) => {
-  return request.post({ url: `/sys/user/update`, data })
+  return request.post({ url: `/oms/emp/update`, data })
 }
 
 export const deleteApi = (data: any) => {
-  return request.post({ url: `/sys/user/delete`, data })
+  return request.post({ url: `/oms/emp/delete`, data })
+}
+
+export const getUserOptions = () => {
+  return request.get({ url: `/oms/emp/items` })
 }

src/components/UserInfo/src/UserInfo.vue

@@ -52,7 +52,6 @@ const dialogVisible = ref<boolean>(false)
 const lockScreen = () => {
   dialogVisible.value = true
 }
-
 </script>
 
 <template>

src/config/axios/config.ts

@@ -80,9 +80,11 @@ const defaultRequestInterceptors = (config: InternalAxiosRequestConfig) => {
     config.params = {}
     config.url = url
   }
+  config.headers.LoginType = 'oms_backend'
   if (getStorage('token')) {
     const tokenHead = getStorage('tokenHead')
     config.headers[tokenHead] = getStorage('token')
+    config.headers.LoginType = 'emp'
   }
   return config
 }
@@ -108,10 +110,12 @@ const defaultResponseInterceptors = (response: AxiosResponse<any>) => {
         }
       })
     }
-  } else if (response.data.code === 400) {
-    ElMessage.error((response as any).data.message)
-    return response
-  } else {
+  }
+  // else if (response.data.code === 400) {
+  //   ElMessage.error((response as any).data.message)
+  //   return response
+  // }
+  else {
     ElMessage.error((response as any).data.message)
   }
 }

src/views/Authorization/Department/Department.vue

@@ -3,25 +3,20 @@ import { ContentWrap } from '@/components/ContentWrap'
 import { Search } from '@/components/Search'
 import { Dialog } from '@/components/Dialog'
 import { useI18n } from '@/hooks/web/useI18n'
-import { ElButton } from 'element-plus'
+import { ElButton, ElTag } from 'element-plus'
 import { Table } from '@/components/Table'
-import { getDepartmentTableApi, saveDepartmentApi, deleteDepartmentApi } from '@/api/department'
+import { getListApi, saveApi, deleteApi, updateApi } from '@/api/department'
 import type { DepartmentItem } from '@/api/department/types'
 import { useTable } from '@/hooks/web/useTable'
 import { ref, unref, reactive } from 'vue'
 import Write from './components/Write.vue'
-import Detail from './components/Detail.vue'
 import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
-import { getQiniuToken } from '@/api/common'
-import SparkMd5 from 'spark-md5'
-import { useStorage } from '@/hooks/web/useStorage'
 
 const ids = ref<string[]>([])
-const { getStorage } = useStorage()
 const { tableRegister, tableState, tableMethods } = useTable({
   fetchDataApi: async () => {
     const { currentPage, pageSize } = tableState
-    const res = await getDepartmentTableApi({
+    const res = await getListApi({
       order: '',
       orderField: '',
       page: unref(currentPage),
@@ -34,7 +29,7 @@ const { tableRegister, tableState, tableMethods } = useTable({
     }
   },
   fetchDelApi: async () => {
-    const res = await deleteDepartmentApi(unref(ids))
+    const res = await deleteApi(unref(ids))
     return !!res
   }
 })
@@ -48,35 +43,52 @@ const setSearchParams = (params: any) => {
 }
 
 const { t } = useI18n()
-const qiniuUrl = 'http://img.ailinzn.com'
-const qiniuUploadUrl = 'https://up-z1.qiniup.com'
-const currentRow = ref<any>()
-const dataObj = ref({
-  key: '',
-  token: ''
-})
+
 const crudSchemas = reactive<CrudSchema[]>([
   {
     field: 'name',
-    label: t('userDemo.departmentName')
+    label: '部门名称'
   },
+
   {
-    field: 'tel',
-    label: '电话',
+    field: 'enabled',
+    label: '是否启用',
     search: {
       hidden: true
+    },
+    form: {
+      component: 'Switch',
+      value: 1,
+      componentProps: {
+        activeValue: 1,
+        inactiveValue: 0
+      }
+    },
+    table: {
+      slots: {
+        default: (data: any) => {
+          const row = data.row
+          return (
+            <>
+              <ElTag type={row.enabled == '1' ? 'success' : 'danger'}>
+                {row.enabled == '1' ? '启用' : '关闭'}
+              </ElTag>
+            </>
+          )
+        }
+      }
     }
   },
   {
-    field: 'code',
-    label: '编码',
+    field: 'tel',
+    label: '电话',
     search: {
       hidden: true
     }
   },
   {
-    field: 'description',
-    label: '描述',
+    field: 'memo',
+    label: '备注',
     search: {
       hidden: true
     },
@@ -91,96 +103,6 @@ const crudSchemas = reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    field: 'photo',
-    label: 'logo',
-    search: {
-      hidden: true
-    },
-    form: {
-      colProps: {
-        span: 24
-      },
-      component: 'Upload',
-      componentProps: {
-        action: qiniuUploadUrl,
-        class: 'filePageUploader',
-        data: dataObj.value,
-        fileList: currentRow.value?.photo
-          ? [
-              {
-                url: currentRow.value?.photo
-              }
-            ]
-          : [],
-        headers: {
-          token: getStorage('token')
-        },
-        beforeUpload: (file) => {
-          return new Promise((resolve, reject) => {
-            getQiniuToken()
-              .then((response) => {
-                var photoExt = file.name.substr(file.name.lastIndexOf('.')).toLowerCase() // 获得文件后缀名
-                const fileReader = new FileReader()
-                const chunkSize = 1024 * 1024 * 2 // 每个分片的大小 2MB
-                const chunks = Math.ceil(file.size / chunkSize)
-                let currentChunk = 0
-                var spark = new SparkMd5.ArrayBuffer()
-                const loadFile = (e) => {
-                  spark.append(e.target.result)
-                  currentChunk++
-                  if (currentChunk < chunks) {
-                    // 未读取完继续读取
-                    loadNext()
-                  } else {
-                    // 文件读取完
-                    const md5 = spark.end() // 获取文件的md5值
-                    dataObj.value.token = response.data.data
-                    dataObj.value.key = md5 + photoExt
-                    resolve(true)
-                  }
-                }
-                const loadError = () => {
-                  // 读取文件失败
-                  reject('compute file md5 error')
-                }
-                const loadNext = () => {
-                  fileReader.onload = loadFile
-                  fileReader.onerror = loadError
-                  const start = currentChunk * chunkSize
-                  const end = start + chunkSize >= file.size ? file.size : start + chunkSize
-                  const data = file.slice(start, end)
-                  fileReader.readAsArrayBuffer(data)
-                }
-                loadNext()
-              })
-              .catch((err) => {
-                console.log(err)
-                reject(false)
-              })
-          })
-        },
-        onSuccess: (response) => {
-          const url = qiniuUrl + '/' + response.key
-          currentRow.value.photo = url
-        },
-        slots: {
-          default: () => <ElButton type="primary">上传文件</ElButton>
-        }
-      }
-    }
-  },
-
-  {
-    field: 'createTime',
-    label: t('tableDemo.displayTime'),
-    search: {
-      hidden: true
-    },
-    form: {
-      hidden: true
-    }
-  },
   {
     field: 'action',
     width: '260px',
@@ -220,7 +142,7 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 
 const actionType = ref('')
-
+const currentRow = ref()
 const AddAction = () => {
   dialogTitle.value = t('exampleDemo.add')
   currentRow.value = null
@@ -257,15 +179,28 @@ const save = async () => {
   const formData = await write?.submit()
   if (formData) {
     saveLoading.value = true
-    const res = await saveDepartmentApi(formData)
-      .catch(() => {})
-      .finally(() => {
-        saveLoading.value = false
-      })
-    if (res) {
-      dialogVisible.value = false
-      currentPage.value = 1
-      getList()
+    if (formData.id) {
+      const res = await updateApi(formData)
+        .catch(() => {})
+        .finally(() => {
+          saveLoading.value = false
+        })
+      if (res) {
+        dialogVisible.value = false
+        currentPage.value = 1
+        getList()
+      }
+    } else {
+      const res = await saveApi(formData)
+        .catch(() => {})
+        .finally(() => {
+          saveLoading.value = false
+        })
+      if (res) {
+        dialogVisible.value = false
+        currentPage.value = 1
+        getList()
+      }
     }
   }
 }
@@ -302,13 +237,6 @@ const save = async () => {
       :form-schema="allSchemas.formSchema"
       :current-row="currentRow"
     />
-
-    <Detail
-      v-if="actionType === 'detail'"
-      :detail-schema="allSchemas.detailSchema"
-      :current-row="currentRow"
-    />
-
     <template #footer>
       <ElButton v-if="actionType !== 'detail'" type="primary" :loading="saveLoading" @click="save">
         {{ t('exampleDemo.save') }}

src/views/Authorization/Department/components/Detail.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">
-import { PropType } from 'vue'
-import { DepartmentItem } from '@/api/department/types'
-import { Descriptions, DescriptionsSchema } from '@/components/Descriptions'
-
-defineProps({
-  currentRow: {
-    type: Object as PropType<Nullable<DepartmentItem>>,
-    default: () => null
-  },
-  detailSchema: {
-    type: Array as PropType<DescriptionsSchema[]>,
-    default: () => []
-  }
-})
-</script>
-
-<template>
-  <Descriptions :schema="detailSchema" :data="currentRow || {}" />
-</template>

src/views/Authorization/Role/Role.vue

@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { reactive, ref, unref } from 'vue'
-import { getRoleListApi, saveRole, updateRole, deleteApi } from '@/api/role'
+import { getRoleListApi, saveRole, updateRole, deleteApi, saveAllocMenu } from '@/api/role'
 import { useTable } from '@/hooks/web/useTable'
 import { useI18n } from '@/hooks/web/useI18n'
 import { Table, TableColumn } from '@/components/Table'
@@ -128,6 +128,7 @@ const save = async () => {
           getList()
         }
       })
+      saveAllocMenu(formData)
     } else {
       saveRole(formData).then((res) => {
         if (res) {
@@ -136,6 +137,7 @@ const save = async () => {
           getList()
         }
       })
+      saveAllocMenu(formData)
     }
     saveLoading.value = false
   }

src/views/Authorization/Role/components/Write.vue

@@ -105,7 +105,9 @@ const { setValues, getFormData, getElFormExpose } = formMethods
 
 const treeData = ref([])
 const getMenuList = async (ids) => {
-  const res = await getMenuListApi()
+  const res = await getMenuListApi({
+    isApp: 0
+  })
   if (res) {
     treeData.value = res.data
     await nextTick()

src/views/Login/Login.vue

@@ -96,7 +96,6 @@ const toLogin = () => {
 
 .@{prefix-cls} {
   overflow: auto;
-
   &__left {
     &::before {
       position: absolute;

src/views/Login/components/LoginForm.vue

@@ -28,7 +28,7 @@ const { setStorage } = useStorage()
 const { t } = useI18n()
 
 const rules = {
-  username: [required()],
+  mobile: [required()],
   password: [required()]
 }
 
@@ -47,9 +47,9 @@ const schema = reactive<FormSchema[]>([
     }
   },
   {
-    field: 'username',
+    field: 'mobile',
     label: t('login.username'),
-    value: 'admin',
+    value: '16666666666',
     component: 'Input',
     colProps: {
       span: 24