466 Commits (6eed001b1af4472ed9212dbd8eb6afd1760f58d5)

All Branches

Search

Author	SHA1	Message	Date
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