guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								a033556bd0
								
							
								
							
						 | 
						
							
							
								
								1.安全承诺书,主要负责人签字,改成承诺人签字
							
							
							
							
							
						 | 
						
							2025-03-20 18:27:21 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								412bb45690
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-03-06 15:55:14 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								eff16e994a
								
							
								
							
						 | 
						
							
							
								
								1.安全承诺增加输入岗位,
							
							
							
							
							
							
							
							2.安全承诺增加有效期限 
							
						 | 
						
							2025-03-06 15:55:06 +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 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								5a6185aa5d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhy_new_1203' into pet
							
							
							
							
							
						 | 
						
							2024-12-26 16:31:33 +08:00 | 
						
					
				
					
						
							
							
								
								 huangyuxuan
							
						 | 
						
							
							
							
							
								
							
								16bf72187a
								
							
								
							
						 | 
						
							
							
								
								[功能优化](pet):
							
							
							
							
							
							
							
							解决企业风险四色图统计数字不对的情况,增加风险告知卡数统计,三人以上分布图数统计,人员聚集场所分布图数统计 
							
						 | 
						
							2024-12-24 17:26:31 +08:00 | 
						
					
				
					
						
							
							
								 
								shanao
							
						 | 
						
							
							
							
							
								
							
								f653988292
								
							
								
							
						 | 
						
							
							
								
								完成文件接口统一(除意见反馈附件 新八项作业)
							
							
							
							
							
						 | 
						
							2024-12-18 10:48:23 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								f51bbd6c41
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2024-12-17 15:36:26 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								18c4066e6d
								
							
								
							
						 | 
						
							
							
								
								文件接口修改
							
							
							
							
							
						 | 
						
							2024-12-17 15:36:07 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								8a0ca55b43
								
							
								
							
						 | 
						
							
							
								
								1.缓存中存在附件地址信息错误
							
							
							
							
							
						 | 
						
							2024-12-13 11:24:48 +08:00 | 
						
					
				
					
						
							
							
								
								 LiuJiaNan
							
						 | 
						
							
							
							
							
								
							
								efeda5659a
								
							
								
							
						 | 
						
							
							
								
								更改附件地址
							
							
							
							
							
						 | 
						
							2024-12-13 08:44:57 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								4dcbb45f02
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
							
							
							# Conflicts:
#	pages/key-project-management/positioning_management/videoView.vue 
							
						 | 
						
							2024-12-05 15:21:09 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								332a6dbc9a
								
							
								
							
						 | 
						
							
							
								
								1.监管端重点工程显示视频
							
							
							
							
							
						 | 
						
							2024-12-05 15:20:53 +08:00 | 
						
					
				
					
						
							
							
								
								 LiuJiaNan
							
						 | 
						
							
							
							
							
								
							
								cc8ff0d52b
								
							
								
							
						 | 
						
							
							
								
								重点工程播放视频
							
							
							
							
							
						 | 
						
							2024-12-05 14:27:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zhaohongyu
							
						 | 
						
							
							
							
							
								
							
								28108b65ae
								
							
								
							
						 | 
						
							
							
								
								20241205 适配隐患来源增加点检隐患
							
							
							
							
							
						 | 
						
							2024-12-05 11:34:54 +08:00 | 
						
					
				
					
						
							
							
								 
								guoyuepeng
							
						 | 
						
							
							
							
							
								
							
								beeb53f40e
								
							
								
							
						 | 
						
							
							
								
								1.查看安全环保检查视频
							
							
							
							
							
						 | 
						
							2024-12-05 10:57:08 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								04fdcb9a96
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2024-12-04 20:08:47 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								af4f790449
								
							
								
							
						 | 
						
							
							
								
								[bug修改]
							
							
							
							
							
							
							
							1、监管端、相关方端已办中无法查看其他信息
