 haungxing
|
a1ed4fe025
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
haungxing
|
cbcb5b1de1
|
fix:巡检任务查询添加数据权限
|
7 months ago |
 liwen
|
bac3c8c5aa
|
fix: 培训管理添加数据权限
|
7 months ago |
|
liwen
|
3edbc96b0e
|
safeproduct-api.iml
|
7 months ago |
|
liwen
|
26cae371f7
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
7 months ago |
|
liwen
|
177c9e39e1
|
safeproduct-api.iml
|
7 months ago |
|
liwen
|
c4fa414b8f
|
fix: 演练管理添加数据权限
|
7 months ago |
 yang_shj
|
ca3233ab51
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
52dbf30038
|
#设备24小时功率修改
|
7 months ago |
|
liwen
|
1bdeda3c5d
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
liwen
|
8b11c514c8
|
fix: 解决导出超链接url报错的问题
|
7 months ago |
 ty
|
2f0137ae6c
|
删除：实时数据打印日志
|
7 months ago |
|
ty
|
8f29af4c4f
|
修正：智能诊断增加排序字段
|
7 months ago |
|
ty
|
24239be908
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
ty
|
e9ad846fd8
|
修正：值班日志-两票数量统计
|
7 months ago |
|
yang_shj
|
1d59bfc724
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
aebdd02573
|
#开关机告警修改
|
7 months ago |
|
haungxing
|
6d0f315c7a
|
fix:日常维护月度查询设备名称取值逻辑修改
|
7 months ago |
|
haungxing
|
97be1da833
|
fix:日常维护计划、任务补充周期值
|
7 months ago |
|
haungxing
|
93e1b7e4bf
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
haungxing
|
ab58c53430
|
fix:设备维护库、日常维护计划、任务补充设备名称
|
7 months ago |
|
liwen
|
433b56e0c6
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
7 months ago |
|
liwen
|
8501ac307c
|
update: 卫生自查计划模板添加单位信息
|
7 months ago |
|
yang_shj
|
cf003e1db0
|
#开关机告警修改
|
7 months ago |
|
haungxing
|
0dfb95cbdb
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
haungxing
|
082cb8daa1
|
fix:日常维护添加站点编号、名称、设备名称字段
fix:视频监控方案初始化脚本修改，json增加长度
|
7 months ago |
|
liwen
|
b7abbf8ce3
|
update: 更改演练、会议计划时间精确到时
|
7 months ago |
|
liwen
|
5ac79a6af2
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
liwen
|
9ffcbe15ca
|
fix: 修复演练记录表、培训记录表导出内容无法换行的问题
|
7 months ago |
|
liwen
|
0113c5767f
|
fix: 修复导出时会议记录的内容无法换行的问题
|
7 months ago |
|
ty
|
d166bcb1bd
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
ty
|
a86b43f606
|
增加：执行人姓名
|
7 months ago |
|
yang_shj
|
4798f61fed
|
#水电站填报发电量统计
|
7 months ago |
|
ty
|
fc93aeb313
|
增加：告警统计列表告警时间排序
|
7 months ago |
|
ty
|
68b63bf5ab
|
增加：fdp日志
|
7 months ago |
|
yang_shj
|
faf83717a7
|
#设备参数支持double
|
7 months ago |
|
ty
|
7bd0df680d
|
fix：近三年发电量日志打印
|
7 months ago |
|
yang_shj
|
193b39d3cb
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
eef3fe503c
|
#两票月度统计导出
|
7 months ago |
|
liwen
|
feaae22702
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
|
7 months ago |
|
liwen
|
a49c0e96a5
|
fix: 删除特种设备同步删除关联的检验记录
|
7 months ago |
|
haungxing
|
87d7bedad3
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
haungxing
|
4426c3b67a
|
# 消息获取未读消息接口取消日志注解
|
7 months ago |
|
yang_shj
|
615c5bb851
|
#两票月度统计导出
|
7 months ago |
|
yang_shj
|
4e8865744b
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
d652d8f116
|
#告警默认配置
|
7 months ago |
|
liwen
|
c4bf76d6fa
|
update: 站点近3年发电量接口修改
|
7 months ago |
|
liwen
|
8591f43bb7
|
Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
Conflicts:
hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
|
7 months ago |
|
yang_shj
|
df660998e6
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
616221f964
|
#开停机告警
|
7 months ago |
