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 |
|
chenpingsen
|
ecf6cd38dd
|
add:电梯系统静态页面
|
2024-07-24 13:47:15 +08:00 |
|
chenpingsen
|
84191fe301
|
add:照明系统修改
|
2024-07-24 13:46:24 +08:00 |
|
fks-xuxinyue
|
7dadb22181
|
修改测试问题
|
2024-07-24 09:12:52 +08:00 |
|
fks-xuxinyue
|
b396c37426
|
修改测试问题
|
2024-07-23 17:11:25 +08:00 |
|
fks-xuxinyue
|
ee99ba7340
|
taskid:099 remark:'commit'
|
2024-07-23 15:15:05 +08:00 |
|
fks-yangshouda
|
c628c10f25
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-23 14:42:36 +08:00 |
|
fks-yangshouda
|
79c56bb979
|
1.对接能耗监测接口
2.对接设备监测接口
3.修改设备监测表格序号列显示错误的bug
|
2024-07-23 14:42:17 +08:00 |
|
xuziqiang
|
9ca6cb83f0
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-23 14:39:56 +08:00 |
|
xuziqiang
|
a2bfe148d3
|
feat: 权限补充
|
2024-07-23 14:39:55 +08:00 |
|
zhaohy
|
9134cf4ac3
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-23 14:28:51 +08:00 |
|
zhaohy
|
7b77c3cc88
|
add:设备告警网关告警对接 接口
|
2024-07-23 14:28:49 +08:00 |
|
xuziqiang
|
5e2f9cc966
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-23 11:01:10 +08:00 |
|
xuziqiang
|
4dcb8f74ca
|
fix: op侧代码补充
|
2024-07-23 11:01:09 +08:00 |
|
zhaohy
|
223ceed5eb
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-23 08:35:53 +08:00 |
|
zhaohy
|
5c5acf6942
|
add:设备告警修改流程对接
|
2024-07-23 08:35:51 +08:00 |
|
xuziqiang
|
975d5fe4f0
|
fix: 部分样式调整
|
2024-07-22 18:11:03 +08:00 |
|
xuziqiang
|
159698ffbe
|
fix: 菜单样式调整
|
2024-07-22 18:02:12 +08:00 |
|
xuziqiang
|
1b0118bb82
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 15:51:50 +08:00 |
|
xuziqiang
|
7c679f7fa5
|
fix: 菜单icon调整
|
2024-07-22 15:51:50 +08:00 |
|
fks-xuxinyue
|
ccec1ee763
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 15:25:57 +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 |
|
fks-xuxinyue
|
16e3213f21
|
tackid:099 remark:'commit'
|
2024-07-22 15:25:41 +08:00 |
|
chenpingsen
|
842c1e94e0
|
add:照明系统 增加接口 / 枚举 / 逻辑补充
|
2024-07-22 15:25:07 +08:00 |
|
zhaohy
|
55f98f9e56
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 14:31:04 +08:00 |
|
zhaohy
|
fc4b038e2e
|
add:添加设备保存时 逻辑判断
|
2024-07-22 14:31:02 +08:00 |
|
xuziqiang
|
5993621c21
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 14:15:40 +08:00 |
|
xuziqiang
|
714e640c2e
|
fix: 调整阴影
|
2024-07-22 14:15:39 +08:00 |
|
zhaohy
|
96b91ad6de
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 11:38:38 +08:00 |
|
zhaohy
|
b82b97ebb1
|
fix:修改设备告警 能源告警 回显 添加之后 刷新通知告警
|
2024-07-22 11:38:36 +08:00 |
|
fks-yangshouda
|
69727fa613
|
修改字典新增编辑规则
|
2024-07-22 11:35:11 +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 |
|
xuziqiang
|
1c8419569e
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-22 10:22:15 +08:00 |
|
xuziqiang
|
822519dbb6
|
fix: 宽度修正
|
2024-07-22 10:22:14 +08:00 |
|
chenpingsen
|
2d1d3a41a8
|
add:照明系统 抽屉功能tab2分页功能完善
|
2024-07-22 09:18:46 +08:00 |
|
xuziqiang
|
2bc56cc1d4
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-19 18:12:46 +08:00 |
|
xuziqiang
|
f82ffa185d
|
fix: 样式调整
|
2024-07-19 18:12:45 +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 |
|
xuziqiang
|
ec94e2b5b4
|
feat：树组件补充是否取消逻辑
|
2024-07-19 16:13:01 +08:00 |
|
xuziqiang
|
c085f51cd1
|
Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
|
2024-07-19 15:38:53 +08:00 |
|
xuziqiang
|
1e4a3d61da
|
fix: 管理员禁用切换组织
|
2024-07-19 15:38:52 +08:00 |
|
fks-xuxinyue
|
9bd82ebbee
|
taskid:099 remark:"commit"
|
2024-07-19 15:13:46 +08:00 |
|
zhaohy
|
ecdcd900d3
|
fix:修改配置设备告警字段
|
2024-07-19 14:13:01 +08:00 |
|