2、删除无效代码 
							
						 | 
						
							2024-12-04 20:07:21 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								6739da1733
								
							
								
							
						 | 
						
							
							
								
								监管端人员定位默认值清空
							
							
							
							
							
						 | 
						
							2024-12-04 17:26:57 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								87003da2d1
								
							
								
							
						 | 
						
							
							
								
								【bug】
							
							
							
							
							
							
							
							1. 修改盲板申请单位签字后不生效的问题 
							
						 | 
						
							2024-12-04 17:07:33 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								c921c6590d
								
							
								
							
						 | 
						
							
							
								
								监管端未传部门id
							
							
							
							
							
						 | 
						
							2024-12-04 17:04:30 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								998395fdba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2024-12-04 11:24:44 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								d5ac3d97fb
								
							
								
							
						 | 
						
							
							
								
								临时用电气体分析
							
							
							
							
							
						 | 
						
							2024-12-04 11:24:36 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								7a52ade288
								
							
								
							
						 | 
						
							
							
								
								详情页样式调整
							
							
							
							
							
						 | 
						
							2024-12-04 10:48:12 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								bfa7fb4820
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2024-12-03 19:25:40 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								11a117e39a
								
							
								
							
						 | 
						
							
							
								
								动火点击定位后。无法正常审批
							
							
							
							
							
						 | 
						
							2024-12-03 19:25:19 +08:00 | 
						
					
				
					
						
							
							
								
								 shanao
							
						 | 
						
							
							
							
							
								
							
								235184e8c7
								
							
								
							
						 | 
						
							
							
								
								同步受限空间bug
							
							
							
							
							
						 | 
						
							2024-12-03 19:16:55 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								cc9dd66f3b
								
							
								
							
						 | 
						
							
							
								
								图片能点击放大
							
							
							
							
							
						 | 
						
							2024-12-03 16:00:17 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								10ef76c1b6
								
							
								
							
						 | 
						
							
							
								
								1、安全检查项bug修复
							
							
							
							
							
						 | 
						
							2024-11-30 15:31:53 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								dadfd333d2
								
							
								
							
						 | 
						
							
							
								
								动火等级调整
							
							
							
							
							
						 | 
						
							2024-11-30 14:50:31 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								8228b34f99
								
							
								
							
						 | 
						
							
							
								
								必填校验bug修复
							
							
							
							
							
						 | 
						
							2024-11-29 16:06:46 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								cbe2ac7d3a
								
							
								
							
						 | 
						
							
							
								
								1、app端无法显示气体分析
							
							
							
							
							
							
							
							2、app打回后无法重新提交 
							
						 | 
						
							2024-11-28 17:37:49 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								edddf9fe6c
								
							
								
							
						 | 
						
							
							
								
								2563 动火作业流程图 延时监火是部门 显示部门 所有端都要改
							
							
							
							
							
						 | 
						
							2024-11-22 15:24:40 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								23d1b73e5d
								
							
								
							
						 | 
						
							
							
								
								1、动火作业气体分析未校验
							
							
							
							
							
							
							
							2、已办事项按钮样式调整 
							
						 | 
						
							2024-11-22 13:58:29 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								5a680bd0d4
								
							
								
							
						 | 
						
							
							
								
								bug修复,隐藏字段被展示
							
							
							
							
							
						 | 
						
							2024-11-22 11:45:36 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								559a861f79
								
							
								
							
						 | 
						
							
							
								
								动火下一步跳白屏bug修复
							
							
							
							
							
						 | 
						
							2024-11-19 14:35:40 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								387336b808
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/pet' into pet
							
							
							
							
							
						 | 
						
							2024-11-18 17:25:35 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								50c0c246b3
								
							
								
							
						 | 
						
							
							
								
								1、bug修复:无法使用定位功能
							
							
							
							
							
						 | 
						
							2024-11-18 17:25:15 +08:00 | 
						
					
				
					
						
							
							
								 
								fufeifei
							
						 | 
						
							
							
							
							
								
							
								568cce01f0
								
							
								
							
						 | 
						
							
							
								
								1、分公司隐患考评的考评功能
							
							
							
							
							
						 | 
						
							2024-11-08 15:45:26 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								bf3a2e525c
								
							
								
							
						 | 
						
							
							
								
								1、bug修复:监管端路由缺失
							
							
							
							
							
							
							
							2、bug修复:相关方端样式调整后无法操作延迟监火 
							
						 | 
						
							2024-11-06 15:57:42 +08:00 |