Commit Graph

1769 Commits

Author SHA1 Message Date
谷成伟
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
高云鹏
db98aad612 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-26 18:01:23 +08:00
高云鹏
bf702e66bf 单风机:添加温度跳转提示,添加权限
实时数据:选择测点显示逻辑修改
设备:添加权限,附属属性添加,文件添加
2024-12-26 18:01:09 +08:00
zhouhuang
68ccaa5f1b Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-26 16:54:38 +08:00
zhouhuang
f8bea90f8b update 2024-12-26 16:54:13 +08:00
huguanghan
5786c056d0 update附属修改 2024-12-26 16:45:36 +08:00
huguanghan
a8fd5cc727 update附属修改 2024-12-26 16:30:06 +08:00
huguanghan
1a9102f3a4 接口方式修改 2024-12-26 16:15:08 +08:00
huguanghan
e4cafde25e 接口方式修改 2024-12-26 16:10:53 +08:00
fengrong
2977584b39 总览图 2024-12-26 15:42:50 +08:00
fengrong
0318656dc7 总览图宽度修改 2024-12-26 15:35:15 +08:00
fengrong
ac9991272b 更换图片 2024-12-26 15:16:58 +08:00
zhouhuang
23cd34c798 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-26 14:54:14 +08:00
zhouhuang
18f353cba6 update 2024-12-26 14:54:03 +08:00
geting
ef09005bac bugFixed 2024-12-26 13:55:57 +08:00
zhouhuang
b56230fc42 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-26 10:10:18 +08:00
zhouhuang
d1cf0dcc71 update 2024-12-26 10:10:07 +08:00
zhouhuang
42af041cf4 update 2024-12-26 10:08:40 +08:00
yu
c8cccaba0c Merge remote-tracking branch 'origin/main' 2024-12-26 10:08:33 +08:00
huguanghan
71a6ee5f1a 接口方式修改 2024-12-26 10:08:08 +08:00
yu
846c49bc96 统计查询导出,功率曲线导出修改 2024-12-26 10:08:05 +08:00
huguanghan
72573c30c0 附属属性相关接口修改 2024-12-26 09:24:52 +08:00
fengrong
0d8c35afc1 总览图鼠标移上故障提示显示完整 2024-12-26 09:09:32 +08:00
huguanghan
69a515a008 附属属性相关接口修改 2024-12-25 20:34:49 +08:00
geting
e410e6f496 增加模板 2024-12-25 17:51:08 +08:00
huguanghan
85fde3f2ac 附属属性相关接口修改 2024-12-25 17:08:24 +08:00
fengrong
b45f7d6c4f 总览图 2024-12-25 17:07:46 +08:00
huguanghan
15edf77a8e 附属属性相关接口修改 2024-12-25 16:59:20 +08:00
zhouhuang
8d20d95bde update 2024-12-25 16:00:16 +08:00
zhouhuang
7986432f59 uupdate 2024-12-25 11:00:13 +08:00
zhouhuang
20684270a2 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-25 11:00:02 +08:00
zhouhuang
70600ed9a5 update 2024-12-25 10:59:46 +08:00
谷成伟
16a6ae336e 修复设备缓存BUG 2024-12-25 10:32:23 +08:00
huguanghan
fa5d39677d 附属属性删除文件 2024-12-25 09:37:48 +08:00
谷成伟
472098a2d1 Merge remote-tracking branch 'origin/main' 2024-12-25 09:21:44 +08:00
谷成伟
5e7c8554f4 修复设备缓存BUG 2024-12-25 09:21:32 +08:00
huguanghan
a4fd996149 日期修改 2024-12-24 17:23:50 +08:00
geting
2ede220734 文档更新 2024-12-24 17:16:19 +08:00
huguanghan
a5124e8db4 图片预览接口,查询设备图片接口新增 2024-12-24 16:45:43 +08:00
huguanghan
94e61d7b74 windows时间offset修改 2024-12-24 16:06:58 +08:00
fengrong
9051e38eb8 去掉注释代码 2024-12-24 15:53:40 +08:00
huguanghan
e6f1aed780 设备图片上传 2024-12-24 15:14:13 +08:00
高云鹏
187ce232a8 Merge branch 'main' of https://git.jsspisoft.com/ry-das 2024-12-24 14:57:23 +08:00
高云鹏
60e24b7b93 故障录波:修改日志与录波显示逻辑 2024-12-24 14:57:11 +08:00
谷成伟
06978e9c7f Merge remote-tracking branch 'origin/main' 2024-12-24 14:09:22 +08:00
谷成伟
f9a509b758 修复设备缓存BUG 2024-12-24 14:09:12 +08:00