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

341 Commits (29dee5bfd21d2b535cb5ad5dc5c17e475c97f14e)

Author SHA1 Message Date
277151821@qq.com 3d1a78869c 后端修改 2024-03-05 11:36:33 +08:00
277151821@qq.com d96a569e66 撤销修改 2024-03-05 11:12:37 +08:00
277151821@qq.com b244cb0985 货运挂车后端 2024-03-05 11:08:48 +08:00
wangpeng 437c8ccc89 Merge pull request 'dev' (#5) from integrated_whb/integrated_whb:dev into dev 
Reviewed-on: #5
 2024-03-04 11:07:07 +08:00
WenShiJun 14e7e11f2a 新增从业人员管理相关接口 2024-03-01 18:04:06 +08:00
chenxinying 8482fa7e79 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 16:56:10 +08:00
chenxinying c7e8305bb2 八项作业中作业人显示，吊装作业安全措施添加吨数 2024-03-01 16:55:50 +08:00
WenShiJun eddae30465 安全通知，客户管理，运单登记，地点管理功能优化 2024-03-01 13:52:43 +08:00
fangjiakai b5f20683d4 修改人员定位接口地址 2024-03-01 12:08:00 +08:00
dearlin f7ebc6a958 八项作业与优化三方定位系统后台地址的查询 2024-03-01 11:41:16 +08:00
xiepeng 983e857ba9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 10:18:37 +08:00
xiepeng 93e9e8a30b 运营车辆 2024-03-01 10:01:48 +08:00
dearlin ee5192518b 八项作业与部分bug 2024-03-01 09:05:45 +08:00
WenShiJun 48a21ed00d 客户管理后端功能优化 
新增地点管理后端功能
 2024-02-29 18:30:26 +08:00
zhangqihang 8dd9ff3390 修复bug 2024-02-29 15:43:39 +08:00
chenxinying f26dbe0980 吊装作业，断路作业，动土作业，盲板PC端 2024-02-29 08:43:27 +08:00
WenShiJun c12d2c7774 安全通知->功能优化 
运单登记后端功能
客户管理后端功能
 2024-02-28 19:16:25 +08:00
dearlin c70b1d6bf1 14132 这几种隐患来源的显示不正确 需要统一 2024-02-28 14:26:41 +08:00
zhangqihang 2c3cc96696 修复bug 2024-02-28 13:45:01 +08:00
dearlin f90c019094 解决了 Bug 打回并删除的数字没有减少 14193 2024-02-28 11:51:35 +08:00
dearlin 1d855bb46f 聚集告警记录bug修复 2024-02-28 10:19:17 +08:00
dearlin d97dbcb715 聚集告警记录 2024-02-28 09:57:18 +08:00
fangjiakai d1def6945d 企业报告 高危作业数据 2024-02-28 09:34:29 +08:00
fangjiakai d8b90b8533 验收通知 2024-02-28 09:33:54 +08:00
fangjiakai df15791ea4 验收通知 2024-02-28 09:30:23 +08:00
fangjiakai ece06080fc Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 09:08:56 +08:00
fangjiakai f7443a8406 增加气体检测打回通知 2024-02-28 09:08:43 +08:00
zhangqihang 4c65e0c6c3 修复bug 2024-02-28 09:01:16 +08:00
dearlin b16405202a 验收打回隐患报错 14308 2024-02-27 17:27:09 +08:00
WenShiJun d179e54f87 安全环保检查补提相关MapperXml文件 2024-02-27 17:04:23 +08:00
fangjiakai 268e1a3c46 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 14:55:30 +08:00
fangjiakai fe0dbc0ec8 三项制度库 2024-02-27 14:55:15 +08:00
chenxinying a6a19febf7 吊装作业，断路作业，动土作业，盲板 2024-02-27 14:31:38 +08:00
wangpeng fb3f754bcf Merge pull request 'dev' (#4) from integrated_whb/integrated_whb:dev into dev 
Reviewed-on: #4
 2024-02-27 14:19:06 +08:00
wangpeng 299aeb7726 安全例会 回滚 2024-02-27 14:17:43 +08:00
fangjiakai 5d8f3acda0 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 10:30:28 +08:00
fangjiakai cb0819f3e3 修改分页总条数显示 2024-02-27 10:30:15 +08:00
zhangqihang 271431816e 修复bug 2024-02-27 08:47:05 +08:00
WenShiJun fb93851600 安全例会->列表，新增，删除，详情接口开发 2024-02-26 18:29:43 +08:00
dearlin 72495ef2ca 部门 单位对接 2024-02-26 17:46:09 +08:00
zhangyanli 813c74f097 bug修复:14263,14294 2024-02-26 16:32:14 +08:00
dearlin 516f34f769 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-02-26 15:38:25 +08:00
dearlin 465e8dc397 14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户 2024-02-26 15:38:06 +08:00
zhangqihang f16a09c4aa 修复bug 2024-02-26 15:32:23 +08:00
dearlin 918037d593 Merge remote-tracking branch 'origin/dev' into dev 2024-02-26 11:37:58 +08:00
dearlin 752b0e1300 允许进入部门，允许进入人员 2024-02-26 11:37:49 +08:00
zhangyanli 64b883b73f bug:14263修复 2024-02-26 11:19:25 +08:00
fangjiakai 6ce8b6669e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/mapApi/MapController.java
 2024-02-26 10:35:54 +08:00
fangjiakai 91ce11d64a 动火增加消息通知 2024-02-26 10:34:55 +08:00
dearlin af92ca1ba7 人员定位中相关对接操作 2024-02-26 09:39:21 +08:00
WenShiJun ba988ffb42 安全通知模块->列表，新增，删除，详情接口开发 2024-02-23 19:04:20 +08:00
zhangqihang acb1c9a5a2 修复bug 2024-02-23 18:04:02 +08:00
wangpeng 15c3d39b8b BI页统计数据校准 2024-02-23 10:08:25 +08:00
zhangqihang 51d29c72ef 修复视频上传 2024-02-23 09:52:53 +08:00
zhangqihang f5579e9856 修复安全环保检查bug 2024-02-23 09:06:12 +08:00
fangjiakai 387a31b276 Merge remote-tracking branch 'origin/dev' into dev 2024-02-22 17:35:35 +08:00
fangjiakai 9d1bcaa909 环保检查隐患指派 2024-02-22 17:35:23 +08:00
fangjiakai e2045a7a9a 环保检查隐患指派 2024-02-22 17:33:39 +08:00
dearlin 7fcbffb803 摄像头定位接口 2024-02-22 17:31:28 +08:00
dearlin 0fbddd5f62 新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确 2024-02-22 16:33:00 +08:00
dearlin 9b40b93f37 告警管理，地图设置，聚集管理Api完成 2024-02-22 16:04:48 +08:00
chenxinying cbad06c6dc 临时用电 2024-02-22 11:35:14 +08:00
wangpeng c5c765bee3 手机首页统计待验收条件修改 2024-02-22 10:06:21 +08:00
dearlin 34d95fcf18 人员卡管理 2024-02-22 09:19:36 +08:00
zhangqihang c4730709b2 修复bug 2024-02-22 08:42:40 +08:00
wangpeng 0daa256c35 Merge remote-tracking branch 'origin/dev' into dev 2024-02-21 21:11:45 +08:00
wangpeng 0f1b009c24 手机首页统计增加隐患排查数据情况 2024-02-21 21:11:35 +08:00
zhangyanli 4ac70c2d74 bug修复 2024-02-21 18:08:29 +08:00
wangpeng d086ad5dcc BI页面统计增加隐患排查数据情况 2024-02-21 17:20:55 +08:00
zhangyanli 5514125492 排查统计和隐患治理菜单bug修复 2024-02-21 16:13:31 +08:00
wangpeng eb44fe6dfe BI页面任务处理情况统计增加隐患排查数据情况 2024-02-21 15:27:54 +08:00
wangpeng 81053da3a3 统计分析增加隐患排查数据统计 2024-02-21 14:21:21 +08:00
wangpeng a67934c55c 特种作业人员证件临期提醒（迁表） 
隐患统计增加隐患清单排查数据
 2024-02-21 11:44:21 +08:00
chenxinying ca5c1fb850 特种作业人员 2024-02-21 11:17:07 +08:00
fangjiakai 29f9cbcfca 八项作业流程图 2024-02-21 10:47:59 +08:00
dearlin 089969712d 地图上报警信息 2024-02-21 09:04:50 +08:00
wangpeng d6bb1fd3fe 特种作业人员证件临期提醒 2024-02-21 08:41:57 +08:00
fangjiakai 488ed3f01e 修改分页总条数显示 2024-02-20 17:58:13 +08:00
chenxinying 192810971f Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:49:47 +08:00
chenxinying 68796ab8b1 动火安全副总去掉 2024-02-20 16:49:40 +08:00
wangpeng 24a7d01b8c app首页我的工作数据校准 2024-02-20 16:43:10 +08:00
fangjiakai cfa5416c1b Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:38:10 +08:00
fangjiakai bd4c1edabf 环保隐患指派 2024-02-20 16:37:59 +08:00
chenxinying 0d81a7688d Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 16:36:42 +08:00
chenxinying 4a303a04fd 动火安全副总去掉 2024-02-20 16:36:34 +08:00
zhangqihang fd2daa6f02 修复bug 2024-02-20 16:11:56 +08:00
dearlin 19021b8999 安全例会 2024-02-20 16:10:49 +08:00
wangpeng 7b0f0f2ea6 隐患清单排查漏传检查项目参数 2024-02-20 15:44:10 +08:00
zhangqihang 6b46ce0337 重点工程流程修复 2024-02-20 14:26:09 +08:00
fangjiakai 98103d92f3 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 14:17:32 +08:00
fangjiakai 9b0f6f5a7b 动火作业修改流程图查询 2024-02-20 12:04:06 +08:00
fangjiakai 3bb24697d6 动火作业加入可跳过步骤 2024-02-20 10:57:03 +08:00
chenxinying 8e15e0f60c Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 10:51:25 +08:00
chenxinying cdd1b1c79c 受限作业作业人 2024-02-20 10:51:19 +08:00
dearlin d911193e36 安全例会 2024-02-20 08:38:25 +08:00
zhangqihang 425f26928e 修复bug 2024-02-19 17:05:17 +08:00
wangpeng 6bedb9fc10 替换数据库 2024-02-19 12:50:24 +08:00
wangpeng af6985d16b 替换数据库 2024-02-19 12:39:23 +08:00
WenShiJun d77838e897 安全环保检查相关bug优化 2024-02-19 12:07:37 +08:00
wangpeng e4e6942264 隐患排查异常修改 2024-02-19 10:06:02 +08:00