xuziqiang
|
86e0b30e81
|
fix: 分组逻辑调整
|
2024-07-15 16:25:55 +08:00 |
|
zhaohy
|
0214356cbb
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-15 16:00:15 +08:00 |
|
zhaohy
|
098b4f29fd
|
fix:配置设备告警 联系方式
|
2024-07-15 16:00:08 +08:00 |
|
chenpingsen
|
3598e3d887
|
add:增加照明系统前端交互
|
2024-07-15 15:56:31 +08:00 |
|
fks-xuxinyue
|
4869fd4d16
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-15 15:54:21 +08:00 |
|
fks-xuxinyue
|
b41caf9320
|
taskid:084 remark:'commit'
|
2024-07-15 15:54:07 +08:00 |
|
xuziqiang
|
8603732377
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-15 15:53:55 +08:00 |
|
xuziqiang
|
32d1a633b1
|
feat: 查询补充
|
2024-07-15 15:53:54 +08:00 |
|
fks-yangshouda
|
5deff41679
|
1.能耗监测 - 分析 下载图表
2.环境监测 - 综合数据 前台页面
|
2024-07-15 15:38:28 +08:00 |
|
xuziqiang
|
0681836c02
|
fix: 设备台账调整搜索
|
2024-07-15 10:22:51 +08:00 |
|
xuziqiang
|
4526da936e
|
fix: 代码逻辑调整
|
2024-07-12 17:39:31 +08:00 |
|
xuziqiang
|
c31b5468c7
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-12 17:17:33 +08:00 |
|
xuziqiang
|
e0206a228b
|
feat: 分组管理批量分组，公式编辑
|
2024-07-12 17:17:32 +08:00 |
|
fks-xuxinyue
|
47614e12ed
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-12 17:06:35 +08:00 |
|
fks-xuxinyue
|
d8cc8293bc
|
taskid:083 remark:'commit'
|
2024-07-12 17:06:23 +08:00 |
|
fks-yangshouda
|
141f2a3e6f
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-12 17:05:57 +08:00 |
|
fks-yangshouda
|
4fcdae08de
|
能耗监测 分析 右侧图
|
2024-07-12 17:05:41 +08:00 |
|
zhaohy
|
93d5959334
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-12 17:04:56 +08:00 |
|
zhaohy
|
042fc8f16f
|
fix:能源告警配置
|
2024-07-12 17:04:51 +08:00 |
|
fks-xuxinyue
|
0282d2d1aa
|
taskId:083 remark:'commit'
|
2024-07-12 16:59:33 +08:00 |
|
chenpingsen
|
97c3945848
|
add:增加两个用于获取枚举的公共方法
|
2024-07-11 17:35:02 +08:00 |
|
fks-yangshouda
|
37b877b220
|
1. 监控中心 - 能耗监测 - 分析 表格 前端页面
2. 监控中心 - 能耗监测 - 分析 图表 前台页面
|
2024-07-11 17:29:23 +08:00 |
|
zhaohy
|
4dea1ff14d
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-11 16:45:44 +08:00 |
|
zhaohy
|
de7a0ab88a
|
add:配置设备告警对接接口 对接告警配置 里面的数据来源 设备节点
|
2024-07-11 16:45:42 +08:00 |
|
fks-xuxinyue
|
533f0cc633
|
taskid:083 remark:commit
|
2024-07-11 16:23:42 +08:00 |
|
chenpingsen
|
0cac402bd1
|
fix:照明系统修改
|
2024-07-11 16:20:15 +08:00 |
|
xuziqiang
|
6137aaa4b6
|
fix: 修改同项目登录信息污染
|
2024-07-11 15:53:41 +08:00 |
|
xuziqiang
|
4d49ef4e42
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-11 11:55:53 +08:00 |
|
xuziqiang
|
131913e52d
|
fix: 调整验证码校验
|
2024-07-11 11:55:52 +08:00 |
|
fks-xuxinyue
|
5ed7449392
|
taskId:083 remark:"commit"
|
2024-07-11 09:17:20 +08:00 |
|
fks-yangshouda
|
a698c69b7c
|
设备中心 - 能耗监测 - 图表 左侧树和右侧组件联动
|
2024-07-11 08:45:20 +08:00 |
|
xuziqiang
|
5fde3175f1
|
fix: tree组件显示异常
|
2024-07-10 15:17:14 +08:00 |
|
xuziqiang
|
149f44a8dd
|
feat: 调整树样式
|
2024-07-10 14:51:42 +08:00 |
|
fks-xuxinyue
|
060ac6d486
|
taskid:067 remark:commit
|
2024-07-10 11:01:46 +08:00 |
|
xuziqiang
|
7b624f6549
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-09 18:04:10 +08:00 |
|
xuziqiang
|
717b2aad72
|
feat: 分组管理设备树
|
2024-07-09 18:04:09 +08:00 |
|
fks-yangshouda
|
f98a8be0b9
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-09 17:35:59 +08:00 |
|
fks-yangshouda
|
de2202e360
|
1.监控中心 - 设备监测 对接接口
|
2024-07-09 17:35:45 +08:00 |
|
xuziqiang
|
6b93422b08
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-09 16:27:22 +08:00 |
|
xuziqiang
|
30286253e7
|
feat: 分组管理
|
2024-07-09 16:27:21 +08:00 |
|
fks-yangshouda
|
a0d928feaa
|
1.监控中心 - 设备监测 左侧树与右侧组件联动
2.对接设备类型接口
|
2024-07-09 16:08:31 +08:00 |
|
zhaohy
|
50ca1daca4
|
add:对接设备告警 对接设备告警 设备类型 设备名称 设备点位
|
2024-07-09 15:56:18 +08:00 |
|
fks-yangshouda
|
fb1980d73a
|
1.设备监控 图表下载 时间选择改为三天
2.能耗监控 - 图表前台页面
|
2024-07-09 10:10:17 +08:00 |
|
xuziqiang
|
ab17c4a1f9
|
fix: 获取字典数据方法
|
2024-07-08 17:44:07 +08:00 |
|
xuziqiang
|
aab4c9a600
|
fix: 高度调整
|
2024-07-08 17:32:10 +08:00 |
|
fks-xuxinyue
|
0855659d74
|
taskId:067 remark:"commit"
|
2024-07-08 11:45:01 +08:00 |
|
zhaohy
|
3abdde797b
|
fix: 还原工作组件 修改告警设置页面
|
2024-07-08 11:24:24 +08:00 |
|
zhaohy
|
d004a06ec1
|
fix:修改样式
|
2024-07-08 10:53:27 +08:00 |
|
fks-yangshouda
|
76248c0f70
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-08 10:42:46 +08:00 |
|
fks-yangshouda
|
6e294e13eb
|
注释环境监测路由
|
2024-07-08 10:42:35 +08:00 |
|