Commit Graph

1403 Commits

Author SHA1 Message Date
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
谷成伟
a78597948c 计算量增加求和函数 2024-12-03 09:52:20 +08:00
yu
8cdd730fff Merge remote-tracking branch 'origin/main' 2024-12-02 18:38:58 +08:00
yu
afe2063b70 功率曲线导出优化; 2024-12-02 18:38:37 +08:00
fengrong
09d8ddabdb 风机风速功率系数维护 2024-12-02 18:05:51 +08:00
yu
dd28e98209 风机的风速功率修正系数维护界面修改; 2024-12-02 17:58:35 +08:00
yu
a78bdbd8c3 风机的风速功率修正系数维护界面;
趋势导出优化;
2024-12-02 17:24:26 +08:00
谷成伟
44b7b590cb 计算量增加求和函数 2024-12-02 16:58:40 +08:00
huguanghan
21bae633fe 故障字典相关接口修改 2024-12-02 16:54:22 +08:00
geting
d80b22f87d Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-02 16:46:53 +08:00
geting
4d990026fa 故障码字典 2024-12-02 16:46:21 +08:00
huguanghan
413d9bcf78 故障字典相关接口修改 2024-12-02 16:33:37 +08:00
huguanghan
e39d53609d 故障字典相关接口新增 2024-12-02 16:25:16 +08:00
huguanghan
1073681a63 故障字典相关接口新增 2024-12-02 16:10:45 +08:00
huguanghan
e45166ce38 故障字典相关接口新增 2024-12-02 16:05:14 +08:00
高云鹏
6af3c059c0 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-02 15:57:48 +08:00
高云鹏
1e3c08e1c4 设备:量测显示逻辑修改
测点:添加ads配置
2024-12-02 15:57:35 +08:00
geting
1c02c50481 故障码字典 2024-12-02 15:48:58 +08:00
huguanghan
0bb6eb8a58 故障字典相关接口新增 2024-12-02 15:00:00 +08:00
谷成伟
4629023202 Merge remote-tracking branch 'origin/main' 2024-12-02 13:39:08 +08:00
谷成伟
335ee75bab 计算量增加求和函数 2024-12-02 13:38:56 +08:00
高云鹏
4919824e14 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-02 11:09:17 +08:00
高云鹏
e355c0a44a 设备:量测初始化时间设置 2024-12-02 11:09:08 +08:00
geting
0a3d16b192 统计分析 2024-12-02 10:44:19 +08:00
郁万成
09a71eefd3 两位小数 2024-12-02 10:38:59 +08:00
高云鹏
f2b50e5b80 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-02 10:28:50 +08:00
高云鹏
5f920b286b 计算引擎:初始化样式调整
设备:量测接口失败后加载状态取消
单风机:子系统预览调整
曲线数据接口超时调整
2024-12-02 10:28:25 +08:00