1646 Commits

Author SHA1 Message Date
25445028f4 初验修改 2024-12-11 19:15:28 +08:00
699b10ade4 初验修改 2024-12-10 15:13:46 +08:00
4aa493791b Merge remote-tracking branch 'origin/angang-deploy' into angang-deploy-new 2024-12-05 09:04:50 +08:00
5fbfc5278b 鞍钢加密密钥更新 2024-11-27 18:14:46 +08:00
8cbe76c6ec 鞍钢加密密码更新 2024-11-15 10:51:29 +08:00
e5cc1b7c0c Merge remote-tracking branch 'origin/angang-deploy' into angang-deploy 2024-11-04 10:03:09 +08:00
a1f68ded9f 鞍钢工作流车辆和材料入场的时间NaN-NaN-NaN NaN:NaN:NaN解决 2024-11-04 09:30:07 +08:00
04d7b19be1 鞍钢工作流另外打日志 2024-11-04 09:28:31 +08:00
f92cbb857c 现场大屏的承包商项目修改bug 2024-10-31 16:43:39 +08:00
715f752d29 大屏的进度排名修改 2024-10-31 11:53:42 +08:00
f86fd19d06 Revert "Revert "Revert "Revert "angang修改 合并""""
This reverts commit 046338e844f96656367c9206a4bbc5e947283f26.
2024-10-22 13:39:36 +08:00
a23db767c1 Merge branch 'angang-deploy' into angang-deploy-new 2024-10-22 13:39:10 +08:00
1e6ee95afc 更新加密jar的code 2024-10-22 13:37:03 +08:00
046338e844 Revert "Revert "Revert "angang修改 合并"""
This reverts commit 4e7bf992
2024-10-22 13:34:08 +08:00
e5e32b9041 鞍钢新功能企业筛选 2024-10-18 15:48:30 +08:00
eb425dd952 bug修复 2024-09-23 18:46:58 +08:00
4e7bf992b0 Revert "Revert "angang修改 合并""
This reverts commit 956b9341
2024-09-20 17:07:08 +08:00
f9ebfe403a wflow打包 2024-09-20 17:02:33 +08:00
9bf6a5652d 鞍钢的配置修改 2024-09-07 16:19:10 +08:00
75bdfdf411 调用海康查询监控点列表v2 2024-09-06 10:38:16 +08:00
13b12f861e 31个分支可以发布成功 2024-09-05 17:51:52 +08:00
bff0d84786 bug修复 2024-09-05 17:44:32 +08:00
956b934144 Revert "angang修改 合并"
This reverts commit ff2f335a
2024-09-05 17:40:44 +08:00
91e3b13e7f 人员定位统计 2024-09-05 17:02:08 +08:00
7969ec5309 增加人员定位统计 2024-09-05 11:36:03 +08:00
fcb45af0ea 增加人员定位统计 2024-09-05 10:45:09 +08:00
0f05f8e7b0 调整 2024-09-04 21:02:11 +08:00
c6f82c55f8 调整 2024-09-03 14:49:28 +08:00
92e1d7edea 调整 2024-09-03 14:48:05 +08:00
d7921ddcbe 调整 2024-09-03 13:35:57 +08:00
f2601c4e8f 调整 2024-09-03 09:48:54 +08:00
24e6d36d2a 调整 2024-09-02 17:22:36 +08:00
6189648127 鞍钢-bug修复 2024-08-28 18:39:24 +08:00
83cd00a69d 劳务在场清零bug修复 2024-08-28 15:20:58 +08:00
ff2f335ae5 angang修改 合并 2024-08-24 14:18:57 +08:00
ba5471f6bc 更新鞍钢的机器码 2024-08-23 11:16:07 +08:00
3684815618 bug修复 2024-08-12 18:43:52 +08:00
c48a0a4b32 bug修复 2024-08-12 14:24:20 +08:00
6117a314d3 通过excel导入题目管理信息bug修复 2024-08-10 15:39:15 +08:00
723f3ffc0b 解决Unknown property used in expression: ${nrOfActivelnstances == 0} 2024-08-10 14:51:04 +08:00
fcc31f2e6e 是否开启用户密码超期重置功能 2024-08-09 16:09:21 +08:00
8775bbda96 保存星纵-应急-推送信息bug修复 2024-08-08 17:25:44 +08:00
b884819165 修改QueryGenerator和jeecg模版 2024-08-08 17:25:11 +08:00
65aaaee65d 安全隐患扣分改成选择一个违章人员扣分 2024-08-08 17:24:58 +08:00
ba00f9419a 多返回点位 2024-08-07 18:18:20 +08:00
ae25863731 巡检bug修复 2024-08-07 17:43:14 +08:00
8850c3c833 应急报警bug修复 2024-08-07 17:42:52 +08:00
cfb99adf0c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-08-07 13:57:28 +08:00
767c7345d7 bug修复 2024-08-07 13:56:41 +08:00
655c39137e Revert "设备加企业名称"
This reverts commit ef8df07ec20f8c6bdb0fcb08351fe8b2455f3251.
2024-08-07 10:53:55 +08:00