liwen
							
						 | 
						
							
							
							
							
								
							
								21566f1b80
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								2e96063d62
								
							
								
							
						 | 
						
							
							
								
								update: 考试记录及格分设置功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								c2df9ad569
								
							
								
							
						 | 
						
							
							
								
								fix: 解决导出文件无图片时报错的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								893d05d0bf
								
							
								
							
						 | 
						
							
							
								
								add:遥控鉴权接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								ea19bb23ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0a2332f9b8
								
							
								
							
						 | 
						
							
							
								
								add:遥控鉴权接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								56937e74ca
								
							
								
							
						 | 
						
							
							
								
								升级:user-api更新为5.1.1.RELEASE.fix.4
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 RnhaiWang
							
						 | 
						
							
							
							
							
								
							
								c7a3b8bf73
								
							
								
							
						 | 
						
							
							
								
								任务增加路线名称
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 RnhaiWang
							
						 | 
						
							
							
							
							
								
							
								bea6be4513
								
							
								
							
						 | 
						
							
							
								
								任务增加路线名称
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								8a172849be
								
							
								
							
						 | 
						
							
							
								
								add:遥控函数添加
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								1ea32e03ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'prod-20240506' of http://175.6.40.68:8081/Jone/hzims-back into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								878abb1342
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/websocket/handler/InteractiveHandler.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								89ec1c4bf6
								
							
								
							
						 | 
						
							
							
								
								update: 智能问答增加调用知识库问答接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								5ad63934be
								
							
								
							
						 | 
						
							
							
								
								add:遥控函数添加
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								6321bf1b52
								
							
								
							
						 | 
						
							
							
								
								修正:微信公众号消息推送逻辑
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								849ab8fd06
								
							
								
							
						 | 
						
							
							
								
								update: 培训、演练的月度统计添加点击查看相关数据功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								722e178b65
								
							
								
							
						 | 
						
							
							
								
								update: 考试记录添加及格分设置
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								c922eb5fe3
								
							
								
							
						 | 
						
							
							
								
								修正:交接班值班日志bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								135006efea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								af7529a008
								
							
								
							
						 | 
						
							
							
								
								fix:工作票附表预览补充危险源
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								41aafa07a8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/InteractiveSchedule.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0f8340d052
								
							
								
							
						 | 
						
							
							
								
								#实时数据模拟&生态流量接入
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 RnhaiWang
							
						 | 
						
							
							
							
							
								
							
								da5516f038
								
							
								
							
						 | 
						
							
							
								
								数据看板加单位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								b7067df156
								
							
								
							
						 | 
						
							
							
								
								修正:代码逻辑问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								d11ee8c62c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								5fb2f2f43a
								
							
								
							
						 | 
						
							
							
								
								修复package包不对
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								886222d454
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								bb303d1502
								
							
								
							
						 | 
						
							
							
								
								修正:库存判断bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								bdb19c110e
								
							
								
							
						 | 
						
							
							
								
								fix:选择故障函数添加
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								ac7fec2f99
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								1b8a2cd45d
								
							
								
							
						 | 
						
							
							
								
								update: 导出功能代码调整
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								75384cd950
								
							
								
							
						 | 
						
							
							
								
								fix:实时画面画面类型返回前端
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								4f85176c37
								
							
								
							
						 | 
						
							
							
								
								fix:open_scada修改为open_canvas
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0ad8791311
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								27e18383a6
								
							
								
							
						 | 
						
							
							
								
								fix:open_scada修改为open_canvas
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c544eec9d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6d986e1313
								
							
								
							
						 | 
						
							
							
								
								#发电量计算最后值减最初值方式
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								46d8078a09
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报发电量格式
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								3164b11de2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								cc8e609a59
								
							
								
							
						 | 
						
							
							
								
								修改:导出工具类优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8c12033877
								
							
								
							
						 | 
						
							
							
								
								#发电量计算最后值减最初值方式
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2a4b94eea9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								196eb317e5
								
							
								
							
						 | 
						
							
							
								
								#发电量计算最后值减最初值方式
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								039229668a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								85c7f783d4
								
							
								
							
						 | 
						
							
							
								
								修正:月报统计修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f57b56e994
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								29a3490f0c
								
							
								
							
						 | 
						
							
							
								
								#集中监控设备状态&上上限,下下限超限状态设置
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								b375a0a86c
								
							
								
							
						 | 
						
							
							
								
								fix: 超链接url添加格式化编码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								c56363f902
								
							
								
							
						 | 
						
							
							
								
								fix: 解决导出文件的超链接有多个时报错的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 RnhaiWang
							
						 | 
						
							
							
							
							
								
							
								99a4ad830e
								
							
								
							
						 | 
						
							
							
								
								修正机器人告警信息错误信息提示
							
							
							
							
							
						 | 
						
							1 year ago |