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 |
|
water_xu
|
dfa5786ef3
|
AI报警-修复了AI报警查看隐患详情不回显的问题
|
2024-05-13 14:09:05 +08:00 |
|
liujun
|
cba8af4d00
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-11 10:05:56 +08:00 |
|
liujun
|
ddc05cfb96
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-11 09:56:05 +08:00 |
|
liujun
|
d3633e4716
|
集团单位新增数联集团
|
2024-05-11 09:55:48 +08:00 |
|
liujun
|
1303054865
|
1、定位系统端口更新
2、代码根式化
|
2024-05-10 18:57:45 +08:00 |
|
water_xu
|
27d0fbcccf
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-10 17:35:04 +08:00 |
|
water_xu
|
5b2e87c444
|
完善了重点工程AI报警的后续流程:多AI报警处置人时的隐患以及处罚显示不全问题
|
2024-05-10 17:34:48 +08:00 |
|
limingyu
|
dd4d4eadbd
|
app检查表记录清单排查列表显示空的消防点位
|
2024-05-10 16:24:23 +08:00 |
|
water_xu
|
5bfab38ad4
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-09 16:40:40 +08:00 |
|
water_xu
|
2367ea3846
|
完善了重点工程AI报警的后续流程
|
2024-05-09 16:40:20 +08:00 |
|
limingyu
|
8d45dc15cd
|
动火作业mq作废时作废方法报错
|
2024-05-09 15:15:47 +08:00 |
|
limingyu
|
29f4e7df5e
|
企业端动火作业删除全部删除的bug，消防点位维护是否标点显示错误的bug
|
2024-05-09 14:44:23 +08:00 |
|
limingyu
|
b91fe23733
|
15164 增加个部门下拉框搜索 要不太多无法搜索
|
2024-05-09 08:36:02 +08:00 |
|
limingyu
|
7068c2f15e
|
15482 出现重复数据
|
2024-05-07 16:15:47 +08:00 |
|
limingyu
|
4c7fc6e698
|
Merge branch 'limingyu-2024-05-07-重点工程视频更新' into pet
|
2024-05-07 13:45:03 +08:00 |
|
limingyu
|
43a3157179
|
重点工程地图视频点位详情显示是否在线2
|
2024-05-07 13:44:39 +08:00 |
|
limingyu
|
b590fc90f6
|
Merge branch 'limingyu-2024-05-07-重点工程视频更新' into pet
|
2024-05-07 13:41:58 +08:00 |
|
limingyu
|
5a2502a39f
|
重点工程地图视频点位详情显示是否在线
|
2024-05-07 13:41:36 +08:00 |
|
limingyu
|
1d0e91dcad
|
Merge branch 'limingyu-2024-04-16-消防点位维护新增是否标点' into pet
|
2024-05-07 10:58:18 +08:00 |
|
limingyu
|
40a74e663d
|
重点工程地图视频点位显示是否在线
|
2024-05-07 08:39:19 +08:00 |
|
liujun
|
f706202c06
|
到项目负责人时无法气体分析bug修复
|
2024-04-29 19:18:00 +08:00 |
|
liujun
|
4d0953876c
|
代码格式化，没用更改任何代码
|
2024-04-29 19:06:32 +08:00 |
|
limingyu
|
a4a85c5171
|
Merge branch 'pet' into limingyu-20240416-一公司动火作业地图
# Conflicts:
# src/main/resources/application.properties
|
2024-04-29 15:14:27 +08:00 |
|
water_xu
|
fce988e59e
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-29 15:10:17 +08:00 |
|
water_xu
|
35980a4789
|
完善了重点工程隐患评审功能
|
2024-04-29 09:55:00 +08:00 |
|
liujun
|
f93c185fb0
|
三项制度库新增导入数据区分
|
2024-04-28 14:30:06 +08:00 |
|
limingyu
|
913f5ce6e2
|
Merge branch 'dev' into limingyu-20240416-一公司动火作业地图
|
2024-04-26 17:04:20 +08:00 |
|
limingyu
|
9222ba833b
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-26 11:34:35 +08:00 |
|
limingyu
|
8727d97312
|
动火作业详情动火方法不显示
|
2024-04-26 11:34:22 +08:00 |
|
liujun
|
41f699af68
|
1、相关方人员头像修改后自动更新企业端头像信息
|
2024-04-25 17:58:31 +08:00 |