 liwen
|
d7469a7983
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
liwen
|
652f5ea14f
|
add: 会议管理模块
|
11 months ago |
 ty
|
65414f9564
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
ty
|
8107228ce5
|
月度缺陷统计增加机构筛选项
|
11 months ago |
|
liwen
|
9d9ef76bc9
|
update: 更新演练管理、培训管理逻辑
|
11 months ago |
|
liwen
|
8865ec63b5
|
update: 更新培训管理部分逻辑
|
11 months ago |
|
liwen
|
5d8bbbb678
|
update: 更新培训管理部分逻辑
|
11 months ago |
|
ty
|
d822f73a64
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
ty
|
4aaf352fcf
|
基本模块提交，新增人员证书管理
|
11 months ago |
|
liwen
|
72e783c7bb
|
add: 培训管理模块
|
11 months ago |
 yang_shj
|
5a2d1d7b16
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
739003feab
|
#双票统计
|
11 months ago |
|
liwen
|
fc7eb24fda
|
fix: 修改导出演练记录表的数据内容
|
11 months ago |
|
ty
|
3af30d06f4
|
模板提交
|
11 months ago |
|
yang_shj
|
3e62f4d276
|
#双票统计
|
11 months ago |
|
yang_shj
|
0b6fcf53d9
|
#双票统计
|
11 months ago |
|
yang_shj
|
78aaa3440e
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
693b7885d9
|
#双票统计
|
11 months ago |
 haungxing
|
a002e34bc4
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
haungxing
|
03b42bf416
|
# 两票预览改造
|
11 months ago |
|
yang_shj
|
ab71acd750
|
#双票统计
|
11 months ago |
|
yang_shj
|
4ee4aebac9
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
5b3e6970c6
|
#双票统计
|
11 months ago |
|
ty
|
379c360a38
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
ty
|
63124bf75c
|
消缺表增加对应人员字段
|
11 months ago |
|
yang_shj
|
f25d2795c2
|
#弹框告警
|
11 months ago |
|
yang_shj
|
2e89fcfc98
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
01db412fa1
|
#开关机告警
|
11 months ago |
|
ty
|
6e27b2e1d5
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
ty
|
3733e27475
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IAreaMonthReportService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/OfflineTicketServiceImpl.java
|
11 months ago |
|
yang_shj
|
80ae73770c
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
yang_shj
|
1736f9b491
|
#开关机告警
|
11 months ago |
|
yang_shj
|
e393ae6f33
|
Merge remote-tracking branch 'origin/prod' into prod
|
11 months ago |
|
yang_shj
|
6d9f4697b3
|
#单位属性去重
|
11 months ago |
|
ty
|
76da44caf7
|
交接班接口弃用
|
11 months ago |
|
haungxing
|
23b32bc96b
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
haungxing
|
cad0af0c31
|
# 参数下发剔除掉非参数的属性
# 上次报文时间格式化
|
11 months ago |
|
ty
|
c1c1e6bf0f
|
middle消费日志保存修正
|
12 months ago |
|
yang_shj
|
353f04009e
|
#日志限制
|
12 months ago |
|
liwen
|
b5e2bf7ec8
|
add: 演练模块新增状态更改定时任务&导出功能
|
12 months ago |
|
ty
|
9b3a3c7f63
|
交接班死锁bug提交
|
12 months ago |
|
liwen
|
acc979538f
|
update: 修改新增、修改演练逻辑
|
12 months ago |
|
yang_shj
|
7f43f7af3f
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
dd0896c875
|
#光伏实体类修改
|
12 months ago |
|
liwen
|
911bdf17e0
|
add: 新增演练记录功能
|
12 months ago |
|
ty
|
c5fa431f46
|
视频流配置新增接口
|
12 months ago |
|
yang_shj
|
920654e673
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
yang_shj
|
3261a28de5
|
#集中监控realId实时图列数据接口修改
|
12 months ago |
|
ty
|
61abf20fee
|
修正日常维护筛选bug
|
12 months ago |
|
ty
|
1b0c0ebcc2
|
新增视频流配置表单
|
12 months ago |
