Commit Graph

68 Commits

Author SHA1 Message Date
vertoryao
309dffa60b Merge remote-tracking branch 'origin/develop' into feature/device
# Conflicts:
#	.env.development
#	.eslintrc.js
#	components.d.ts
#	config/vite.config.dev.ts
#	index.html
#	package.json
#	pnpm-lock.yaml
#	src/api/authority.ts
#	src/api/dept.ts
#	src/api/interceptor.ts
#	src/api/message.ts
#	src/api/role.ts
#	src/api/user.ts
#	src/assets/world.json
#	src/components/breadcrumb/index.vue
#	src/components/footer/index.vue
#	src/components/menu/index.vue
#	src/components/message-box/index.vue
#	src/components/message-box/list.vue
#	src/components/navbar/index.vue
#	src/components/tab-bar/readme.md
#	src/components/tab-bar/tab-item.vue
#	src/config/settings.json
#	src/directive/permission/index.ts
#	src/hooks/permission.ts
#	src/locale/en-US.ts
#	src/locale/zh-CN.ts
#	src/mock/index.ts
#	src/router/guard/permission.ts
#	src/router/guard/userLoginInfo.ts
#	src/router/routes/modules/dashboard.ts
#	src/router/routes/modules/system.ts
#	src/router/routes/modules/user.ts
#	src/store/index.ts
#	src/store/modules/auth/index.ts
#	src/store/modules/auth/type.ts
#	src/store/modules/user/index.ts
#	src/store/modules/user/types.ts
#	src/utils/excel.ts
#	src/views/dashboard/workplace/components/banner.vue
#	src/views/dashboard/workplace/components/data-panel.vue
#	src/views/dashboard/workplace/index.vue
#	src/views/dashboard/workplace/locale/en-US.ts
#	src/views/dashboard/workplace/locale/zh-CN.ts
#	src/views/exception/403/index.vue
#	src/views/exception/404/index.vue
#	src/views/exception/500/index.vue
#	src/views/login/components/banner.vue
#	src/views/login/components/login-form.vue
#	src/views/login/index.vue
#	src/views/login/locale/en-US.ts
#	src/views/login/locale/zh-CN.ts
#	src/views/system/authority/components/auth-edit.vue
#	src/views/system/authority/components/auth-table.vue
#	src/views/system/authority/index.vue
#	src/views/system/authority/locale/en-US.ts
#	src/views/system/authority/locale/zh-CN.ts
#	src/views/system/dept/components/dept-edit.vue
#	src/views/system/dept/index.vue
#	src/views/system/dept/locale/en-US.ts
#	src/views/system/dept/locale/zh-CN.ts
#	src/views/system/permission/index.vue
#	src/views/system/role/components/role-edit.vue
#	src/views/system/role/index.vue
#	src/views/system/role/locale/en-US.ts
#	src/views/system/role/locale/zh-CN.ts
#	src/views/system/user/components/user-edit.vue
#	src/views/system/user/index.vue
#	src/views/system/user/locale/en-US.ts
#	src/views/system/user/locale/zh-CN.ts
#	src/views/user/setting/components/basic-information.vue
#	src/views/user/setting/components/password-reset.vue
#	src/views/user/setting/components/user-panel.vue
#	src/views/user/setting/index.vue
#	src/views/user/setting/locale/en-US.ts
#	src/views/user/setting/locale/zh-CN.ts
2024-12-27 10:32:25 +08:00
cd9a66522a feat(iot产品和设备管理模块): 新增产品和管理的增删改插 2024-12-26 11:34:54 +08:00
vertoryao
51937b0cdd feat(登录模块): 优化权限 2024-12-26 11:31:25 +08:00
3d7394217f perf(分页模块): 优化分页代码
1.将重复代码放进hooks
2024-12-26 11:18:04 +08:00
fba0fe8b77 fix(i18n模块): 修改部分i18n代码 2024-12-26 11:14:48 +08:00
7386ea2a94 feat(首页工作台): 新增首页工作台内容 2024-12-26 11:08:15 +08:00
92f4189810 perf(权限模块): 优化代码,修改bug
1.修改api路径
2.优化事务代码
3.逐步去除英文展示
2024-12-26 10:43:27 +08:00
6f08eda851 feat(消息模块): 新增消息的展示及增删改查
1.新增消息的头部展示
2.新增消息管理的增删改查功能
3.新增用户消息的查看
2024-12-26 10:36:24 +08:00
vertoryao
586bd23203 feat(菜单模块):添加菜单模块
- 优化登录流程
- 添加服务器端获取菜单
2024-12-25 17:03:45 +08:00
vertoryao
6b25c03d37 feat(登录模块):优化登录流程 2024-12-24 17:13:37 +08:00
958a058308 update gitignore 2024-12-24 17:09:28 +08:00
4605b955b0 perf(公告模块): 代码补充
1.系统公告管理pinia代码补充
2.个人公告管理pinia代码补充
2024-12-23 14:03:00 +08:00
8a228763c7 feat(公告模块): 新增公告增删改查和用户公告展示模块
1.新增公告增删改查功能
2.新增用户页面公告展示功能
2024-12-23 13:56:00 +08:00
2bff98212b first commit 2024-11-12 15:44:05 +08:00
d5a0e5a2e7 first commit 2024-11-12 15:37:24 +08:00
47cf480146 first commit 2024-11-12 15:28:28 +08:00
22a2503b77 first commit 2024-11-12 15:27:14 +08:00
480ecc7ffe first commit 2024-11-12 15:19:12 +08:00