Commit Graph

1429 Commits

Author SHA1 Message Date
高云鹏
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
huguanghan
0d4074388b 映射表bug排查 2024-12-03 15:45:40 +08:00
高云鹏
7ef5d8011b 量测表:参数修改 2024-12-03 14:56:52 +08:00
高云鹏
9c9eeb5bc2 去除log 2024-12-03 14:25:13 +08:00
高云鹏
3381bbbd72 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-03 13:52:21 +08:00
高云鹏
77e7e0f050 故障录波:图表显示时间添加毫秒
单风机:添加风机切换按钮,添加风机名称型号,子系统分类显示调整
风机矩阵:跳转单风机,添加风机名称型号
2024-12-03 13:52:11 +08:00
谷成伟
48fdd06ac3 Merge remote-tracking branch 'origin/main' 2024-12-03 13:08:30 +08:00
谷成伟
1a3ea788dd 增加时间处理函数 2024-12-03 13:08:20 +08:00
fengrong
c887671a5a 合并行修改 2024-12-03 11:29:56 +08:00
yu
895b15548f Merge remote-tracking branch 'origin/main' 2024-12-03 11:25:50 +08:00
yu
4135823144 趋势对比导出优化; 2024-12-03 11:24:41 +08:00
fengrong
4badcfcc03 风机风速功率系数维护合并行 2024-12-03 11:03:46 +08:00
zhouhuang
7931f6abc8 update 2024-12-03 10:39:39 +08:00
zhouhuang
11a4f9dd1e Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-03 10:36:36 +08:00
zhouhuang
6cce090c22 update ads 2024-12-03 10:36:06 +08:00
yu
4f6fa46319 Merge remote-tracking branch 'origin/main' 2024-12-03 10:35:43 +08:00
yu
05173d897a 风速功率修正系数接口优化; 2024-12-03 10:35:20 +08:00
谷成伟
e9287b68a7 计算量增加求和函数 2024-12-03 10:33:11 +08:00
谷成伟
71f13ffd7a Merge remote-tracking branch 'origin/main' 2024-12-03 09:52:30 +08:00