Commit Graph

192 Commits

Author SHA1 Message Date
fyy
9279f2246a fix: 大屏退出登录
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 15:59:53 +08:00
fyy
b7aec71e80 feat: 修改大屏导航布局
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 15:50:20 +08:00
fyy
85ecc8d9f4 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 15:46:10 +08:00
fyy
627cb088cf fix: 修复大屏rem设置影响全局bug 2025-07-11 15:45:25 +08:00
a718e57c3f 1、巡检路线接口修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 15:01:08 +08:00
FLL
7502bb9576 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 14:55:47 +08:00
FLL
15581de676 预约记录 2025-07-11 14:50:19 +08:00
fyy
1aac583b4e Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 12m54s
2025-07-11 11:38:43 +08:00
fyy
b44caa166a fix: 修复保洁绿植bug 2025-07-11 11:37:04 +08:00
15683799673
195d7fff7d 授权逻辑更改 2025-07-11 07:36:51 +08:00
lxj
332d8eccba Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-07-10 18:39:11 +08:00
lxj
2bb489cbaa 页面修改 2025-07-10 18:35:21 +08:00
fyy
031c744877 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 17:54:32 +08:00
fyy
b1d0c117fc feat: 接入大屏修复bug 2025-07-10 17:52:54 +08:00
1d9096e594 1、巡检管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 17:33:46 +08:00
FLL
af0cfc3804 预约记录
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 17:31:58 +08:00
FLL
2cd8d752eb Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-07-10 16:21:36 +08:00
FLL
804e51ac7e 预约记录 2025-07-10 16:20:47 +08:00
FLL
f642b56e55 预约记录 2025-07-10 16:20:21 +08:00
051e7df6c7 1、巡检项目
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 16:13:53 +08:00
FLL
2373bd4957 预约记录 2025-07-10 14:30:51 +08:00
15683799673
ed2e88b99e 增加电梯页面
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 08:45:59 +08:00
fyy
0d2a4db6a6 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 18:20:21 +08:00
fyy
d8174111c2 feat: 会议室查看 2025-07-09 18:18:48 +08:00
f93b6d356b 1、工单处理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 18:12:28 +08:00
FLL
43b1af937b 预约记录
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 17:39:48 +08:00
FLL
c866e04b89 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 15:04:14 +08:00
FLL
afa9e303cb 预约记录 2025-07-09 15:04:05 +08:00
482d4b9199 1、工单类型
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 15:03:17 +08:00
fb963ff3a7 1、工单处理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 10:36:42 +08:00
FLL
e860009b61 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m1s
2025-07-08 17:40:58 +08:00
FLL
2f38afa645 预约记录 2025-07-08 17:40:51 +08:00
80f0b9bd10 1、会议室设置保存
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-08 17:39:09 +08:00
a3c0cbe2a5 1、会议室预约
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-08 17:33:42 +08:00
b1265fb00c 1、会议室设置
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:30:51 +08:00
FLL
602e8951cc 会议管理
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:24:28 +08:00
FLL
7d1c5357d8 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m44s
2025-07-07 16:31:29 +08:00
FLL
0e0b30d159 会议管理 2025-07-07 16:31:20 +08:00
fyy
38012ccdb1 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m42s
2025-07-07 14:38:31 +08:00
fyy
9ab72435c7 feat: 绿植租赁方案添加产品数量 2025-07-07 14:38:01 +08:00
FLL
171d3ef133 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 3m1s
2025-07-05 17:47:36 +08:00
FLL
1d7fbf78b6 会议管理 2025-07-05 17:47:26 +08:00
50bc728ffb 1、租赁订单详情
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-05 17:42:37 +08:00
FLL
ddf8251ce8 会议管理 2025-07-05 11:43:25 +08:00
FLL
06c625fa76 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-07-05 09:59:33 +08:00
FLL
5e050a381c 会议管理 2025-07-05 09:59:25 +08:00
fyy
f5d7d70cc2 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8s
2025-07-05 09:11:56 +08:00
fyy
3031809692 feat: 合并代码 2025-07-05 09:11:29 +08:00
0d5b964596 1、租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-04 17:58:09 +08:00
FLL
e28ddabf57 会议管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-04 17:56:14 +08:00
FLL
e21c76cc6f Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-03 17:49:34 +08:00
FLL
3827a13cbd 会议管理 2025-07-03 17:49:23 +08:00
11f74bcbc8 1、入驻人员调整
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-03 11:48:02 +08:00
73b2d27fa6 1、租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 18:00:26 +08:00
FLL
4bf741f63d Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:56:15 +08:00
FLL
4b3d075266 绿植管理 2025-07-02 17:56:04 +08:00
fyy
63c3a8b550 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 14:43:17 +08:00
fyy
d3033eb12d feat: 绿植租赁方案对接完成 2025-07-02 14:42:17 +08:00
FLL
44b91fc587 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	apps/web-antd/vite.config.mts
2025-07-02 11:04:00 +08:00
FLL
79fe4c6412 绿植管理 2025-07-02 11:02:14 +08:00
lxj
0251d11988 接口新增路径同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 10:07:31 +08:00
lxj
971106c9d9 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 09:51:44 +08:00
lxj
1a9e821f48 接口路径添加add 2025-07-02 09:51:00 +08:00
fyy
f84c4037fb Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 09:49:00 +08:00
fyy
a3b13789a6 fix: 服务地址选择 2025-07-02 09:48:21 +08:00
cfa85a864c 1、租赁订单管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:57:12 +08:00
fyy
33f2197ea8 feat: 构架绿植租赁方案管理页面
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:48:47 +08:00
fyy
0a56fa2194 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 14:40:59 +08:00
fyy
ea185bfcea feat: 前端完成保洁订单流程 2025-07-01 14:39:49 +08:00
FLL
b6f7558aaa Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 11:22:39 +08:00
FLL
ccaeb44f13 访客管理 2025-07-01 11:22:30 +08:00
15683799673
2c1373fd17 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 08:44:30 +08:00
15683799673
bef5cc55e9 门禁授权操作优化 2025-07-01 08:44:21 +08:00
40845f90aa 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 18:11:49 +08:00
fyy
38267d7a4a Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 18:00:06 +08:00
fyy
ebeec8c276 feat: 测试保洁订单 2025-06-30 17:59:17 +08:00
FLL
86e928430a Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 17:58:46 +08:00
FLL
19f8c57e23 访客管理 2025-06-30 17:58:33 +08:00
fyy
bbb3c52af4 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 17:44:09 +08:00
fyy
fa3c442545 feat: 测试保洁订单 2025-06-30 17:42:56 +08:00
9eac725934 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 14:45:06 +08:00
15683799673
d24d03457a 增加门禁授权操作
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:58:16 +08:00
15683799673
f90f0152fe 增加门禁授权操作
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:56:40 +08:00
15683799673
285ac3e0ed 增加门禁授权操作
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:16:40 +08:00
15683799673
ffb32c817a 增加门禁设备
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-29 02:59:14 +08:00
15683799673
54cea19b78 综合模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 22:49:40 +08:00
15683799673
acd63bc96e 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 02:41:09 +08:00
15683799673
81a89bb4dc 人像库页面优化
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
增加人像图片
2025-06-28 01:29:34 +08:00
15683799673
b2d902a2e0 人像页面完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 22:19:56 +08:00
fyy
3e8ba86305 feat: 保洁接口对接
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 18:03:13 +08:00
f01cb4abce 1、入驻单位、人员优化
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:56:05 +08:00
lxj
ef24216dbc Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:13:56 +08:00
lxj
120b27e13a 人像库页面完成 2025-06-27 17:13:34 +08:00
FLL
4819f881ed 收费管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 15:55:02 +08:00
FLL
01ddd1174a 综合管理 2025-06-27 15:16:06 +08:00
lxj
ca24234e57 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 7m3s
# Conflicts:
#	packages/@core/base/shared/src/constants/dict-enum.ts
2025-06-26 22:03:17 +08:00
lxj
1bc8d02cec 增加人像页面 2025-06-26 22:02:40 +08:00
6f2e0be983 1、单元
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 7m16s
2、房间
2025-06-26 18:04:51 +08:00
fyy
e06f8861cc Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-06-26 18:03:07 +08:00
fyy
730d8ca6f2 feat: 更新保洁页面 2025-06-26 18:02:43 +08:00