Commit Graph

406 Commits

Author SHA1 Message Date
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
zhaohy
bd4fec4c7e Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-17 15:54:39 +08:00
zhaohy
f10045b64d fix:通知管理 2024-07-17 15:54:35 +08:00
fks-xuxinyue
85cd183493 taskid:088 remark:"commit" 2024-07-17 15:54:10 +08:00
xuziqiang
a83f8d868a fix: table Search 样式调整 2024-07-17 15:39:24 +08:00
xuziqiang
bf4a3fd581 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-17 15:07:24 +08:00
xuziqiang
2a6de583e1 fix: 树样式优化 2024-07-17 15:07:23 +08:00
fks-yangshouda
ddf0514182 1.设备监测 接口对接
2.环境监测 平均数据 前台页面开发
2024-07-17 15:06:11 +08:00
xuziqiang
1be888feba feat: 部门权限补充 2024-07-17 13:48:54 +08:00
zhaohy
5c902d174d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-17 11:14:01 +08:00
zhaohy
c2e69b4d36 fix:添加设备告警 换图标 设备告警详情 状态流程 按钮权限 2024-07-17 11:13:56 +08:00
xuziqiang
b06c9ddc84 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-16 15:50:43 +08:00
xuziqiang
40021ba5d0 fix: bug修改 2024-07-16 15:50:42 +08:00
zhaohy
1401d3611f Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-16 15:42:52 +08:00
zhaohy
d29c724920 fix:联系方式 2024-07-16 15:42:49 +08:00
fks-xuxinyue
5eba9a35a0 taskid:084 remark:'commit' 2024-07-16 15:36:47 +08:00
fks-yangshouda
6278e3ff17 1.监控中心 - 环境监测 环境指数分析添加查询部分
2.修改 监控中心 - 能耗监测左侧树组件
2024-07-16 15:31:05 +08:00
xuziqiang
0b619fe937 fix: 补充相关限制 2024-07-16 15:22:29 +08:00
xuziqiang
48569345aa feat: 修改密码 2024-07-16 14:31:27 +08:00
xuziqiang
1aa294b998 fix: 设备型号取消关联 2024-07-15 17:51:30 +08:00
xuziqiang
ef20fa58de Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-15 17:15:59 +08:00
xuziqiang
dac2e095e1 fix:分组管理逻辑补充 2024-07-15 17:15:59 +08:00
zhaohy
c68dc4deb7 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-15 17:02:45 +08:00
zhaohy
0e9743f598 fix:换成枚举 2024-07-15 17:02:42 +08:00
xuziqiang
2fe6bb6d81 Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-15 16:58:51 +08:00
xuziqiang
58300c60e2 fix:设备台账补充筛选项去重逻辑 2024-07-15 16:58:50 +08:00
zhaohy
3bf19ba70d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-15 16:41:08 +08:00
zhaohy
de0ce4ec2d fix: 添加联系人 2024-07-15 16:41:03 +08:00
zhaohy
8091bc10cc fix:能源告警换枚举 2024-07-15 16:40:03 +08:00
xuziqiang
e90efdb08d Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp 2024-07-15 16:26:06 +08:00
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