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 | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								f1ef0d382c
								
							
								
							
						 | 
						
							
							
								
								三维巡检接口
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								25ce94c260
								
							
								
							
						 | 
						
							
							
								
								修改检修任务统计导出
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								d0375fd61c
								
							
								
							
						 | 
						
							
							
								
								修改检修任务导出
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								cf6064baa3
								
							
								
							
						 | 
						
							
							
								
								缺陷实例类生成bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								39095d5090
								
							
								
							
						 | 
						
							
							
								
								巡检撤销按钮
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								c5ba0661d5
								
							
								
							
						 | 
						
							
							
								
								优化排班导出代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								6960dacf4c
								
							
								
							
						 | 
						
							
							
								
								修正提交代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								cc1669d244
								
							
								
							
						 | 
						
							
							
								
								巡检计划可撤销
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								efcccd9a97
								
							
								
							
						 | 
						
							
							
								
								对平台返回的接口做处理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								f14db51339
								
							
								
							
						 | 
						
							
							
								
								开启流程,不用userCache,改用AuthUtil
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								9b8f9dcc96
								
							
								
							
						 | 
						
							
							
								
								解决导出排班报错问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								d54d591110
								
							
								
							
						 | 
						
							
							
								
								巡检-日常-检修-消缺代码更正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								dddcfd2347
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								97ade655a4
								
							
								
							
						 | 
						
							
							
								
								#路由配置修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								8e17c9cbd6
								
							
								
							
						 | 
						
							
							
								
								巡检-日常-检修-消缺代码更正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								28dc691f63
								
							
								
							
						 | 
						
							
							
								
								巡检-日常-检修-消缺统计代码上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								895c450b9e
								
							
								
							
						 | 
						
							
							
								
								巡检-日常-检修-消缺统计代码上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								3005c6196f
								
							
								
							
						 | 
						
							
							
								
								修复智能诊断bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5a69d8f253
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0413133073
								
							
								
							
						 | 
						
							
							
								
								#缺陷、巡检统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2ad5974f83
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								1b2e3ae245
								
							
								
							
						 | 
						
							
							
								
								# 巡检结束消息APP推送内容修改为与短信保持一致
							
							
							
							
							
							
							
							# sdk版本调整为5.0.2
# 站点删除逻辑调整 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a6a9eefabc
								
							
								
							
						 | 
						
							
							
								
								#缺陷、巡检统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								62ea46fd34
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b79917b222
								
							
								
							
						 | 
						
							
							
								
								#路由修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								3f3c89eace
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								37d5a63e98
								
							
								
							
						 | 
						
							
							
								
								修正水电站月报统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6bb972a7ec
								
							
								
							
						 | 
						
							
							
								
								#黔东南修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								d13f93d3f7
								
							
								
							
						 | 
						
							
							
								
								修正智能诊断统计任务展示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								e4b07e8667
								
							
								
							
						 | 
						
							
							
								
								修正水电站月报导出bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								a26bfc6054
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/inspect/pom.xml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								f8627ef96c
								
							
								
							
						 | 
						
							
							
								
								更新平台jar到5.0.1 release版本
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								fec50a9202
								
							
								
							
						 | 
						
							
							
								
								导入设备信息的时候从定义中获取模型标识填充
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0ede2cb0b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								61cbd2adcf
								
							
								
							
						 | 
						
							
							
								
								#黔东南修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2538c0df15
								
							
								
							
						 | 
						
							
							
								
								# 巡检内容定义删除时做设备定义绑定内容定义时无法删除的限制
							
							
							
							
							
							
							
							# 设备定义列表bug解决 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7d58dc285b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								af77249d06
								
							
								
							
						 | 
						
							
							
								
								#风电计划发电量修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								671fb42e79
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago |