Commit Graph

1347 Commits

Author SHA1 Message Date
谷成伟
b42d204623 Merge remote-tracking branch 'origin/main' 2024-12-05 14:31:54 +08:00
谷成伟
e0542740f9 根据心跳更新风机通讯状态 2024-12-05 14:31:45 +08:00
zhouhuang
287b6ed3e4 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 14:03:26 +08:00
zhouhuang
5261921899 add deviceId state 2024-12-05 14:03:07 +08:00
谷成伟
68c15b469a 根据心跳更新风机通讯状态 2024-12-05 14:01:54 +08:00
谷成伟
ab64bf4ee3 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 13:34:03 +08:00
谷成伟
1345be0701 修改心跳报文 2024-12-05 13:33:59 +08:00
高云鹏
c711abde32 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 13:29:11 +08:00
高云鹏
9250fdb2a4 设备:修改型号参数显示 2024-12-05 13:29:03 +08:00
zhouhuang
5ca3eb7c6f Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 13:21:08 +08:00
zhouhuang
536c87526f update 2024-12-05 13:20:55 +08:00
geting
c603b40b49 统计分析 2024-12-05 12:26:23 +08:00
高云鹏
c9430948da Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 12:03:00 +08:00
高云鹏
2542150c4f 节点链路:分页bug修复 2024-12-05 12:02:50 +08:00
谷成伟
144a66f47a 修复设备缓存BUG 2024-12-05 11:50:17 +08:00
zhouhuang
b9cf44d179 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 11:29:07 +08:00
zhouhuang
3d72b2af4a stand 2024-12-05 11:28:59 +08:00
高云鹏
37e586a976 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 11:21:17 +08:00
高云鹏
5badbfe212 量测:ads添加参数
单风机:修改风速对应字段
2024-12-05 11:21:09 +08:00
zhouhuang
1c0051e4da update 2024-12-05 11:09:23 +08:00
zhouhuang
3c2c1e854f update 2024-12-05 11:06:24 +08:00
zhouhuang
49a2553d79 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 11:05:05 +08:00
zhouhuang
8ed3a24452 update 2024-12-05 11:04:47 +08:00
fengrong
7b4e361e6e 首页 2024-12-05 10:31:10 +08:00
fengrong
cb09ec03b7 首页 2024-12-05 10:30:37 +08:00
fengrong
792753971f 首页 2024-12-05 10:26:40 +08:00
谷成伟
027b4b65ac Merge remote-tracking branch 'origin/main' 2024-12-05 09:34:45 +08:00
谷成伟
cccf3b902e 添加异常信息 2024-12-05 09:34:31 +08:00
高云鹏
e364693226 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-05 08:44:55 +08:00
高云鹏
54fcbcbd3a 链路:ads协议提示信息修改 2024-12-05 08:44:32 +08:00
zhouhuang
b972ce9cef update 2024-12-04 19:53:53 +08:00
zhouhuang
0eb8e18721 update 2024-12-04 16:10:16 +08:00
zhouhuang
299c58c769 update 2024-12-04 16:02:58 +08:00
zhouhuang
977a0a6499 update 2024-12-04 14:17:28 +08:00
zhouhuang
dea85ad344 update 2024-12-04 13:53:46 +08:00
zhouhuang
2456332dce Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-04 13:48:41 +08:00
zhouhuang
6091e2cf2f update 2024-12-04 13:48:25 +08:00
geting
2b87705fdd 文档更新 2024-12-04 10:36:53 +08:00
高云鹏
0d12fb30e6 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-04 09:39:33 +08:00
高云鹏
079dd206ed 量测表:ads添加参数 2024-12-04 09:39:20 +08:00
houwei
25301a1bb4 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-04 09:29:14 +08:00
houwei
25171fdf17 更新文档 2024-12-04 09:24:53 +08:00
zhouhuang
d6d031172b update 2024-12-04 08:48:18 +08:00
zhouhuang
e3b12266cd Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-03 20:28:31 +08:00
zhouhuang
a65b3a8299 调整CMakeFiles的预定义 2024-12-03 20:27:52 +08:00
huguanghan
e95300d169 根据设备id获取温度限制设置 name和code修改 2024-12-03 16:22:02 +08:00
huguanghan
1fae1e0fbe 查询物模型属性sql修改 2024-12-03 16:14:39 +08:00
高云鹏
daea8f3196 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-03 16:11:49 +08:00
高云鹏
8ba368f194 节点:保存调整
单风机:实时预览故障代码枚举替换
2024-12-03 16:11:27 +08:00
huguanghan
2dc5b8404f 映射表bug排查 2024-12-03 16:01:16 +08:00