Commit Graph

Select branches

Hide Pull Requests

baotou

dameng

desensitize

dunhuan_jdk8

dunhuang

guangshengaosu

hole_jdk17

mod_security

prod

uat

angang-deploy

angang-deploy-new

angang-two

duhaipeng

guoshengxiong

jihe_dust_0618

jiuzhu

master

mulei

ocr

pengjdev

shenzhendev

wangcheng

Mono Color

• 640fe5c635 白色不要做ai和车辆的数据权限 GUO 2024-05-18 20:00:26 +08:00
• bb61add63c 萨达接口数据调整 pengjie 2024-05-18 19:36:29 +08:00
• b3f3437432 萨达接口数据调整 pengjie 2024-05-18 18:48:22 +08:00
• 0702cfe5ac 树形列表查询 guoshengxiong 2024-05-18 18:22:43 +08:00
• 26db3b59a3 特种的单位权限查看 guoshengxiong 2024-05-18 16:56:43 +08:00
• 6f0d96de85 特种的单位权限查看 guoshengxiong 2024-05-18 16:54:46 +08:00
• 42e1a8dd0e 人员同步isc提示修改 guoshengxiong 2024-05-18 15:39:45 +08:00
• 7847585181 查询作业负责人的证书信息 pengjie 2024-05-18 14:22:02 +08:00
• 13e6ab61c1 吊装作业添加作业负责人 pengjie 2024-05-18 12:02:56 +08:00
• ee92b7a942 bug修复 guoshengxiong 2024-05-18 11:36:04 +08:00
• 020bcebc57 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-18 11:29:48 +08:00
• 8524b37dba 材料出入场调整 pengjie 2024-05-18 11:17:14 +08:00
• 4abcf1d793 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-18 11:09:58 +08:00
• ec4c447fcf ai为null的修改 guoshengxiong 2024-05-18 10:36:36 +08:00
• baa82c22b8 萨达电箱对接 pengjie 2024-05-18 09:10:57 +08:00
• cc0080374e 萨达电箱对接 pengjie 2024-05-18 01:06:42 +08:00
• 0c7bd6d0bb 特种查申请单位 guoshengxiong 2024-05-18 00:21:21 +08:00
• cbd57de706 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-17 23:16:55 +08:00
• 9298429427 特种作业type修改 guoshengxiong 2024-05-17 23:16:45 +08:00
• 8d26c8aed3 作业表单提交 pengjie 2024-05-17 23:15:55 +08:00
• 225914abb6 特种作业排序 guoshengxiong 2024-05-17 23:12:18 +08:00
• f41d6d0c4e 视频分组 guoshengxiong 2024-05-17 23:12:04 +08:00
• 80e666ecdf 视频分组 guoshengxiong 2024-05-17 23:11:59 +08:00
• 7971645fd3 车辆保存接口 guoshengxiong 2024-05-17 20:26:58 +08:00
• bfb79c9b6a 特种加上负责人id字段 guoshengxiong 2024-05-17 19:44:35 +08:00
• e5e5cf3c2b 作业表单提交 pengjie 2024-05-17 19:42:22 +08:00
• 1daaae84ff 作业表单提交 pengjie 2024-05-17 19:00:08 +08:00
• 7a35cc8257 视频分组改成tree guoshengxiong 2024-05-17 18:40:47 +08:00
• aa01896a2e ai预警大屏bug修改 guoshengxiong 2024-05-17 17:22:52 +08:00
• 21ef59d85e 增加动火作业负责人 guoshengxiong 2024-05-17 16:55:11 +08:00
• a737f0b6a9 1231 pengjie 2024-05-17 16:53:29 +08:00
• 0fe701f57c bug修复 guoshengxiong 2024-05-17 16:39:47 +08:00
• f2d1a4f564 海康定时回调更改线程池 guoshengxiong 2024-05-17 16:28:20 +08:00
• 67634867d1 车辆和ai预警的海康回调的代码修改 guoshengxiong 2024-05-17 16:23:22 +08:00
• 060f40e73b Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-17 14:46:39 +08:00
• f5d3847a11 解析海康AI回调 光头强 2024-05-17 14:46:22 +08:00
• bda7f2b594 吊装安全作业 pengjie 2024-05-17 14:34:20 +08:00
• 6f2747c7e3 特种的去掉错误查询条件 guoshengxiong 2024-05-17 11:36:12 +08:00
• 586bda5b87 特种去掉没用信息 guoshengxiong 2024-05-17 10:50:31 +08:00
• 7fe41f593a bug修复 guoshengxiong 2024-05-17 10:50:14 +08:00
• 185e944070 动火作业 pengjie 2024-05-17 09:04:10 +08:00
• e9d1fd8faa 动火作业 pengjie 2024-05-17 01:08:06 +08:00
• 096799cd3e 动火作业 pengjie 2024-05-17 00:27:51 +08:00
• d7a2658a61 特种作业的人直接存名字 GUO 2024-05-16 23:07:44 +08:00
• 914ae9fb42 动火人修改 GUO 2024-05-16 22:33:06 +08:00
• e1df296f2d Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong pengjie 2024-05-16 22:17:44 +08:00
• eeb507dfc2 动火作业 pengjie 2024-05-16 22:17:28 +08:00
• f035e4df06 动火人实体类修改 GUO 2024-05-16 22:17:12 +08:00
• ad72c12d5f 动火作业 pengjie 2024-05-16 21:58:13 +08:00
• be389f94c8 编制人和日期 guoshengxiong 2024-05-16 18:07:52 +08:00
• 768a172828 bug修复 guoshengxiong 2024-05-16 17:45:16 +08:00
• b607f844d3 海康获取监控点回放取流URLv2 guoshengxiong 2024-05-16 17:13:20 +08:00
• 37e9401572 海康获取监控点回放取流URLv2 guoshengxiong 2024-05-16 17:13:05 +08:00
• e59b7811f9 海康获取监控点回放取流URLv2 guoshengxiong 2024-05-16 17:12:56 +08:00
• 9ed55a8261 动火作业 pengjie 2024-05-16 16:36:09 +08:00
• 14a61d46e2 特种作业增加其他安全措施字段 guoshengxiong 2024-05-16 15:20:14 +08:00
• ebfc58cb63 特种作业人员bug修改 guoshengxiong 2024-05-16 15:11:19 +08:00
• 74d2d6abaa 特种作业bug修改 guoshengxiong 2024-05-16 14:11:36 +08:00
• 6a2ada7070 危大bug修改 guoshengxiong 2024-05-16 14:02:52 +08:00
• de8898deae 盲板设备、管道名称三个字段 guoshengxiong 2024-05-16 10:54:56 +08:00
• bcc9375b7a 特种作业最终状态 guoshengxiong 2024-05-16 10:01:22 +08:00
• 83f24094bd Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-16 09:48:35 +08:00
• 92ca21a659 以前的安全隐患的去掉数据权限 guoshengxiong 2024-05-16 09:48:22 +08:00
• 4f25df5c5f 教育培训 pengjie 2024-05-16 02:20:09 +08:00
• e6152b7321 动火作业 pengjie 2024-05-16 01:59:03 +08:00
• c7ca09076b 特种作业的bug修改 guoshengxiong 2024-05-15 23:45:55 +08:00
• 6bfa57480f 特种作业的bug修改 guoshengxiong 2024-05-15 21:26:24 +08:00
• d32717d8f8 特种作业的mapper修改 guoshengxiong 2024-05-15 20:55:32 +08:00
• 9470a7913f 车辆类型筛选 guoshengxiong 2024-05-15 20:51:25 +08:00
• 3effa96125 其他特种 guoshengxiong 2024-05-15 20:08:38 +08:00
• 264d91e2df 受限空间安全作业票-气体 guoshengxiong 2024-05-15 19:36:22 +08:00
• 5caab68eb2 盲板抽堵安全 guoshengxiong 2024-05-15 17:59:26 +08:00
• 3eeac352ff 受限空间安全作业票 guoshengxiong 2024-05-15 16:53:55 +08:00
• c508987173 最终验收bug修复 guoshengxiong 2024-05-15 16:22:47 +08:00
• 7d8f4d1575 指挥部大屏bug和其他bug修复 guoshengxiong 2024-05-15 15:37:37 +08:00
• d8d08dc1dd 目前有AI预警数据上传都会给所有账号推送通知这个功能取消，因为我们目前是违章推送的时候才下发通知 guoshengxiong 2024-05-15 15:09:30 +08:00
• e4d557d63a 动火安全修改 guoshengxiong 2024-05-15 15:02:18 +08:00
• 9f4acc7287 动火安全和危大修改 guoshengxiong 2024-05-15 14:37:26 +08:00
• ab61c27664 海康人员提示bug修复 GUO 2024-05-14 23:28:00 +08:00
• 2577f988f9 动火安全 guoshengxiong 2024-05-14 20:29:07 +08:00
• 4947b9a376 排序 guoshengxiong 2024-05-14 20:28:44 +08:00
• e9809f79c5 生成模版修改 guoshengxiong 2024-05-14 20:28:21 +08:00
• e33377724f AI预警类型分页统计 guoshengxiong 2024-05-14 18:42:56 +08:00
• 6a6459e07c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-14 18:41:57 +08:00
• e7dae20839 AI预警类型分页统计 guoshengxiong 2024-05-14 18:41:33 +08:00
• 5a6c5cf5fc Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong pengjie 2024-05-14 18:31:31 +08:00
• 8ba83ec8ea 人员修改 pengjie 2024-05-14 18:30:13 +08:00
• c25f8fcad9 车辆bug修复 guoshengxiong 2024-05-14 17:23:05 +08:00
• 2d7eb91987 车辆bug修复 guoshengxiong 2024-05-14 16:32:36 +08:00
• 6b691e7c12 车辆bug修复 guoshengxiong 2024-05-14 16:31:27 +08:00
• 15a5d3669e 车辆bug修复 guoshengxiong 2024-05-14 16:03:54 +08:00
• 4fe3348ead Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong guoshengxiong 2024-05-14 15:47:51 +08:00
• 6949d5ff44 车辆bug修复 guoshengxiong 2024-05-14 15:46:15 +08:00
• 34ef61456b 工作流修改 pengjie 2024-05-13 21:24:41 +08:00
• d271c5c370 质量bug修复 guoshengxiong 2024-05-13 21:08:25 +08:00
• 3eff952ad6 风险图比例- guoshengxiong 2024-05-13 20:59:12 +08:00
• 97fe5104cc bug修改 guoshengxiong 2024-05-13 20:48:54 +08:00
• 994bfa12ef 质量接口copy guoshengxiong 2024-05-13 16:09:39 +08:00
• 6f576c48c8 安全首页接口bug修复 guoshengxiong 2024-05-13 15:49:24 +08:00
• 6d24138445 安全首页接口 guoshengxiong 2024-05-13 15:28:13 +08:00