zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								c7a49574e3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-05-08 16:45:39 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								a5ea6896b5
								
							
								
							
						 | 
						
							
							
								
								2025/05/08 修改企业人员管理列表
							
							
							
							
							
						 | 
						
							2025-05-08 16:45:26 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								4de8f5060b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-04-20 18:43:32 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								1c53c0573a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-04-20 18:29:45 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								fd44c32824
								
							
								
							
						 | 
						
							
							
								
								2025/04/20 APP查询企业人员列表报错
							
							
							
							
							
						 | 
						
							2025-04-20 18:29:33 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								f294d336d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
							
							
							# Conflicts:
#	utils/request.js 
							
						 | 
						
							2025-04-20 16:58:30 +08:00 | 
						
					
				
					
						
							
							
								 
								1261008090@qq.com
							
						 | 
						
							
							
							
							
								
							
								9787ef8a0d
								
							
								
							
						 | 
						
							
							
								
								新增登录失效返回登录页
							
							
							
							
							
						 | 
						
							2025-04-20 16:57:00 +08:00 | 
						
					
				
					
						
							
							
								 
								1261008090@qq.com
							
						 | 
						
							
							
							
							
								
							
								6f441a7aff
								
							
								
							
						 | 
						
							
							
								
								新增登录失效返回登录页
							
							
							
							
							
						 | 
						
							2025-04-20 16:46:00 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								06cbf0bf15
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-04-20 13:39:29 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								6833e6c0d5
								
							
								
							
						 | 
						
							
							
								
								2025/04/20 修改安全环保检查申报一直转圈的问题
							
							
							
							
							
						 | 
						
							2025-04-20 11:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								27ec4145ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-04-20 10:37:50 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								0d7a240a58
								
							
								
							
						 | 
						
							
							
								
								1.缓存中存在附件地址信息错误
							
							
							
							
							
						 | 
						
							2025-04-18 20:22:01 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								c9f670d4df
								
							
								
							
						 | 
						
							
							
								
								1.打包
							
							
							
							
							
						 | 
						
							2025-04-18 20:21:56 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								c542390b03
								
							
								
							
						 | 
						
							
							
								
								监管的无法选择企业端数据
							
							
							
							
							
						 | 
						
							2025-04-01 10:39:25 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								7acfd91d6d
								
							
								
							
						 | 
						
							
							
								
								监管的无法选择企业端数据
							
							
							
							
							
						 | 
						
							2025-03-31 17:22:30 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								51ded1e8a3
								
							
								
							
						 | 
						
							
							
								
								签字无法回显bug修复
							
							
							
							
							
						 | 
						
							2025-03-28 11:32:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								c530c66d34
								
							
								
							
						 | 
						
							
							
								
								1. 添加依赖
							
							
							
							
							
						 | 
						
							2025-03-28 09:10:12 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								a04dbcc3d2
								
							
								
							
						 | 
						
							
							
								
								受限空间查询功能调整
							
							
							
							
							
						 | 
						
							2025-03-24 16:55:43 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								4f71230e02
								
							
								
							
						 | 
						
							
							
								
								受限空间查询功能调整
							
							
							
							
							
						 | 
						
							2025-03-21 16:56:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								a829fe024d
								
							
								
							
						 | 
						
							
							
								
								1. 增加重大隐患打回提示
							
							
							
							
							
						 | 
						
							2025-03-17 18:18:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								0aa1a7c73c
								
							
								
							
						 | 
						
							
							
								
								1. 安全环保检查申辩
							
							
							
							
							
						 | 
						
							2025-03-14 17:30:54 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								f5e08c6d68
								
							
								
							
						 | 
						
							
							
								
								[问题修复](pet_2.0):
							
							
							
							
							
							
							
							修复特殊处置审核人为空问题 
							
						 | 
						
							2025-03-13 14:34:49 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								48406b3704
								
							
								
							
						 | 
						
							
							
								
								[问题修复](pet_2.0):
							
							
							
							
							
							
							
							修复清单类型,清单周期没有的问题,修复安全环保检查选择部门出现相关方问题 
							
						 | 
						
							2025-03-13 14:21:38 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								84df2ba8dd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-03-10 16:43:13 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								cd53ee0611
								
							
								
							
						 | 
						
							
							
								
								[问题修复](pet_2.0):
							
							
							
							
							
							
							
							问题修复 
							
						 | 
						
							2025-03-10 16:42:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								13f4d57e7c
								
							
								
							
						 | 
						
							
							
								
								1. 特级动火申请 api 上传文件加表单 拆分2个接口 因为后台不支持单个接口不传文件是请求体  传文件是formdata
							
							
							
							
							
						 | 
						
							2025-03-10 16:21:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								e6387fe6b7
								
							
								
							
						 | 
						
							
							
								
								1. 修改token续期为定时任务续期的方式
							
							
							
							
							
							
							
							2. 特级动火-上传会议纪要 增加相机 相册选择的方式 
							
						 | 
						
							2025-03-10 16:19:06 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								67b89b4574
								
							
								
							
						 | 
						
							
							
								
								2025/03/07  时间为空得时候不现实
							
							
							
							
							
						 | 
						
							2025-03-07 14:40:41 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								4659117213
								
							
								
							
						 | 
						
							
							
								
								2025/03/07 重点工程接口缺失
							
							
							
							
							
						 | 
						
							2025-03-07 08:57:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								8b236bc779
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2025-03-03 18:14:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								58c05d88d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into pet-2.0
							
							
							
							
							
							
							
							# Conflicts:
