Commit Graph

114 Commits

Author SHA1 Message Date
fks-xuxinyue
dd7c417f81 碳排管理 代码规范 2024-07-25 14:18:37 +08:00
chenpingsen
ab29f9152d add:照明系统 提交数据功能 2024-07-25 11:54:47 +08:00
fks-xuxinyue
2d96bbda3b taskid:099 remark:'commit' 2024-07-24 15:17:34 +08:00
zhaohy
7869b083c3 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-24 15:13:56 +08:00
zhaohy
9637a6f13b fix:修改设备告警 能源告警字段 对接 能碳告警 2024-07-24 15:13:50 +08:00
fks-xuxinyue
ee99ba7340 taskid:099 remark:'commit' 2024-07-23 15:15:05 +08:00
fks-yangshouda
79c56bb979 1.对接能耗监测接口
2.对接设备监测接口
3.修改设备监测表格序号列显示错误的bug
2024-07-23 14:42:17 +08:00
zhaohy
7b77c3cc88 add:设备告警网关告警对接 接口 2024-07-23 14:28:49 +08:00
zhaohy
5c5acf6942 add:设备告警修改流程对接 2024-07-23 08:35:51 +08:00
zhaohy
c390535202 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-22 15:25:49 +08:00
zhaohy
f4d01d65d0 fix:修改设备告警 配置字段 2024-07-22 15:25:47 +08:00
chenpingsen
842c1e94e0 add:照明系统 增加接口 / 枚举 / 逻辑补充 2024-07-22 15:25:07 +08:00
fks-yangshouda
0fba8917f2 新增字典前台页面 2024-07-22 10:56:30 +08:00
zhaohy
088590beea Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-22 10:34:43 +08:00
zhaohy
4c2989239d fix:设备告警 网关告警 2024-07-22 10:34:40 +08:00
chenpingsen
2d1d3a41a8 add:照明系统 抽屉功能tab2分页功能完善 2024-07-22 09:18:46 +08:00
zhaohy
57d97eb3e2 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-19 16:22:17 +08:00
zhaohy
c9e283c3c8 fix:修改接口层级 2024-07-19 16:22:15 +08:00
fks-xuxinyue
9bd82ebbee taskid:099 remark:"commit" 2024-07-19 15:13:46 +08:00
chenpingsen
429909a712 add:照明系统交互 2024-07-18 15:29:22 +08:00
zhaohy
c1aa2483ed Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-18 13:50:11 +08:00
zhaohy
652a94a466 fix:对接通知管理接口 进行联调测试 2024-07-18 13:50:09 +08:00
fks-xuxinyue
97667fc496 taskId:099 remark:"commit" 2024-07-18 11:29:52 +08:00
fks-xuxinyue
85cd183493 taskid:088 remark:"commit" 2024-07-17 15:54:10 +08:00
fks-yangshouda
ddf0514182 1.设备监测 接口对接
2.环境监测 平均数据 前台页面开发
2024-07-17 15:06:11 +08:00
fks-xuxinyue
5eba9a35a0 taskid:084 remark:'commit' 2024-07-16 15:36:47 +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
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
32d1a633b1 feat: 查询补充 2024-07-15 15:53:54 +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
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
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
xuziqiang
6137aaa4b6 fix: 修改同项目登录信息污染 2024-07-11 15:53:41 +08:00
fks-xuxinyue
5ed7449392 taskId:083 remark:"commit" 2024-07-11 09:17:20 +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
717b2aad72 feat: 分组管理设备树 2024-07-09 18:04:09 +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
zhaohy
50ca1daca4 add:对接设备告警 对接设备告警 设备类型 设备名称 设备点位 2024-07-09 15:56:18 +08:00
xuziqiang
ab17c4a1f9 fix: 获取字典数据方法 2024-07-08 17:44:07 +08:00
fks-xuxinyue
0855659d74 taskId:067 remark:"commit" 2024-07-08 11:45:01 +08:00
28723
64cfd47d50 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-08 10:05:22 +08:00