guoyuepeng
|
15f1a8240d
|
Merge branch 'dev' into pet
|
2024-07-02 16:59:15 +08:00 |
 liujun
|
c8a22f8189
|
一公司边界入侵企业端代码未与监管端代码统一问题修复
|
2024-06-28 22:21:30 +08:00 |
|
liujun
|
3dbcce216d
|
一公司边界入侵企业端与监管端代码未同步
|
2024-06-28 21:56:47 +08:00 |
|
liujun
|
d358ab3508
|
定位系统url更正
|
2024-06-28 19:03:46 +08:00 |
|
liujun
|
8f5bbae950
|
Merge branch 'pet' into liujun-2024-06-13-一公司人员定位新需求
|
2024-06-27 17:31:14 +08:00 |
|
liujun
|
9d52c53c8d
|
边界入侵未初始化bug修复
|
2024-06-27 15:15:14 +08:00 |
 guoyuepeng
|
abe20ba360
|
Merge pull request '626相关方人员数据对接' (#21) from 626相关方人员数据对接 into pet
Reviewed-on: #21
|
2024-06-27 14:48:20 +08:00 |
|
liujun
|
9a1ea011e3
|
边界入侵，企业端代码
|
2024-06-27 13:18:49 +08:00 |
 songwenxuan
|
6b90c0f662
|
626相关方人员数据对接
|
2024-06-26 14:00:18 +08:00 |
water_xu
|
d41cea6aeb
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-06-25 17:18:24 +08:00 |
|
water_xu
|
8e38720262
|
bug-15522 隐患处罚管理 不显示ai报警的隐患
|
2024-06-25 17:18:16 +08:00 |
|
liujun
|
064b6bdc33
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-20 16:45:39 +08:00 |
|
liujun
|
6d9a283acc
|
错误代码回滚
|
2024-06-20 16:14:51 +08:00 |
|
liujun
|
742295fd29
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-18 19:39:32 +08:00 |
|
liujun
|
22b0f9233d
|
隐患库、标准库功能模块
|
2024-06-18 19:35:20 +08:00 |
|
liujun
|
84a38ed58f
|
隐患库、标准库功能模块
|
2024-06-18 19:32:45 +08:00 |
|
water_xu
|
e314ab4850
|
合并分支
|
2024-06-18 17:44:23 +08:00 |
|
water_xu
|
49edb5fddc
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-06-18 17:42:55 +08:00 |
|
liujun
|
82a173a6f3
|
1、边界入侵界面更新
2、边界入侵摄像头标点不显示bug修复
|
2024-06-13 15:01:53 +08:00 |
|
liujun
|
a6f36e8b43
|
相关方人员审批可指定打回至特殊节点。
|
2024-06-11 14:21:48 +08:00 |
|
liujun
|
9030986e98
|
测试环境数据库更改
|
2024-06-06 11:12:35 +08:00 |
|
water_xu
|
7f97d2b82e
|
bug-15746 修复修改消防点位检查报错问题
|
2024-05-31 17:01:50 +08:00 |
|
water_xu
|
dd534649e5
|
AI报警-拆分HIDDEN_IDS字段
|
2024-05-29 16:20:33 +08:00 |
|
water_xu
|
6e46289973
|
重点工程-平台中所有的视频现支持反查绑定的重点工程
|
2024-05-28 18:19:46 +08:00 |
|
water_xu
|
7b4f85a08c
|
重点工程-企业端App处罚管理的未处理角标
|
2024-05-28 10:50:36 +08:00 |
|
water_xu
|
824967cc6f
|
重点工程-改善处罚管理显示逻辑
|
2024-05-23 18:10:25 +08:00 |
limingyu
|
633119aaf9
|
动火作业延时监火列表sql优化
|
2024-05-23 16:11:22 +08:00 |
|
water_xu
|
de9acea882
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-23 11:27:59 +08:00 |
|
water_xu
|
c90f5b8e48
|
修复登录：字段“ISDELETE”重复问题
|
2024-05-23 11:27:52 +08:00 |
|
liujun
|
2a08fe0b7b
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-20 18:08:56 +08:00 |
|
limingyu
|
00e4c37c83
|
Merge branch 'limingyu-20240520-一公司摄像头显示bug' into pet
|
2024-05-20 16:52:53 +08:00 |
|
limingyu
|
0988d76cc2
|
一公司摄像头详情显示bug
|
2024-05-20 14:59:43 +08:00 |
|
liujun
|
1a8c259944
|
人员定位系统监管端迁移
|
2024-05-20 14:56:27 +08:00 |
|
liujun
|
4ac8d2a6cc
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-20 13:52:09 +08:00 |
|
liujun
|
d390ea419f
|
九公司定位系统配置文件更新
|
2024-05-20 13:51:33 +08:00 |
|
liujun
|
fd32cf7cb2
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-15 21:49:02 +08:00 |
|
water_xu
|
38dd72782c
|
AI报警-修复处罚管理角标问题
|
2024-05-15 21:46:46 +08:00 |
|
liujun
|
e4a10cf1c7
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-15 21:36:45 +08:00 |
|
water_xu
|
13a2dea7e7
|
AI报警-修复处置个别AI报警时一直转圈的问题
|
2024-05-15 21:02:34 +08:00 |
|
liujun
|
731a3de934
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-15 19:09:49 +08:00 |
|
limingyu
|
304a261c35
|
app动火作业延时监火在完成延时监火时，判断是否超时
|
2024-05-15 17:40:56 +08:00 |
|
water_xu
|
d681ca5a30
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-15 10:52:28 +08:00 |
|
water_xu
|
93811083d8
|
重点工程-修复了处罚管理选择为不处罚的记录显示
|
2024-05-15 10:52:14 +08:00 |
|
limingyu
|
db6b3e8ea7
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-15 10:38:35 +08:00 |
|
limingyu
|
92ce672850
|
app八项作业待办事项显示错误
|
2024-05-15 10:38:15 +08:00 |
|
water_xu
|
c9e1d03e31
|
重点工程-解决了处罚管理中不显示AI报警隐患的重点工程名的问题
|
2024-05-15 10:22:02 +08:00 |
|
water_xu
|
6859510e02
|
AI报警-修复了AI报警PC端处罚管理不显示问题
|
2024-05-14 17:20:59 +08:00 |
|
water_xu
|
a1b2789de2
|
AI报警-修复了AI报警App端角标问题
|
2024-05-13 15:41:19 +08:00 |
|
water_xu
|
a4a548b890
|
AI报警-修复了AI报警App端隐患惩罚相关问题
|
2024-05-13 14:10:18 +08:00 |
|
water_xu
|
6f3b1796cf
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-13 14:09:17 +08:00 |