Commit Graph

1714 Commits

Author SHA1 Message Date
高云鹏
9dc5abf77a Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-31 09:51:28 +08:00
高云鹏
ad0c845e1b 日志级别配置:调整显示逻辑
单风机:风频图去除空值
2024-12-31 09:51:18 +08:00
zhouhuang
d4588264fc Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 21:11:55 +08:00
zhouhuang
ebd08846a9 update 2024-12-30 21:11:40 +08:00
高云鹏
617693a721 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 18:03:00 +08:00
高云鹏
dd20b7ec17 单风机:风频图计算调整
设备:添加上传图片格式限制
2024-12-30 18:02:53 +08:00
zhouhuang
6463ea09b3 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 17:20:44 +08:00
zhouhuang
3990dd9e01 update ads 2024-12-30 17:20:28 +08:00
高云鹏
69a84697de Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 15:48:40 +08:00
高云鹏
0070e94bfa 实时数据:实时曲线取消保存暂停,修改显示逻辑
日志级别配置:新增页面
2024-12-30 15:48:25 +08:00
huguanghan
11ab686c9a 日志动态修改删除 2024-12-30 15:06:04 +08:00
huguanghan
be21e0c5d7 日志动态修改删除 2024-12-30 14:04:38 +08:00
houwei
d3abc980de Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 13:33:00 +08:00
houwei
8fa6ae7816 Update 风电场数据采集系统使用手册v1.1.docx 2024-12-30 13:32:48 +08:00
zhouhuang
1dd47ef259 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 12:44:55 +08:00
zhouhuang
4630e0f642 update 2024-12-30 12:44:42 +08:00
houwei
164a3b3b66 更新测试报告和测试用例 2024-12-30 12:02:07 +08:00
fengrong
ae3ed96916 总览图修改 2024-12-30 11:16:28 +08:00
谷成伟
d3d7937947 链路心跳新增modbus和ftp状态 2024-12-30 11:08:51 +08:00
谷成伟
39f4d50fca 更新文档 2024-12-30 10:58:53 +08:00
zhouhuang
f1bf409981 update 2024-12-30 10:54:46 +08:00
谷成伟
6bdc564427 链路心跳新增modbus和ftp状态 2024-12-30 10:48:59 +08:00
谷成伟
c0cadc9c79 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 10:21:22 +08:00
谷成伟
a48a4efdd8 更新心跳报文 2024-12-30 10:19:33 +08:00
huguanghan
f08e029434 日志动态修改删除 2024-12-30 09:47:41 +08:00
huguanghan
2bb243383b 日志动态修改删除 2024-12-30 09:45:58 +08:00
geting
fb827fc0b9 bugfixed 2024-12-30 09:12:19 +08:00
zhouhuang
0da36b9b8b update 2024-12-30 08:50:29 +08:00
zhouhuang
acc08c1b93 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-30 08:42:15 +08:00
zhouhuang
e7f49fcf18 update 2024-12-30 08:42:03 +08:00
huguanghan
19bac9e899 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-27 17:01:45 +08:00
huguanghan
f8279e4b52 日志动态修改 2024-12-27 17:01:33 +08:00
fengrong
648f42a11d 首页根据枚举获取所属项目工程 2024-12-27 16:56:26 +08:00
fengrong
fb4fee62f5 首页修改单位 2024-12-27 16:20:00 +08:00
高云鹏
cfb432280a Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-27 16:11:38 +08:00
高云鹏
d3df394115 设备台账:添加文件删除,添加基础字段所属工程,列表从枚举值获取,调整显示结构 2024-12-27 16:11:30 +08:00
fengrong
63fe025379 首页修改单位 2024-12-27 16:04:54 +08:00
yu
7d51b0fc7a 枚举类型配置-删除枚举值修改 2024-12-27 15:44:58 +08:00
huguanghan
5b84583b83 上传文件返回修改 2024-12-27 15:38:19 +08:00
高云鹏
84151f6f01 设备台账:上传路径修改,文件上传修改为原生方式
上传组件:新增上传文件公共组件
2024-12-27 14:14:34 +08:00
高云鹏
4eba6e48d1 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-27 13:42:22 +08:00
高云鹏
8d89100d8d 实时数据:添加控制权限 2024-12-27 13:42:09 +08:00
zhouhuang
c6aaaa4193 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-27 13:31:27 +08:00
zhouhuang
8a36b7cf9b update 2024-12-27 13:30:46 +08:00
谷成伟
0313c0cd3c 调整日志级别 2024-12-27 12:53:21 +08:00
谷成伟
17ad146458 Merge remote-tracking branch 'origin/main' 2024-12-27 11:16:38 +08:00
谷成伟
e0f7f3cc43 切换日志到log4j2 2024-12-27 11:11:28 +08:00
huguanghan
90a2f12288 上传文件返回修改 2024-12-27 11:09:31 +08:00
zhouhuang
e2440a72b2 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-26 19:59:47 +08:00
zhouhuang
31371b8633 test 2024-12-26 19:59:34 +08:00