Commit Graph

182 Commits

Author SHA1 Message Date
3c1fc98c5e 报警规则、网关设备管理和点检方案管理菜单样式功能修改 2024-11-05 14:40:58 +08:00
d94c410bb2 Merge branch 'master' into zjw 2024-11-05 08:56:05 +08:00
d15694aa0c 点检工单校验修改 2024-11-04 09:27:22 +08:00
9acabd1f46 Merge remote-tracking branch 'origin/zjw' into zjw 2024-11-04 09:04:43 +08:00
1802270b2f 维修图标更新 2024-11-04 09:04:22 +08:00
05e0581b64 Merge branch 'master' into zjw 2024-11-01 16:24:56 +08:00
283ff98aa0 增加点检和维修图标 2024-11-01 16:24:18 +08:00
e0a1daff45 维修工单中心不显示已完成的数据,维修工单记录只显示已完成的数据 2024-11-01 15:35:54 +08:00
d72434b0dc Merge remote-tracking branch 'origin/master' 2024-11-01 15:20:27 +08:00
f08584b03f 点检工单记录 2024-11-01 15:20:17 +08:00
16e282a20a 设备信息分页查询查询顺序和轴承状态展示 2024-11-01 14:43:16 +08:00
738d691042 Merge branch 'zjw' 2024-11-01 14:32:48 +08:00
7ad896ca24 设备信息分页查询查询顺序和轴承状态展示 2024-11-01 14:30:41 +08:00
a0ed1aa66a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/inspection/InspectionInfoServiceImpl.java
2024-11-01 13:45:32 +08:00
cf80753f73 点检方案反馈 2024-11-01 13:42:42 +08:00
05d1931c2f 新增点检工单消息推送;增加报警规则表单通过选择设备和参数来赋值;增加报警规则绑定参数表名;增加趋势报警定时任务通过获取配置的参数名和表名来查询报警参数的每日差值 2024-10-31 17:52:21 +08:00
1edca208be 维修工单消息跳转功能 2024-10-31 14:03:09 +08:00
7a44b8351f 维修工单消息跳转功能 2024-10-31 14:02:47 +08:00
5abebfbc30 Merge branch 'zjw' 2024-10-30 17:43:07 +08:00
6677b3b0b8 维修工单新增时推送用户消息功能;维修工单新增时表单功能优化修改:设备树反馈更新 2024-10-30 17:42:12 +08:00
89d3b3e516 Merge branch 'zjw' 2024-10-29 17:51:56 +08:00
55c8a8edcb 测试 2024-10-29 17:51:34 +08:00
32e610dbfa 跳转功能 2024-10-29 17:04:29 +08:00
af5f25e206 OkrTree新增isClickInput字段,控制是否子节点能够填写结果 2024-10-29 14:12:32 +08:00
29d38aeeff 点检工单管理,不显示已完成的内容 2024-10-29 10:32:50 +08:00
e8511f865a Merge remote-tracking branch 'origin/zjw' into zjw 2024-10-29 10:25:03 +08:00
797a95bda5 OkrTree添加子节点回复和内容传递给调用组件功能 2024-10-29 10:24:32 +08:00
50913478f3 Merge branch 'master' into zjw
# Conflicts:
#	imt-ui/src/views/system/inspectionPlan/inspectionPlanTree.vue
2024-10-29 10:23:20 +08:00
179916494b OkrTree添加子节点回复和内容传递给调用组件功能 2024-10-29 10:21:33 +08:00
4583ef4574 手动关闭报警后,关闭点检工单 2024-10-28 11:09:36 +08:00
cab6f4e839 点检方案修改样式 2024-10-25 18:19:51 +08:00
634600a0d3 Merge branch 'master' into zjw 2024-10-25 15:16:49 +08:00
4a0a4ffe47 点检方案树demo功能更新 2024-10-25 15:13:55 +08:00
1cea7aae79 点检方案树demo功能更新 2024-10-25 15:13:13 +08:00
525a4e7915 点检工单功能模块开发 2024-10-25 10:26:16 +08:00
e005d1c06d 点检方案树菜单功能开发 2024-10-24 11:07:03 +08:00
d2defd6fd0 设备报警和报警数据根据设备进行租户id赋值 2024-10-21 11:03:22 +08:00
cfbec64bab 网关、采集卡和参数租户添加与新增删除刷新功能修改 2024-10-21 10:41:14 +08:00
2a8bff7478 Merge branch 'zjw' 2024-10-18 11:07:47 +08:00
7dd9c5c875 修改influxdb阈值报警填充策略修改 2024-10-18 11:06:59 +08:00
943af49e1c Merge branch 'zjw' 2024-10-18 09:42:27 +08:00
a3837a488e 租户传递 2024-10-17 15:29:39 +08:00
ef8e2b43ce Merge branch 'master' into zjw 2024-10-16 10:28:44 +08:00
41601c0df5 监测数据可定是功能更新 2024-10-16 10:25:58 +08:00
f5271e281d 大屏页跳转 2024-10-15 10:25:55 +08:00
4ef0fd0498 定时任务及接口方法增加@TenantIgnore 2024-10-15 09:05:38 +08:00
804d5bc650 监控数据看板跳转 2024-10-14 17:23:41 +08:00
eb04363076 Merge remote-tracking branch 'origin/master' 2024-10-14 15:30:46 +08:00
658e7ba04a 忽略租户 2024-10-14 15:30:15 +08:00
69857f25e6 大屏设备信息显示报警数 2024-10-14 14:57:57 +08:00