zhaoyu
							
						 | 
						
							
							
							
							
								
							
								dc730ad266
								
							
								
							
						 | 
						
							
							
								
								责任状
							
							
							
							
							
						 | 
						
							2024-01-11 11:37:45 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								43e99613d0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'liujun-2023-12-28-bug修改' into dev-2024年1月8日
							
							
							
							
							
						 | 
						
							2024-01-10 17:56:23 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								d027db8bb7
								
							
								
							
						 | 
						
							
							
								
								对接bug修复
							
							
							
							
							
						 | 
						
							2024-01-08 16:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								fdbecc3f17
								
							
								
							
						 | 
						
							
							
								
								地图展示具体位置
							
							
							
							
							
						 | 
						
							2024-01-04 16:44:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								beea017dbb
								
							
								
							
						 | 
						
							
							
								
								重点工程具体位置
							
							
							
							
							
						 | 
						
							2024-01-04 16:43:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f4bd540162
								
							
								
							
						 | 
						
							
							
								
								删除隐患考评
							
							
							
							
							
						 | 
						
							2024-01-03 16:58:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								c8fe830e31
								
							
								
							
						 | 
						
							
							
								
								展示有限空间数据
							
							
							
							
							
						 | 
						
							2024-01-03 10:31:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								66fcc4e31d
								
							
								
							
						 | 
						
							
							
								
								地图重点工程bug修复
							
							
							
							
							
						 | 
						
							2023-12-29 16:44:12 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								6527cfea93
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-28 14:46:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								22058cb89b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1222-八项作业地图迁移修改
							
							
							
							
							
						 | 
						
							2023-12-26 17:15:11 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								e235c5a287
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1222-八项作业地图迁移修改
							
							
							
							
							
						 | 
						
							2023-12-26 14:03:30 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								0711341b72
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移
							
							
							
							
							
						 | 
						
							2023-12-26 13:53:20 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								e155e67558
								
							
								
							
						 | 
						
							
							
								
								Merge branch '1222-八项作业地图迁移修改' into 新动火作业1128
							
							
							
							
							
						 | 
						
							2023-12-25 14:44:15 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								c1994ada04
								
							
								
							
						 | 
						
							
							
								
								动火作业编制人不显示bug
							
							
							
							
							
						 | 
						
							2023-12-25 14:43:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f56ea990df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'zy-1219-四色卡' into 1222-八项作业地图迁移修改
							
							
							
							
							
						 | 
						
							2023-12-25 13:52:02 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								df6687c215
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-22 17:14:38 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								2b744d8ff1
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-22 17:07:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f750e41a25
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-22 16:27:47 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								7e6487fe54
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-21 20:01:50 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								d50e994526
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-21 19:55:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								b0db6e3e4d
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-21 18:04:38 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								ca30fd1136
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-21 15:15:44 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								69701c7e78
								
							
								
							
						 | 
						
							
							
								
								查看bug修复
							
							
							
							
							
						 | 
						
							2023-12-21 14:31:20 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								19bfb0baff
								
							
								
							
						 | 
						
							
							
								
								相关方查看详情统一格式
							
							
							
							
							
						 | 
						
							2023-12-21 13:58:55 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								94c60d1f6b
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-20 19:51:13 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								9216178221
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-20 15:57:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								a9abf14264
								
							
								
							
						 | 
						
							
							
								
								风险分布图增加三人以上分布图和人员聚集场所分布图
							
							
							
							
							
						 | 
						
							2023-12-19 15:26:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6ecc055647
								
							
								
							
						 | 
						
							
							
								
								边界入侵只在一公司展示
							
							
							
							
							
						 | 
						
							2023-12-15 17:46:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6123eb94a9
								
							
								
							
						 | 
						
							
							
								
								港股查询港股的部门
							
							
							
							
							
						 | 
						
							2023-12-15 15:55:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								e6b0c53c36
								
							
								
							
						 | 
						
							
							
								
								重点工程优化
							
							
							
							
							
						 | 
						
							2023-12-15 15:50:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								89cbc27c62
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求
							
							
							
							
							
						 | 
						
							2023-12-14 18:57:51 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								7af697ad76
								
							
								
							
						 | 
						
							
							
								
								新动火作业和港务局一公司地图点位页面更新3
							
							
							
							
							
						 | 
						
							2023-12-14 18:32:24 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								9033707ae1
								
							
								
							
						 | 
						
							
							
								
								13025 用工形式显示不正确
							
							
							
							
							
						 | 
						
							2023-12-14 18:09:24 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								356eab0ded
								
							
								
							
						 | 
						
							
							
								
								13132 人员详情页面 修改 参考其他页面
							
							
							
							
							
						 | 
						
							2023-12-14 17:55:55 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								16636dbae4
								
							
								
							
						 | 
						
							
							
								
								13134 主管部门没有显示数据
							
							
							
							
							
						 | 
						
							2023-12-14 17:49:54 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								af4055823b
								
							
								
							
						 | 
						
							
							
								
								12618 编辑页面 判空提示语不正确
							
							
							
							
							
						 | 
						
							2023-12-14 16:07:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								58e7ab4540
								
							
								
							
						 | 
						
							
							
								
								排版
							
							
							
							
							
						 | 
						
							2023-12-14 15:47:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								ee190fc41e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/重点工程定位需求' into 重点工程定位需求
							
							
							
							
							
						 | 
						
							2023-12-14 15:46:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								24d4be5b65
								
							
								
							
						 | 
						
							
							
								
								排版
							
							
							
							
							
						 | 
						
							2023-12-14 15:46:04 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								b2e4ab0d38
								
							
								
							
						 | 
						
							
							
								
								12618 编辑页面 判空提示语不正确
							
							
							
							
							
						 | 
						
							2023-12-14 15:23:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								c48430df78
								
							
								
							
						 | 
						
							
							
								
								搜索
							
							
							
							
							
						 | 
						
							2023-12-14 14:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								5a1ec5df35
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-14 14:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f575847b82
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2023-12-14 09:51:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								14abb214e1
								
							
								
							
						 | 
						
							
							
								
								开工数量不对问题
							
							
							
							
							
						 | 
						
							2023-12-13 17:05:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f5cdc6232e
								
							
								
							
						 | 
						
							
							
								
								文件下载问题
							
							
							
							
							
						 | 
						
							2023-12-13 16:57:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								a6ccc5a8a6
								
							
								
							
						 | 
						
							
							
								
								经纬度问题
							
							
							
							
							
						 | 
						
							2023-12-13 16:55:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f004534d92
								
							
								
							
						 | 
						
							
							
								
								bug处理
							
							
							
							
							
						 | 
						
							2023-12-13 14:44:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6a032a68f7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/map/dialog/index.vue 
							
						 | 
						
							2023-12-11 18:19:40 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								5335c79d33
								
							
								
							
						 | 
						
							
							
								
								新动火作业和港务局一公司地图点位页面更新2
							
							
							
							
							
						 | 
						
							2023-12-11 18:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								84a0e76a06
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/yhkp' into 重点工程定位需求
							
							
							
							
							
							
							
							# Conflicts:
#	src/components/OutSourced/index.vue 
							
						 | 
						
							2023-12-11 18:15:29 +08:00 |