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

327 Commits (94709d2b14b61f2c516d52ab55efb30a5e92b55b)

Author SHA1 Message Date
xiepeng 8feddb6b97 Merge remote-tracking branch 'origin/dev' into dev 2024-03-19 14:03:05 +08:00
xiepeng 05ff67e6fd 过户管理 
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
 2024-03-19 14:02:24 +08:00
WenShiJun c40c8fe706 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 17:52:54 +08:00
WenShiJun 2311b8333a 生产安全事故档案模块开发 2024-03-15 17:52:47 +08:00
277151821@qq.com 326a5024ef 营运管理 2024-03-15 11:26:18 +08:00
277151821@qq.com e32470182b 维保管理 2024-03-15 11:25:36 +08:00
277151821@qq.com e3b792417a 保险管理 2024-03-15 11:24:29 +08:00
277151821@qq.com 3e79f43c2f 年检管理 2024-03-15 11:23:46 +08:00
277151821@qq.com 7476fb62b3 北斗管理 2024-03-15 11:21:18 +08:00
xiepeng 51f5ad594b Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:05:03 +08:00
xiepeng d21ddeeb85 过户管理 报废管理 2024-03-14 09:04:40 +08:00
WenShiJun 5b3891263a Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 18:03:48 +08:00
WenShiJun 88dc82a3bd 岗位安全承诺书、责任书，职业危害告知书，管理人员配备，安全生产目标，安全责任制考核模块开发，优化 2024-03-13 18:03:41 +08:00
zhangyanli c7cfb27443 共通信息 2024-03-13 08:41:46 +08:00
zhangyanli cf3c099a38 教培信息 2024-03-12 17:20:55 +08:00
WenShiJun a5d9ae30fc Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 18:10:30 +08:00
WenShiJun ae5bcebb97 安全例会优化 
岗位安全责任书开发
岗位安全承诺书开发
 2024-03-11 18:10:24 +08:00
zhangyanli 91146e106c Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev 2024-03-11 09:03:29 +08:00
zhangyanli 55617c2e0f Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev 2024-03-11 08:46:31 +08:00
WenShiJun 9fc2b68dc2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:05:34 +08:00
WenShiJun c114942d3a 新增劳务聘用合同，岗位安全责任书，职业危害告知书 
安全例会优化
 2024-03-08 18:05:27 +08:00
