 liwen
|
1ea32e03ad
|
Merge branch 'prod-20240506' of http://175.6.40.68:8081/Jone/hzims-back into prod-20240506
|
6 months 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
|
6 months ago |
|
liwen
|
89ec1c4bf6
|
update: 智能问答增加调用知识库问答接口
|
6 months ago |
 haungxing
|
5ad63934be
|
add:遥控函数添加
|
6 months ago |
 ty
|
6321bf1b52
|
修正:微信公众号消息推送逻辑
|
6 months ago |
|
liwen
|
849ab8fd06
|
update: 培训、演练的月度统计添加点击查看相关数据功能
|
6 months ago |
|
liwen
|
722e178b65
|
update: 考试记录添加及格分设置
|
6 months ago |
|
ty
|
c922eb5fe3
|
修正:交接班值班日志bug
|
6 months ago |
|
haungxing
|
135006efea
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
haungxing
|
af7529a008
|
fix:工作票附表预览补充危险源
|
6 months 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
|
6 months ago |
|
yang_shj
|
0f8340d052
|
#实时数据模拟&生态流量接入
|
6 months ago |
 RnhaiWang
|
da5516f038
|
数据看板加单位
|
6 months ago |
|
ty
|
b7067df156
|
修正：代码逻辑问题
|
6 months ago |
 Jone
|
d11ee8c62c
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
Jone
|
5fb2f2f43a
|
修复package包不对
|
6 months ago |
|
ty
|
886222d454
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
ty
|
bb303d1502
|
修正：库存判断bug
|
6 months ago |
|
haungxing
|
bdb19c110e
|
fix:选择故障函数添加
|
6 months ago |
|
liwen
|
ac7fec2f99
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
liwen
|
1b8a2cd45d
|
update: 导出功能代码调整
|
6 months ago |
|
haungxing
|
75384cd950
|
fix:实时画面画面类型返回前端
|
6 months ago |
|
haungxing
|
4f85176c37
|
fix:open_scada修改为open_canvas
|
6 months ago |
|
haungxing
|
0ad8791311
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
haungxing
|
27e18383a6
|
fix:open_scada修改为open_canvas
|
6 months ago |
|
yang_shj
|
c544eec9d0
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
6d986e1313
|
#发电量计算最后值减最初值方式
|
6 months ago |
|
ty
|
46d8078a09
|
修正：统计月报发电量格式
|
6 months ago |
|
ty
|
3164b11de2
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
ty
|
cc8e609a59
|
修改：导出工具类优化
|
6 months ago |
|
yang_shj
|
8c12033877
|
#发电量计算最后值减最初值方式
|
6 months ago |
|
yang_shj
|
2a4b94eea9
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
196eb317e5
|
#发电量计算最后值减最初值方式
|
6 months ago |
|
ty
|
039229668a
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
ty
|
85c7f783d4
|
修正：月报统计修改
|
6 months ago |
|
yang_shj
|
f57b56e994
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
6 months ago |
|
yang_shj
|
29a3490f0c
|
#集中监控设备状态&上上限，下下限超限状态设置
|
6 months ago |
|
liwen
|
b375a0a86c
|
fix: 超链接url添加格式化编码
|
6 months ago |
|
liwen
|
c56363f902
|
fix: 解决导出文件的超链接有多个时报错的问题
|
6 months ago |
|
RnhaiWang
|
99a4ad830e
|
修正机器人告警信息错误信息提示
|
6 months ago |
|
haungxing
|
995b318b1f
|
fix:实时画面label添加站名
|
6 months ago |
|
ty
|
e260edb960
|
修正：月报统计修改
|
7 months ago |
|
ty
|
55458441b6
|
修正：月报统计修改
|
7 months ago |
|
ty
|
1f880d68e9
|
修正：统计月报发电量单位转换为万
(cherry picked from commit 7ab75635d2)
|
7 months ago |
|
yang_shj
|
d1e394d95c
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
yang_shj
|
71d1e85dc2
|
#用户菜单鉴权修改
|
7 months ago |
|
haungxing
|
f7b8cfd53d
|
fix:实时画面label添加站名
|
7 months ago |
|
haungxing
|
e7df146953
|
add:视频立即跳转字段赋值为true
|
7 months ago |
|
haungxing
|
8ea15ba11f
|
add:choose_video/choose_canvas函数添加
|
7 months ago |
|
haungxing
|
232cd3523a
|
fix:返回前端响应对象extras添加funcCode
|
7 months ago |
