yang_shj
							
						 | 
						
							
							
							
							
								
							
								86ad2d8fb7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ad71a6a5a7
								
							
								
							
						 | 
						
							
							
								
								#流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								716cbe6e1b
								
							
								
							
						 | 
						
							
							
								
								# 日常维护生成任务bug修改
							
							
							
							
							
							
							
							# 巡检任务派发任务过期任务未置为未完成状态
# 巡检内容定义筛选条件过滤补充 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								zhaiqm
							
						 | 
						
							
							
							
							
								
							
								ada7c67e93
								
							
								
							
						 | 
						
							
							
								
								@不安全行为管理@翟千民
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								zhaiqm
							
						 | 
						
							
							
							
							
								
							
								4248245ce4
								
							
								
							
						 | 
						
							
							
								
								@电站运行数据@翟千民
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								b6324254c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0efac9e1a2
								
							
								
							
						 | 
						
							
							
								
								#流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								87024d1c19
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2dcacd70d6
								
							
								
							
						 | 
						
							
							
								
								#流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								333347464a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/huoshan' into huoshan
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b33f28ba2a
								
							
								
							
						 | 
						
							
							
								
								#新区域值班数据统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								6108e81fef
								
							
								
							
						 | 
						
							
							
								
								新建water-rain模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								865b70121c
								
							
								
							
						 | 
						
							
							
								
								新建water-quality模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								409fef4c55
								
							
								
							
						 | 
						
							
							
								
								#工作台修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b3403c2f88
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/huoshan' into huoshan
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								18c5378d9a
								
							
								
							
						 | 
						
							
							
								
								#新区域值班统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								b39447c854
								
							
								
							
						 | 
						
							
							
								
								新建video-image模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								1c272c440e
								
							
								
							
						 | 
						
							
							
								
								新建dam-safety模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2118798f5f
								
							
								
							
						 | 
						
							
							
								
								#智能预警过滤
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								f1ef0d382c
								
							
								
							
						 | 
						
							
							
								
								三维巡检接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								f62181a93a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								17b2661a6e
								
							
								
							
						 | 
						
							
							
								
								#巡检内容bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								050c65ee2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								6b63ad594b
								
							
								
							
						 | 
						
							
							
								
								# 两票接口优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								676dd5f42b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9be1542c22
								
							
								
							
						 | 
						
							
							
								
								#微信消息推送&巡检内容bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								da4059e44d
								
							
								
							
						 | 
						
							
							
								
								修改库存导入bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								2c7d9196d3
								
							
								
							
						 | 
						
							
							
								
								修改库存导入bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6c72723088
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								230745e4a6
								
							
								
							
						 | 
						
							
							
								
								#预警处理过滤
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								0546eddfa6
								
							
								
							
						 | 
						
							
							
								
								修改调拨单bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								03d8d1252d
								
							
								
							
						 | 
						
							
							
								
								修改库存物资台账权限查看bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								f558ed2779
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								91ef459447
								
							
								
							
						 | 
						
							
							
								
								工具退回-增加模糊查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								910f6ec019
								
							
								
							
						 | 
						
							
							
								
								#预警处理过滤
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								d0cbd38310
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								e1f9b7a87a
								
							
								
							
						 | 
						
							
							
								
								首页报表-缺陷报表修正bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								7032ffffd6
								
							
								
							
						 | 
						
							
							
								
								首页报表-缺陷报表修正bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8802450ec9
								
							
								
							
						 | 
						
							
							
								
								#首页工作台接口优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								0a6a154ee1
								
							
								
							
						 | 
						
							
							
								
								水电站月报统计功能修正bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								zhaiqm
							
						 | 
						
							
							
							
							
								
							
								aa970d66fb
								
							
								
							
						 | 
						
							
							
								
								@天气预报接口增加@翟千民
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								zhaiqm
							
						 | 
						
							
							
							
							
								
							
								06f9b5e377
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/huoshan' into huoshan
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service-api/digital-twin-display-api/pom.xml
#	hzims-service/digital-twin-display/pom.xml
#	hzims-service/digital-twin-display/src/main/java/com/hnac/hzims/twindisplay/DigitalTwinDisplayApplication.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								zhaiqm
							
						 | 
						
							
							
							
							
								
							
								7717bd798c
								
							
								
							
						 | 
						
							
							
								
								@天气预报接口增加@翟千民
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								aae7b2934f
								
							
								
							
						 | 
						
							
							
								
								新建digital-twin-display模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								e390be16e2
								
							
								
							
						 | 
						
							
							
								
								新建digital-twin-display模块
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								e78c5404e6
								
							
								
							
						 | 
						
							
							
								
								初始化项目
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								efd38b9d64
								
							
								
							
						 | 
						
							
							
								
								初始化项目
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								261a0aa07b
								
							
								
							
						 | 
						
							
							
								
								#流程统计修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ce3cb427b1
								
							
								
							
						 | 
						
							
							
								
								#流程统计修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								a473aabcb1
								
							
								
							
						 | 
						
							
							
								
								更换两票统计字段:统计月报/智能生产首页(新工作流字段变更)
							
							
							
							
							
						 | 
						
							2 years ago |