zhangqihang 9af841b8c9 教培去除部分企业 2024-03-08 18:01:32 +08:00
xiepeng 5ef28f2aa2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:44:00 +08:00
xiepeng 5bd22ec032 过户管理 2024-03-08 17:43:31 +08:00
zhangyanli b4aecc440a 教培信息 2024-03-08 08:50:53 +08:00
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
zhangyanli 0b7b42197b 共通信息 2024-03-06 17:56:01 +08:00
zhangyanli ab39dd7e0b 共通信息 2024-03-06 17:38:52 +08:00
zhangyanli a2b506427e Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev-new 
# Conflicts:
#	src/main/java/com/zcloud/controller/archives/ArchivesCapitalController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduManagerController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesEduPlanController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesFilesController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesPostManController.java
#	src/main/java/com/zcloud/controller/archives/ArchivesTeacherController.java
#	src/main/java/com/zcloud/controller/courseware/AppCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/DataCoursewareController.java
#	src/main/java/com/zcloud/controller/courseware/QuestionController.java
#	src/main/java/com/zcloud/controller/courseware/VideoCoursewareController.java
#	src/main/java/com/zcloud/controller/curriculum/AppMyCurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/CurriculumController.java
#	src/main/java/com/zcloud/controller/curriculum/KcmiddlekjController.java
#	src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java
#	src/main/java/com/zcloud/controller/education/PersonObtainEvidenceController.java
#	src/main/java/com/zcloud/controller/education/TrainingInfoController.java
#	src/main/java/com/zcloud/controller/education/TrainingPlanController.java
#	src/main/java/com/zcloud/controller/paper/StageexampaperInputController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformDataCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformQuestionController.java
#	src/main/java/com/zcloud/controller/platformCourseware/PlatformVideoCoursewareController.java
#	src/main/java/com/zcloud/controller/platformCurriculum/PlatformCurriculumController.java
#	src/main/java/com/zcloud/controller/platformPaper/PlatformStageexampaperInputController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyanswerController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveycorpinfoController.java
#	src/main/java/com/zcloud/controller/questionnaire/AppSurveyquestionController.java
#	src/main/java/com/zcloud/controller/study/AppMfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/MfolderStipulateController.java
#	src/main/java/com/zcloud/controller/study/StudySectionController.java
#	src/main/java/com/zcloud/controller/study/TempStudyController.java
#	src/main/java/com/zcloud/controller/study/VideoController.java
#	src/main/java/com/zcloud/controller/system/AppFeedbackController.java
#	src/main/java/com/zcloud/controller/task/AppCourseExamController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyController.java
#	src/main/java/com/zcloud/controller/task/AppCourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/AppCoursepapersController.java
#	src/main/java/com/zcloud/controller/task/AppStageExamController.java
#	src/main/java/com/zcloud/controller/task/AppStageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/AppStageexampaperController.java
#	src/main/java/com/zcloud/controller/task/AppStudyTaskController.java
#	src/main/java/com/zcloud/controller/task/CourseStudyVideoRecordController.java
#	src/main/java/com/zcloud/controller/task/StageExamController.java
#	src/main/java/com/zcloud/controller/task/StageStudentRelationController.java
#	src/main/java/com/zcloud/controller/task/StageexampaperController.java
#	src/main/java/com/zcloud/controller/task/StudyTaskController.java
#	src/main/java/com/zcloud/controller/video/AIWarningController.java
#	src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java
#	src/main/java/com/zcloud/controller/video/AppVideoManagerController.java
#	src/main/java/com/zcloud/controller/video/VideoManagerController.java
#	src/main/java/com/zcloud/mapper/datasource/corp/CorpInfoMapper.java
#	src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/AIWarningMapper.java
#	src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java
#	src/main/java/com/zcloud/service/corp/CorpInfoService.java
#	src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java
#	src/main/java/com/zcloud/service/system/DepartmentService.java
#	src/main/java/com/zcloud/service/system/UsersService.java
#	src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
#	src/main/java/com/zcloud/service/video/AIWarningService.java
#	src/main/java/com/zcloud/service/video/VideoManagerService.java
#	src/main/java/com/zcloud/service/video/impl/AIWarningServiceImpl.java
#	src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java
#	src/main/java/com/zcloud/util/Const.java
#	src/main/java/com/zcloud/util/DateUtil.java
#	src/main/java/com/zcloud/util/InitPageDataUtil.java
#	src/main/resources/application.properties
#	src/main/resources/mybatis/datasource/system/UsersMapper.xml
 2024-03-06 16:33:30 +08:00
zhangyanli 6b2a1c9479 提交信息 2024-03-06 16:25:53 +08:00
WenShiJun 6298ab6596 安全例会模块优化->查看人员列表页，详情页 2024-03-06 16:10:05 +08:00
277151821@qq.com 63ab771a02 后端修改 2024-03-06 12:25:55 +08:00
xiepeng ece25c0daf 运营车辆 2024-03-06 10:28:52 +08:00
xiepeng a893aa83b2 Merge remote-tracking branch 'origin/dev' into dev 2024-03-06 09:41:34 +08:00
xiepeng 42b42a208d 运营车辆 2024-03-06 09:41:06 +08:00
WenShiJun 8316b09a48 安全例会模块优化 2024-03-05 18:14:36 +08:00
wangpeng 04b40acb8d 变更附件主目录 2024-03-05 16:49:04 +08:00
wangpeng 1bc503f3cb 变更附件主目录 2024-03-05 16:47:52 +08:00
277151821@qq.com 3d1a78869c 后端修改 2024-03-05 11:36:33 +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
fangjiakai 93ca8d2982 聚集告警人员列表 2024-02-28 10:44:54 +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
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
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
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
zhangyanli 5514125492 排查统计和隐患治理菜单bug修复 2024-02-21 16:13:31 +08:00