WenShiJun
|
6e4f31f205
|
动火申请提交后，只有申请人和下一步的操作人可以看到动火申请，流程中其他人员都看不到
|
2024-06-04 10:11:02 +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 |
|
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 |
|
limingyu
|
f20fc32ae1
|
消防点位维护新增是否标点字段和是否标点筛选条件
|
2024-04-25 16:46:37 +08:00 |
|
limingyu
|
1604612f98
|
企业端一公司动火作业列表流程图验收时间不显示
|
2024-04-25 14:42:34 +08:00 |
|
liujun
|
68c9d00ab0
|
相关方人员审核功能不能委托主账号审核信息
|
2024-04-25 14:11:30 +08:00 |
|
liujun
|
494bde539f
|
相关方证书无法更换图片bug
|
2024-04-24 18:50:21 +08:00 |
|
liujun
|
e058e4df8d
|
Merge remote-tracking branch 'origin/pet' into dev
# Conflicts:
# src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
|
2024-04-24 17:32:09 +08:00 |
|
liujun
|
1dd6b0fdea
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-24 17:20:54 +08:00 |
|
liujun
|
d4bf9fa523
|
1、监管端、企业端地图信息更新
|
2024-04-24 17:20:06 +08:00 |
|
limingyu
|
8733ad32a5
|
地图摄像头点位不显示
|
2024-04-24 17:18:52 +08:00 |
|
water_xu
|
bef8ce6c91
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-24 14:26:45 +08:00 |
|
water_xu
|
bafe944e77
|
增加了安全承诺书日期范围查询功能
|
2024-04-24 14:16:13 +08:00 |
|
liujun
|
776f133f63
|
同步时未异步bug修复
|
2024-04-24 14:02:37 +08:00 |
|
liujun
|
1054f21702
|
异步功能新增配置
|
2024-04-23 19:24:33 +08:00 |
|
liujun
|
0a95da31c7
|
地图新增信息
|
2024-04-23 18:53:02 +08:00 |
|
liujun
|
b5acd5f91d
|
bug修复轨迹不展示
|
2024-04-23 18:30:39 +08:00 |
|
liujun
|
2b5e24254f
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-23 17:58:48 +08:00 |
|
liujun
|
672ee48f94
|
1、企业端接口对接
|
2024-04-23 17:58:27 +08:00 |
|
limingyu
|
03ac45ffa5
|
地图摄像头点位不显示
|
2024-04-23 14:42:00 +08:00 |
|
liujun
|
65bebab413
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-23 14:37:08 +08:00 |
|
liujun
|
84080f7498
|
一公司人员定位功能接口对接功能
|
2024-04-23 14:36:32 +08:00 |
guoyuepeng
|
a475cc1df7
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-23 09:38:55 +08:00 |
|
guoyuepeng
|
e9d80a8016
|
1.企业端消防点位不显示
|
2024-04-23 09:38:35 +08:00 |
|
limingyu
|
d06fcb8ee6
|
不显示安全交底人bug
|
2024-04-22 17:42:38 +08:00 |
|
limingyu
|
c9dfeacbf0
|
消防点位维护新增字段是否标点
|
2024-04-22 11:50:01 +08:00 |
|
limingyu
|
30a268e07c
|
Merge branch 'dev' into limingyu-20240416-一公司动火作业地图
|
2024-04-22 09:24:42 +08:00 |
|
water_xu
|
e3b1516b77
|
增加了安全承诺书日期范围查询功能
|
2024-04-19 18:41:33 +08:00 |
|
water_xu
|
a088c7c173
|
Merge branch 'dev-water-xu' into dev
|
2024-04-19 18:07:58 +08:00 |
|
liujun
|
740695321c
|
系统配置更新
|
2024-04-19 17:37:52 +08:00 |
|
water_xu
|
e49d863bd2
|
增加了安全承诺书日期范围查询功能
|
2024-04-19 14:32:40 +08:00 |
|
limingyu
|
2be4c2a38a
|
关掉消防半月检查表定时器
|
2024-04-19 13:59:30 +08:00 |
|
limingyu
|
ef7510b313
|
一公司动火作业地图bug修复2
|
2024-04-19 13:55:44 +08:00 |
|
liujun
|
a3f1eb9749
|
人员类型未显示bug修复
|
2024-04-18 18:30:15 +08:00 |
|
liujun
|
3dd180d333
|
一公司地图bug修复
|
2024-04-17 14:22:06 +08:00 |
|
liujun
|
086632290b
|
一公司企业端地图功能同步
|
2024-04-17 11:21:46 +08:00 |
|
limingyu
|
77098bc5fb
|
一公司动火作业地图bug修复
|
2024-04-17 10:47:59 +08:00 |
|
liujun
|
b93c59b0c9
|
Merge remote-tracking branch 'origin/liujun-2024-04-12一公司人员定位' into pet
|
2024-04-17 10:04:42 +08:00 |
|
liujun
|
ca299d110d
|
一公司人员定位地图功能完善
|
2024-04-17 08:57:44 +08:00 |
|
liujun
|
1da764000c
|
一公司人员定位地图功能完善
|
2024-04-16 17:22:44 +08:00 |
|
liujun
|
f87f3fdee0
|
Merge branch 'pet' into dev
|
2024-04-13 17:30:09 +08:00 |
|
liujun
|
ff4be346ff
|
查询bug修复
|
2024-04-13 17:11:13 +08:00 |
|
liujun
|
e84b612073
|
完善保存功能
|
2024-04-13 16:53:00 +08:00 |