Commit Graph

232 Commits

Author SHA1 Message Date
d8a91ff4be Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-27 20:44:12 +08:00
8e61d61fdd feat(energyManagement): 添加水电气树接口 2025-08-27 20:44:00 +08:00
lxj
cd141d2c79 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-27 20:41:02 +08:00
lxj
6ada18b28b 删除无用代码 2025-08-27 20:40:49 +08:00
fyy
5516e79b5d feat: 通行记录管理 2025-08-27 17:57:22 +08:00
e8d2650f9a Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-26 16:49:59 +08:00
5646112e44 feat(property): 新增抄表记录功能并优化仪表信息管理 2025-08-26 16:46:54 +08:00
67b80d7687 feat:入驻单位入驻位置多选
Some checks failed
/ Explore-Gitea-Actions (push) Has been cancelled
2025-08-25 17:00:32 +08:00
5f3ae86698 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
/ Explore-Gitea-Actions (push) Has been cancelled
2025-08-25 15:46:13 +08:00
84ff3d21b4 refactor(property): 重构能源管理相关页面布局 2025-08-25 15:46:05 +08:00
5975d1b94d feat:工单类型添加 处理优先级字段
Some checks failed
/ Explore-Gitea-Actions (push) Has been cancelled
自动派单不显示抢单、派单按钮
2025-08-25 14:43:32 +08:00
67b7e64600 fix:图片显示
All checks were successful
/ Explore-Gitea-Actions (push) Successful in 13m48s
2025-08-23 19:25:11 +08:00
fyy
553a915027 fix: 修复bug 2025-08-22 19:43:32 +08:00
fyy
cb0a15e5fb fix: 入驻单位编辑回显授权期限 2025-08-22 15:37:13 +08:00
a43cb1b390 feat:工单处理权重修改为处理优先级
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 5m21s
2025-08-21 17:11:47 +08:00
81fc3bf2ca feat(property): 添加灯控开关功能 2025-08-20 17:23:13 +08:00
c090779319 feat(property): 添加灯控开关信息管理功能
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 9m42s
2025-08-19 18:04:22 +08:00
FLL
36f93721ad Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 5m28s
2025-08-19 14:41:28 +08:00
FLL
957827e0e4 热门活动 2025-08-19 14:41:18 +08:00
fyy
bf13cbfbb7 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 6m52s
2025-08-19 10:53:50 +08:00
fyy
ca4f180e7e feat: 完成考勤管理下的区域管理和排班管理 2025-08-19 10:52:50 +08:00
6ed8a24745 feat:预览问卷
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 4m0s
2025-08-18 17:22:09 +08:00
FLL
5ff3cd67d0 常见问题管理
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 3m51s
2025-08-18 17:15:44 +08:00
fyy
93be4f1891 feat: 排班管理添加区域选择
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 51s
2025-08-18 11:27:16 +08:00
15683799673
79d650adb4 视频告警页面完善
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 2m44s
2025-08-18 09:06:31 +08:00
15683799673
69f0d4adb4 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks failed
/ Explore-Gitea-Actions (push) Failing after 3m58s
2025-08-17 07:03:59 +08:00
15683799673
4bc18e0e4c 视频告警页面 2025-08-17 07:03:48 +08:00
97dc93f3aa 安防大屏
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-16 17:58:59 +08:00
7edbeca307 Merge remote-tracking branch 'origin/master' 2025-08-16 17:17:18 +08:00
023127fa78 feat:问卷管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-15 15:58:57 +08:00
lxj
d0b4d00f4b 事件告警修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-15 14:40:04 +08:00
fyy
78ff0f0c3d feat: 问卷分析
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-14 17:19:58 +08:00
f24ec168bf feat:调查问卷
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-14 15:12:40 +08:00
fyy
578aa61082 feat: 排班管理测试
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-14 10:00:53 +08:00
fyy
1db3c351e5 查询排班详请
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 2m9s
2025-08-13 17:02:49 +08:00
lxj
d9b096c8ed 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-08-12 15:49:31 +08:00
lxj
8cf6df683d 页面修改 2025-08-12 15:47:15 +08:00
fyy
09f850fccd Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-12 13:57:23 +08:00
bc73f02c47 feat:巡检点二维码
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 13:41:46 +08:00
fyy
0a77934d8b feat: 排班管理 2025-08-11 11:05:47 +08:00
15683799673
0d8bae5406 增加大屏地图 2025-08-11 03:00:26 +08:00
15683799673
b4f24df882 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-10 19:35:53 +08:00
15683799673
489ec29184 视频播放同时支持h265和h264播放 2025-08-10 19:35:45 +08:00
899cefb73a feat:工单池添加上报类型
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-08 16:22:04 +08:00
5494d206d4 feat(property): 人员管理增加人员标签功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-08 15:09:54 +08:00
fyy
effcb9ef86 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-08-07 17:45:36 +08:00
fyy
1e4c74230f feat: 排班日历视图 2025-08-07 17:44:45 +08:00
09db75ae58 feat:保洁订单添加签到方式、签到图片
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 11:16:44 +08:00
lxj
e82a42b6a9 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/src/views/sis/acAdmin/dp-tree.vue
2025-08-07 09:49:37 +08:00
lxj
e0cf2f99f9 门禁可视化页面修改 2025-08-07 09:48:58 +08:00