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

208 Commits (cb0952eae5e96dd7f82cb50b94fc9f0d1d2057bf)

Author SHA1 Message Date
277151821@qq.com cb0952eae5 后端修改 2024-03-07 11:06:17 +08:00
xiepeng 14674ea26c Merge remote-tracking branch 'origin/dev' into dev 2024-03-07 10:24:08 +08:00
xiepeng a2576d4258 运营车辆 修改 车船税 2024-03-07 10:23:53 +08:00
277151821@qq.com 63ab771a02 后端修改 2024-03-06 12:25:55 +08:00
xiepeng 42b42a208d 运营车辆 2024-03-06 09:41:06 +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
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
chenxinying f26dbe0980 吊装作业，断路作业，动土作业，盲板PC端 2024-02-29 08:43:27 +08:00
WenShiJun c12d2c7774 安全通知->功能优化 
运单登记后端功能
客户管理后端功能
 2024-02-28 19:16:25 +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
fangjiakai d1def6945d 企业报告 高危作业数据 2024-02-28 09:34:29 +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
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
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 f5579e9856 修复安全环保检查bug 2024-02-23 09:06:12 +08:00
dearlin 0fbddd5f62 新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确 2024-02-22 16:33:00 +08:00
chenxinying cbad06c6dc 临时用电 2024-02-22 11:35:14 +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