Commit Graph

Select branches

Hide Pull Requests

dev

dev-new

master

#4

#5

Mono Color

• 5032c3e5c1 ai报警，人员信息导入的时候卡号变成5位 dearlin 2024-01-26 15:54:26 +0800
• 3403a1c0e8 动火作业 chenxinying 2024-01-26 11:02:46 +0800
• bf34c02c3c Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-26 08:18:11 +0800
• 026ee59679 修改签名错位的问题 fangjiakai 2024-01-26 08:17:56 +0800
• 76733ecd7c 修改签名错位的问题 fangjiakai 2024-01-25 18:43:37 +0800
• 7ef83c4290 重点工程（不包括AI报警和视频监控） zhangqihang 2024-01-25 18:04:53 +0800
• 922dbe51b3 Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-25 17:41:14 +0800
• 56d43e7ebd 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 chenxinying 2024-01-25 17:40:55 +0800
• cf1573cbaa 手机端排查未在电子围栏禁止排查 dearlin 2024-01-25 17:24:05 +0800
• 648d5df8e7 根据定位卡号获取人是否再电子围栏里，shiro权限注释 dearlin 2024-01-25 16:37:20 +0800
• 563a0cbd3a 动火作业添加电子围栏 fangjiakai 2024-01-25 16:00:38 +0800
• f23f7f09d6 人员定位工具类 企业ID变为传入参数 fangjiakai 2024-01-25 15:57:47 +0800
• 6065abcbad 电子围栏封装到工具类 dearlin 2024-01-25 14:42:22 +0800
• 84b0151796 Merge remote-tracking branch 'origin/dev' into dev dearlin 2024-01-25 14:20:40 +0800
• 8187112f9a 绑定人员定位卡号 dearlin 2024-01-25 14:20:05 +0800
• 8ef4b2977e 风险辨识结果和关联其他特殊作业及安全作业票编号显示 chenxinying 2024-01-25 14:05:39 +0800
• cc33e51b0c 八项作业动火作业签字显示完成，动火人及证书编号显示完成 chenxinying 2024-01-25 13:47:52 +0800
• a4b7ff0a63 Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-25 13:38:45 +0800
• b1db99346e 动火作业流程图 fangjiakai 2024-01-25 13:38:16 +0800
• 3eb09bdcc8 动火气体分析不显示验收归档的作业票 chenxinying 2024-01-24 17:28:46 +0800
• 4c9801eacf Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-24 17:21:54 +0800
• f43b48d546 动火安全措施确认 fangjiakai 2024-01-24 17:20:55 +0800
• 0a64479a7d 动火合并打回与保存功能 chenxinying 2024-01-24 17:14:19 +0800
• eb6ea22dfd Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-24 14:04:57 +0800
• e3d2091070 动火安全措施确认 fangjiakai 2024-01-24 14:04:39 +0800
• fc1f682428 Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-24 14:00:52 +0800
• 44d1708a79 动火验收，查询时，显示签字信息 chenxinying 2024-01-24 14:00:24 +0800
• 9d93529c50 权限路由 wangpeng 2024-01-24 11:39:18 +0800
• 25d0947d7f 动火作业 service层方法 fangjiakai 2024-01-24 09:59:54 +0800
• abeb80f88d 动火更新作业开始时间，结束时间和验收时间 chenxinying 2024-01-24 09:34:59 +0800
• 22dd31c65a 动火添加验收时间字段，更新作业开始时间，结束时间和验收时间 chenxinying 2024-01-24 09:25:29 +0800
• 0650dffac0 动火下一步状态变更 chenxinying 2024-01-23 11:27:24 +0800
• c120c0b55b Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-23 08:30:03 +0800
• 13e1b7442e 动火作业 fangjiakai 2024-01-23 08:29:43 +0800
• 4a2d44a6c9 Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-22 15:20:38 +0800
• 7c4371d328 动火签字图片 chenxinying 2024-01-22 15:20:32 +0800
• f628f098b3 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev WenShiJun 2024-01-22 14:17:42 +0800
• 5c15b857f3 新增安全、环保检查管理模块 WenShiJun 2024-01-22 14:15:49 +0800
• 3507bf61a9 动火添加作业开始和作业结束 chenxinying 2024-01-22 14:05:11 +0800
• 298b10c1de 动火作业 service层新增措施相关接口 fangjiakai 2024-01-22 08:48:40 +0800
• 1df78fdd26 Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-22 08:47:56 +0800
• d578f2d083 动火作业 fangjiakai 2024-01-22 08:45:31 +0800
• e892e0c892 动火作业 获取所有措施 获取需要签字的措施 获取所有签字完成的措施 xiepeng 2024-01-19 14:36:54 +0800
• 79a69dd4ef 动火作业 service层新增措施相关接口 fangjiakai 2024-01-19 11:35:32 +0800
• 18505d248c 动火作业 fangjiakai 2024-01-19 11:34:11 +0800
• 17f8e83c3d Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-19 11:32:43 +0800
• 498e9adb9c 动火作业 service层新增措施相关接口 fangjiakai 2024-01-19 11:32:31 +0800
• 238023b118 动火作业 补充 取消，下一步，验收归档 xiepeng 2024-01-19 11:30:03 +0800
• 8c5051aaaf Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-19 10:26:55 +0800
• d4e586d700 动火作业 service层方法 fangjiakai 2024-01-19 10:23:06 +0800
• 5d35ba69d8 动火作业 根据Id查询 八项作业保存删除图片 xiepeng 2024-01-19 09:23:41 +0800
• 2f1ef51627 动火气体检测分析的创建 chenxinying 2024-01-18 16:43:05 +0800
• fb0f7cf1fe 动火作业 fangjiakai 2024-01-18 08:55:39 +0800
• dd05b7d11d bus_hotwork_sign的mapper创建 chenxinying 2024-01-17 15:06:25 +0800
• ebf1d6d6a0 BUS_EIGHTWORK_TASK的mapper创建 chenxinying 2024-01-17 14:19:50 +0800
• da1dfc7f22 BUS_EIGHTWORK_TASK_FLOW的mapper创建 chenxinying 2024-01-17 14:16:56 +0800
• 2d56101774 BUS_EIGHTWORK_FLOW_LOG的mapper创建 chenxinying 2024-01-17 14:08:59 +0800
• a3c18c875e BUS_EIGHTWORK_FLOW_LOG的mapper创建 chenxinying 2024-01-17 14:05:18 +0800
• c3a95c61c0 动火作业 fangjiakai 2024-01-17 13:41:44 +0800
• 20fdf49bbc 八项作业删除 chenxinying 2024-01-17 10:43:13 +0800
• eda0a53e19 八项作业作废时，监控删除，视频监控列表 chenxinying 2024-01-16 15:14:42 +0800
• 0fce9d9f9a Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-15 17:19:50 +0800
• ee029166e8 PLSUtil工具类新增告警统计方法 WenShiJun 2024-01-15 15:27:55 +0800
• 5e8bbd1f12 Clear Git cache and re-add all files WenShiJun 2024-01-15 15:26:59 +0800
• ec2a863351 Stop tracking log files WenShiJun 2024-01-15 15:18:54 +0800
• c0c2abb24c Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev WenShiJun 2024-01-15 15:14:47 +0800
• 3d8221128d PLSUtil工具类新增告警统计方法 WenShiJun 2024-01-15 15:14:16 +0800
• ad9dcf5e3c 添加忽略文件夹 fangjiakai 2024-01-15 09:19:08 +0800
• 500456a892 PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码 WenShiJun 2024-01-12 16:40:52 +0800
• d28d40bf53 Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-12 08:42:36 +0800
• fce0c60fa5 Merge remote-tracking branch 'origin/dev' into dev fangjiakai 2024-01-12 08:36:43 +0800
• f78ca2a7cd 删除 catalina.base_IS_UNDEFINED/logs/fhserver.2024-01-11.log fangjiakai 2024-01-12 08:34:22 +0800
• c5b14134c9 修改MQ消息发送 fangjiakai 2024-01-12 08:31:05 +0800
• 0473aab406 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev WenShiJun 2024-01-11 18:04:11 +0800
• 152a6da70d PLSUtil工具类优化 WenShiJun 2024-01-11 18:02:48 +0800
• e43d380e01 Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-11 17:18:28 +0800
• 0b01e507c9 修改MQ消息发送 fangjiakai 2024-01-11 17:18:06 +0800
• d230d3e62a Merge remote-tracking branch 'origin/dev' into dev chenxinying 2024-01-11 17:04:36 +0800
• 09f069e1ac 八项作业添加监控 chenxinying 2024-01-11 16:58:12 +0800
• d91e162379 修改MQ消息发送 fangjiakai 2024-01-11 16:37:22 +0800
• 0683b752b6 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev WenShiJun 2024-01-11 15:19:18 +0800
• 26a757a44c UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口 WenShiJun 2024-01-11 15:17:27 +0800
• a96b4f85df Merge branch 'master' into dev fangjiakai 2024-01-11 09:25:46 +0800
• edb3a21777 修改MQ消息发送 fangjiakai 2024-01-11 09:15:22 +0800
• 9c86394e0b 企业人员定位系统参数表 chenxinying 2024-01-10 17:37:12 +0800
• 60bb52b485 修改导入,登录 fangjiakai 2024-01-10 11:18:33 +0800
• 98406f230b 条件分页配置 fangjiakai 2024-01-08 17:30:16 +0800
• 411864c1b6 条件分页配置 fangjiakai 2024-01-08 10:21:46 +0800
• 5846a0c0a4 整合other mq fangjiakai 2024-01-05 10:20:02 +0800
• da7145a1a1 整合other mq fangjiakai 2024-01-05 10:06:26 +0800
• a1a8c85fb6 整合other mq fangjiakai 2024-01-05 10:04:19 +0800
• c40f40d58d 整合other mq fangjiakai 2024-01-05 09:57:31 +0800
• 0afe99435e 整合other mq fangjiakai 2024-01-05 08:51:44 +0800
• 25aeaee31e 整合education fangjiakai 2024-01-04 10:17:08 +0800
• 6b727bac90 整合education fangjiakai 2024-01-04 10:12:59 +0800
• 9c60c0103a 整合education fangjiakai 2024-01-04 10:07:06 +0800
• 3486386421 整合prevention fangjiakai 2024-01-04 09:07:20 +0800
• 5d7d88b063 整合prevention Mapper.xml fangjiakai 2024-01-03 16:53:15 +0800
• 024ff844db 整合prevention Mapper fangjiakai 2024-01-03 16:36:04 +0800
• ae68bbf464 整合system fangjiakai 2024-01-03 11:04:18 +0800