Commit Graph

445 Commits

Author SHA1 Message Date
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
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
zhaohy
2f1a54a114 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-19 11:37:16 +08:00
zhaohy
f636f426b0 fix:简化ns-step组件 设备告警样式 设备告警 能源告警 添加字段 2024-07-19 11:37:14 +08:00
xuziqiang
df0f1f62ad fix: 补充切换组织刷新页面 2024-07-18 17:43:02 +08:00
xuziqiang
6be90a8d0c fix: 台账字段调整 2024-07-18 17:15:20 +08:00
xuziqiang
75a9b87513 fix: 用户管理多个角色调整 2024-07-18 16:04:44 +08:00
xuziqiang
0fa9abf014 fix: 部门角色新增补充部门id 2024-07-18 15:43:39 +08:00
xuziqiang
2576503808 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-18 15:40:33 +08:00
xuziqiang
7274efd5c2 fix: 部门角色逻辑调整 2024-07-18 15:40:32 +08:00
chenpingsen
429909a712 add:照明系统交互 2024-07-18 15:29:22 +08:00
zhaohy
a6f77afe70 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-18 15:17:35 +08:00
zhaohy
4955c235cc fix:修改多次点击数据丢失问题 2024-07-18 15:17:32 +08:00
fks-xuxinyue
86db377d29 taskid:099 remark:"commit" 2024-07-18 15:14:25 +08:00
xuziqiang
db70343b18 fix: 去除页面缓存 2024-07-18 14:56:26 +08:00
xuziqiang
7f839b7a31 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-18 14:54:31 +08:00
xuziqiang
13d6db895f fix: box-shadow补充 2024-07-18 14:54:30 +08:00
zhaohy
4e17163c67 fix:删除多余配置 2024-07-18 13:57:12 +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
xuziqiang
7745f55803 fix: 修改部门交互穿插逻辑导致提交异常 2024-07-17 16:54:15 +08:00