Commit Graph

1097 Commits

Author SHA1 Message Date
zhouhuang
b469f8e3ab add sub modbus 2024-11-21 16:09:38 +08:00
zhouhuang
046527c76e Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-21 09:06:49 +08:00
zhouhuang
6491bc3594 update 2024-11-21 09:06:36 +08:00
高云鹏
cd68dde66d Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 17:41:51 +08:00
高云鹏
9b9ba513d0 日志:修改文件预览逻辑
故障:修改文件预览逻辑
链路:修改协议配置
2024-11-20 17:41:47 +08:00
zhouhuang
f7a0d76771 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 17:29:00 +08:00
zhouhuang
8f26466f6e update 2024-11-20 17:28:24 +08:00
huguanghan
f2390dc021 数据上报修改 2024-11-20 17:11:23 +08:00
huguanghan
c100cf5ada 数据上报修改 2024-11-20 16:53:30 +08:00
huguanghan
82d6c7a491 数据上报修改 2024-11-20 16:43:53 +08:00
fengrong
460b158654 实时数据:固定表头 2024-11-20 16:06:32 +08:00
fengrong
eb1b572976 Merge remote-tracking branch 'origin/main' 2024-11-20 15:46:24 +08:00
fengrong
14d5db21d6 首页:布局调整
温度管理:加变量筛选
2024-11-20 15:45:12 +08:00
zhouhuang
3a95e8f50d Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 15:44:12 +08:00
zhouhuang
1089ebb5c6 update 2024-11-20 15:43:54 +08:00
fengrong
8528da0bdd Merge remote-tracking branch 'origin/main' 2024-11-20 15:43:37 +08:00
高云鹏
99bb46b497 链路:excel数据修改 2024-11-20 15:39:23 +08:00
高云鹏
8aaa0588ab Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 14:58:30 +08:00
高云鹏
11b07f6546 日志:图表显示修改
故障:图表显示修改
链路:协议修改
2024-11-20 14:58:21 +08:00
fengrong
2f644a91a0 Merge remote-tracking branch 'origin/main' 2024-11-20 14:50:21 +08:00
yu
08e3c6032b Merge remote-tracking branch 'origin/main' 2024-11-20 14:49:46 +08:00
yu
9fdbcdd49f 温度管理查询接口修改; 2024-11-20 14:49:06 +08:00
fengrong
f79c825062 Merge remote-tracking branch 'origin/main' 2024-11-20 14:38:33 +08:00
谷成伟
863ee51883 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 14:23:25 +08:00
谷成伟
68944226c9 更改jenkins发版 2024-11-20 14:23:20 +08:00
houwei
6ec8e50221 修改协议类型编码 2024-11-20 14:22:05 +08:00
houwei
2c70a228fe Merge remote-tracking branch 'origin/main' 2024-11-20 14:21:06 +08:00
houwei
d8aaeb66c9 修改协议类型编码 2024-11-20 14:20:39 +08:00
fengrong
fc928119e2 Merge remote-tracking branch 'origin/main' 2024-11-20 10:27:00 +08:00
geting
abd23e8f5a Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 10:25:22 +08:00
geting
eaaa574663 风机型号参数配置 2024-11-20 10:24:31 +08:00
huguanghan
205945d5d8 日志变量描述新增unit单位 2024-11-20 09:44:42 +08:00
fengrong
72e7885c34 Merge remote-tracking branch 'origin/main' 2024-11-20 09:29:20 +08:00
高云鹏
4cdf63fa44 日志:图表标签名称显示修改
故障:图表标签名称显示修改
2024-11-20 09:27:05 +08:00
高云鹏
8a64b055e9 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-20 09:00:23 +08:00
高云鹏
eaf8e8f531 风机列表:修改列表滚动显示 2024-11-20 09:00:15 +08:00
fengrong
af992a5670 Merge remote-tracking branch 'origin/main' 2024-11-19 17:29:37 +08:00
geting
02ae80986a 风机型号参数配置 2024-11-19 17:24:35 +08:00
fengrong
1a773b1208 Merge remote-tracking branch 'origin/main' 2024-11-19 16:41:26 +08:00
高云鹏
7fc9bd7079 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-11-19 16:37:18 +08:00
高云鹏
d262e54a1a 物模型:添加告警类型字段
日志管理:修改图表x轴、数据字段转枚举字段
故障录波:修改图表x轴、数据字段转枚举字段
2024-11-19 16:37:06 +08:00
fengrong
34508835da Merge remote-tracking branch 'origin/main' 2024-11-19 16:18:33 +08:00
huguanghan
e4a029429f 物模型属性新增level告警等级 2024-11-19 16:07:58 +08:00
fengrong
0f554de6d0 Merge remote-tracking branch 'origin/main' 2024-11-19 15:54:05 +08:00
huguanghan
9fe3350680 故障录波变量描述,运行日志变量描述维护 2024-11-19 15:33:44 +08:00
huguanghan
c9158dfa49 故障录波变量描述,运行日志变量描述维护 2024-11-19 15:18:12 +08:00
fengrong
62e9a12c20 Merge remote-tracking branch 'origin/main' 2024-11-19 14:56:38 +08:00
houwei
13ed5ac752 修改物模型属性表 2024-11-19 14:42:31 +08:00
fengrong
3722a14529 首页:上个版本备份 2024-11-19 13:49:22 +08:00
fengrong
6e3c9d6f69 首页:布局调整 2024-11-19 13:44:32 +08:00