Commit Graph

207 Commits

Author SHA1 Message Date
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
d9afe03c53 Merge remote-tracking branch 'origin/master' 2025-08-06 21:52:31 +08:00
8bb861ca31 安防大屏 2025-08-06 21:51:30 +08:00
01a71ea4c3 feat:工单池选择工单类型
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 14:33:02 +08:00
ee8e459aed feat:工单类型添加上级类型
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 13:57:40 +08:00
fyy
90531f1598 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-06 09:12:22 +08:00
fyy
2beb771185 feat: 优化大屏 2025-08-05 17:07:10 +08:00
lxj
febe532404 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/accessControl/device/accessControlModal.vue
2025-08-05 16:47:10 +08:00
e0a64edc14 feat(sis): 设备管理增加楼层选择功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 16:39:25 +08:00
lxj
8209630370 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-05 09:49:10 +08:00
17c7bc0512 feat(sis): 电梯信息关联楼层
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 23:31:39 +08:00
98d6dd0d9b feat:出库记录
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 17:27:37 +08:00
523810a1da feat(sis): 初始化赋值
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 16:55:08 +08:00
lxj
cb32660b7b Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-08-03 15:31:56 +08:00
0e38ea68fe feat:会议室预约添加会议室类型查询条件
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 16:05:16 +08:00
d722c62f49 feat:工单添加评价文字、图片
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 15:25:36 +08:00
b7ecd38f59 feat:房间添加是否重要、房间图片字段
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 11:40:57 +08:00
8f6dc2ba11 fix:建筑管理、楼层管理
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 15:27:32 +08:00
lxj
04b6fd0194 Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-07-30 05:48:15 +08:00
62f1d43ac5 fix:考勤组编辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 17:26:45 +08:00
84cade81df fix:巡检计划编辑、保养计划编辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 15:26:41 +08:00
fb537fdc00 feat(property): 添加用户导入和人脸导入功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 02:05:02 +08:00
lxj
feb2eb68be Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5 2025-07-28 20:28:10 +08:00
lxj
90c803dfa3 视频监控页面逻辑更改 2025-07-28 20:27:58 +08:00
fe78f7ad25 1、bug修复
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2、添加巡检明细接口
2025-07-28 17:16:27 +08:00
7f542de90b feat(property): 1 2025-07-28 15:24:45 +08:00