wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity
224 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

224 Commits (eb44fe6dfe2810f3ecf89d178b748da229b0f58f)

Author SHA1 Message Date
chenxinying 3d57c00c43 八项作业统计数，以及关联作业票列表显示 2024-01-31 08:42:55 +08:00
chenxinying e5d7efd3e1 Merge remote-tracking branch 'origin/dev' into dev 2024-01-31 08:40:39 +08:00
chenxinying 77e20d7586 八项作业电子围栏第一级不让选择，返前端disabled 2024-01-31 08:40:31 +08:00
wangpeng 53ce6b2698 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 16:51:55 +08:00
wangpeng 8471e3fbc0 合并隐患排查 2024-01-30 16:50:58 +08:00
dearlin b0e31da418 电子围栏树结构适配 2024-01-30 16:38:39 +08:00
dearlin 5e1f9ad7dc 电子围栏树结构适配 2024-01-30 16:38:12 +08:00
dearlin e358657730 电子围栏树结构适配 2024-01-30 16:33:59 +08:00
dearlin 8c70ca1a79 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 16:27:29 +08:00
dearlin 63ff90c79b 电子围栏树结构适配 2024-01-30 16:27:19 +08:00
zhangyanli 5ecf9c56c9 隐患排查接口 2024-01-30 16:00:22 +08:00
dearlin 8cf8ac2c1d 辨别部位里电子围栏名称字段修改 2024-01-30 15:41:07 +08:00
dearlin 6353550fbd 人员定位改id 2024-01-30 15:36:15 +08:00
dearlin fbb99198ca 电子围栏 2024-01-30 15:16:04 +08:00
fangjiakai bc49136400 八项作业地图统计 2024-01-30 10:38:22 +08:00
chenxinying 336ccfa0c5 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 08:54:20 +08:00
chenxinying 6a75293abd 动火作业安全措施添加图片 2024-01-30 08:54:02 +08:00
dearlin 0b707e9261 bi页人员定位，ai视频分析完成 2024-01-29 17:35:59 +08:00
dearlin 771d0f04e7 根据用户卡号查信息 2024-01-29 10:18:20 +08:00
dearlin c353987bd2 根据卡号查询人员信息 2024-01-29 09:08:29 +08:00
dearlin d6adfe9c42 根据卡号查询人员信息 2024-01-29 09:07:57 +08:00
dearlin 7d60a3c2cd 根据卡号查询人员信息 2024-01-29 09:07:29 +08:00
dearlin 99a4514737 ai bajing 2024-01-27 11:29:26 +08:00
dearlin 5032c3e5c1 ai报警，人员信息导入的时候卡号变成5位 2024-01-26 15:54:26 +08:00
chenxinying 3403a1c0e8 动火作业 2024-01-26 11:02:46 +08:00
fangjiakai bf34c02c3c Merge remote-tracking branch 'origin/dev' into dev 2024-01-26 08:18:11 +08:00
fangjiakai 026ee59679 修改签名错位的问题 2024-01-26 08:17:56 +08:00
fangjiakai 76733ecd7c 修改签名错位的问题 2024-01-25 18:43:37 +08:00
zhangqihang 7ef83c4290 重点工程（不包括AI报警和视频监控） 2024-01-25 18:04:53 +08:00
chenxinying 922dbe51b3 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 17:41:14 +08:00
chenxinying 56d43e7ebd 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 2024-01-25 17:40:55 +08:00
dearlin cf1573cbaa 手机端排查未在电子围栏禁止排查 2024-01-25 17:24:05 +08:00
dearlin 648d5df8e7 根据定位卡号获取人是否再电子围栏里，shiro权限注释 2024-01-25 16:37:20 +08:00
fangjiakai 563a0cbd3a 动火作业添加电子围栏 2024-01-25 16:00:38 +08:00
fangjiakai f23f7f09d6 人员定位工具类 企业ID变为传入参数 2024-01-25 15:57:47 +08:00
dearlin 6065abcbad 电子围栏封装到工具类 2024-01-25 14:42:22 +08:00
dearlin 84b0151796 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:20:40 +08:00
dearlin 8187112f9a 绑定人员定位卡号 2024-01-25 14:20:05 +08:00
chenxinying 8ef4b2977e 风险辨识结果和关联其他特殊作业及安全作业票编号显示 2024-01-25 14:05:39 +08:00
chenxinying cc33e51b0c 八项作业动火作业签字显示完成，动火人及证书编号显示完成 2024-01-25 13:47:52 +08:00
fangjiakai a4b7ff0a63 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 13:38:45 +08:00
fangjiakai b1db99346e 动火作业流程图 2024-01-25 13:38:16 +08:00
chenxinying 3eb09bdcc8 动火气体分析不显示验收归档的作业票 2024-01-24 17:28:46 +08:00
fangjiakai 4c9801eacf Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
 2024-01-24 17:21:54 +08:00
fangjiakai f43b48d546 动火安全措施确认 2024-01-24 17:20:55 +08:00
chenxinying 0a64479a7d 动火合并打回与保存功能 2024-01-24 17:14:19 +08:00
fangjiakai eb6ea22dfd Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 14:04:57 +08:00
fangjiakai e3d2091070 动火安全措施确认 2024-01-24 14:04:39 +08:00
chenxinying fc1f682428 Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 14:00:52 +08:00
chenxinying 44d1708a79 动火验收，查询时，显示签字信息 2024-01-24 14:00:24 +08:00