Commit Graph

1686 Commits

Author SHA1 Message Date
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
高云鹏
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