#	pages/login/login.vue 
							
						 | 
						
							2025-02-28 17:36:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								3748c7c18b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0
							
							
							
							
							
						 | 
						
							2025-02-27 17:33:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								b94e6a75fe
								
							
								
							
						 | 
						
							
							
								
								token续期逻辑
							
							
							
							
							
						 | 
						
							2025-02-27 17:33:42 +08:00 | 
						
					
				
					
						
							
							
								
								 dearLin
							
						 | 
						
							
							
							
							
								
							
								2d129ae6ce
								
							
								
							
						 | 
						
							
							
								
								feat:补充crypto-js依赖
							
							
							
							
							
						 | 
						
							2025-02-24 10:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								8b25aec6c3
								
							
								
							
						 | 
						
							
							
								
								适配2.0端登录  请求修改  增加token
							
							
							
							
							
						 | 
						
							2025-02-17 17:29:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								df92b3e4e8
								
							
								
							
						 | 
						
							
							
								
								适配2.0端登录  请求修改  增加token
							
							
							
							
							
						 | 
						
							2025-02-11 17:35:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Shan Ao
							
						 | 
						
							
							
							
							
								
							
								9a3b24c0f4
								
							
								
							
						 | 
						
							
							
								
								安全环保检查app隐患指派与验收接口超时
							
							
							
							
							
						 | 
						
							2025-02-11 16:52:51 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								6c7625a612
								
							
								
							
						 | 
						
							
							
								
								【bug】
							
							
							
							
							
							
							
							1. 公告信息样式问题
2. 版本更新提示
3. 安全环保检查-监察人确认签字样式错误
4. 承诺书样式错误 
							
						 | 
						
							2025-01-13 13:54:01 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								45e33f33a1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	store/index.js 
							
						 | 
						
							2025-01-10 18:10:45 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								0109d54da2
								
							
								
							
						 | 
						
							
							
								
								1.解决样式问题
							
							
							
							
							
						 | 
						
							2025-01-10 17:46:20 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								3f0f4c89fa
								
							
								
							
						 | 
						
							
							
								
								安全环保检查发起页面问题
							
							
							
							
							
						 | 
						
							2025-01-10 17:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								6db57dffb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2025-01-09 18:46:47 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								c758656297
								
							
								
							
						 | 
						
							
							
								
								监管端安全环保检查检查人确认 没有显示隐患数据
							
							
							
							
							
						 | 
						
							2025-01-09 18:46:36 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								95ff51f2a4
								
							
								
							
						 | 
						
							
							
								
								[功能优化](pet):
							
							
							
							
							
							
							
							解决滚动分页失效问题 
							
						 | 
						
							2025-01-09 17:42:19 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								f12c278111
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2025-01-09 17:07:11 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								b226670f10
								
							
								
							
						 | 
						
							
							
								
								回退版本【去除统一文件的修改】
							
							
							
							
							
						 | 
						
							2025-01-09 14:53:00 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								3f9a112d9f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2025-01-08 16:21:38 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								ec55a2b248
								
							
								
							
						 | 
						
							
							
								
								Revert "1.缓存中存在附件地址信息错误"
							
							
							
							
							
							
							
							This reverts commit 8a0ca55b43. 
							
						 | 
						
							2025-01-08 16:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								229942165d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2025-01-08 16:09:23 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								94c4f55ecb
								
							
								
							
						 | 
						
							
							
								
								回退版本【{去除统一文件的修改}】
							
							
							
							
							
						 | 
						
							2025-01-08 16:08:59 +08:00 |