Commit Graph

Select branches

Hide Pull Requests

master

xusd

zjw

Mono Color

• eb562c18ae 修改机床组件弹窗标题 master zjw xusd 2024-11-15 08:49:15 +0800
• ec590f7e9f 机床信息 上传限制1个，查询和列表改为运行状态字段 xusd 2024-11-12 14:48:59 +0800
• e0697e2103 机床型号信息 限制图片只能上传1个 xusd 2024-11-12 14:40:36 +0800
• 1cb17d950a 机床客户信息 手机号校验、租户回显 xusd 2024-11-12 14:38:10 +0800
• 1260d288a2 点检方案树的删除闲置功能 zhangjunwen 2024-11-11 15:59:39 +0800
• 30f9e6aa85 设备详情标题修改 zhangjunwen 2024-11-11 14:25:54 +0800
• c1d3eed342 Merge branch 'master' into zjw zhangjunwen 2024-11-11 09:49:53 +0800
• b388f0cc43 解决点检方案提交点检反馈时回车导致表单刷新的问题 zhangjunwen 2024-11-11 09:49:19 +0800
• daa01891f7 报警与点检工单状态处理 xusd 2024-11-08 17:47:44 +0800
• fe9a5ff89e 大屏样式优化更新 zhangjunwen 2024-11-07 09:35:11 +0800
• f8f4bd3eb5 定制化点检消息推送功能更新 zhangjunwen 2024-11-07 09:24:38 +0800
• af585ecb17 APP菜单权限及租户权限 liuyusheng 2024-11-06 15:18:50 +0800
• a16c5a44f3 Merge remote-tracking branch 'origin/master' liuyusheng 2024-11-06 15:17:14 +0800
• 76b448b203 角色及租户套餐增加APP权限 liuyusheng 2024-11-06 15:16:57 +0800
• d67a1de321 设备报警查询未处理数据 zhangjunwen 2024-11-06 15:04:58 +0800
• b3e2b4cb1c 报警规则和报警处理界面优化 zhangjunwen 2024-11-06 09:01:43 +0800
• b593befb47 解决偶尔出现的跳转后数据不正确的问题 zhangjunwen 2024-11-05 17:03:27 +0800
• 69176e8fa0 设备信息添加设备名称查询参数，设备趋势报警查询条件修改 zhangjunwen 2024-11-05 15:13:16 +0800
• a44dc9d16e 设备信息添加设备名称查询参数，设备趋势报警查询条件修改 zhangjunwen 2024-11-05 15:12:43 +0800
• 3c1fc98c5e 报警规则、网关设备管理和点检方案管理菜单样式功能修改 zhangjunwen 2024-11-05 14:40:58 +0800
• d94c410bb2 Merge branch 'master' into zjw zhangjunwen 2024-11-05 08:56:05 +0800
• d15694aa0c 点检工单校验修改 xusd 2024-11-04 09:27:22 +0800
• 9acabd1f46 Merge remote-tracking branch 'origin/zjw' into zjw zhangjunwen 2024-11-04 09:04:43 +0800
• 1802270b2f 维修图标更新 zhangjunwen 2024-11-01 16:24:56 +0800
• 05e0581b64 Merge branch 'master' into zjw zhangjunwen 2024-11-01 16:24:56 +0800
• 283ff98aa0 增加点检和维修图标 zhangjunwen 2024-11-01 16:24:18 +0800
• e0a1daff45 维修工单中心不显示已完成的数据，维修工单记录只显示已完成的数据 xusd 2024-11-01 15:35:54 +0800
• d72434b0dc Merge remote-tracking branch 'origin/master' xusd 2024-11-01 15:20:27 +0800
• f08584b03f 点检工单记录 xusd 2024-11-01 15:20:17 +0800
• 16e282a20a 设备信息分页查询查询顺序和轴承状态展示 zhangjunwen 2024-11-01 14:43:16 +0800
• 738d691042 Merge branch 'zjw' zhangjunwen 2024-11-01 14:32:48 +0800
• 7ad896ca24 设备信息分页查询查询顺序和轴承状态展示 zhangjunwen 2024-11-01 14:30:41 +0800
• a0ed1aa66a Merge remote-tracking branch 'origin/master' xusd 2024-11-01 13:45:32 +0800
• cf80753f73 点检方案反馈 xusd 2024-11-01 13:42:42 +0800
• 05d1931c2f 新增点检工单消息推送；增加报警规则表单通过选择设备和参数来赋值；增加报警规则绑定参数表名；增加趋势报警定时任务通过获取配置的参数名和表名来查询报警参数的每日差值 zhangjunwen 2024-10-31 17:52:21 +0800
• 1edca208be 维修工单消息跳转功能 zhangjunwen 2024-10-31 14:03:09 +0800
• 7a44b8351f 维修工单消息跳转功能 zhangjunwen 2024-10-31 14:02:47 +0800
• 5abebfbc30 Merge branch 'zjw' zhangjunwen 2024-10-30 17:43:07 +0800
• 6677b3b0b8 维修工单新增时推送用户消息功能；维修工单新增时表单功能优化修改：设备树反馈更新 zhangjunwen 2024-10-30 17:42:12 +0800
• 89d3b3e516 Merge branch 'zjw' zhangjunwen 2024-10-29 17:51:56 +0800
• 55c8a8edcb 测试 zhangjunwen 2024-10-29 17:51:34 +0800
• 32e610dbfa 跳转功能 zhangjunwen 2024-10-29 17:04:29 +0800
• af5f25e206 OkrTree新增isClickInput字段，控制是否子节点能够填写结果 zhangjunwen 2024-10-29 14:12:32 +0800
• 29d38aeeff 点检工单管理，不显示已完成的内容 xusd 2024-10-29 10:32:50 +0800
• e8511f865a Merge remote-tracking branch 'origin/zjw' into zjw zhangjunwen 2024-10-29 10:25:03 +0800
• 797a95bda5 OkrTree添加子节点回复和内容传递给调用组件功能 zhangjunwen 2024-10-29 10:21:33 +0800
• 50913478f3 Merge branch 'master' into zjw zhangjunwen 2024-10-29 10:23:20 +0800
• 179916494b OkrTree添加子节点回复和内容传递给调用组件功能 zhangjunwen 2024-10-29 10:21:33 +0800
• 4583ef4574 手动关闭报警后，关闭点检工单 xusd 2024-10-28 11:09:36 +0800
• cab6f4e839 点检方案修改样式 zhangjunwen 2024-10-25 18:19:51 +0800
• 634600a0d3 Merge branch 'master' into zjw zhangjunwen 2024-10-25 15:16:49 +0800
• 4a0a4ffe47 点检方案树demo功能更新 zhangjunwen 2024-10-25 15:13:55 +0800
• 1cea7aae79 点检方案树demo功能更新 zhangjunwen 2024-10-25 15:13:13 +0800
• 525a4e7915 点检工单功能模块开发 xusd 2024-10-25 10:26:16 +0800
• e005d1c06d 点检方案树菜单功能开发 zhangjunwen 2024-10-24 11:07:03 +0800
• d2defd6fd0 设备报警和报警数据根据设备进行租户id赋值 zhangjunwen 2024-10-21 11:03:22 +0800
• cfbec64bab 网关、采集卡和参数租户添加与新增删除刷新功能修改 zhangjunwen 2024-10-21 10:41:14 +0800
• 2a8bff7478 Merge branch 'zjw' zhangjunwen 2024-10-18 11:07:47 +0800
• 7dd9c5c875 修改influxdb阈值报警填充策略修改 zhangjunwen 2024-10-18 11:06:59 +0800
• 943af49e1c Merge branch 'zjw' zhangjunwen 2024-10-18 09:42:27 +0800
• a3837a488e 租户传递 xusd 2024-10-17 15:29:39 +0800
• ef8e2b43ce Merge branch 'master' into zjw zhangjunwen 2024-10-16 10:28:44 +0800
• 41601c0df5 监测数据可定是功能更新 zhangjunwen 2024-10-16 10:25:58 +0800
• f5271e281d 大屏页跳转 liuyusheng 2024-10-15 10:25:55 +0800
• 4ef0fd0498 定时任务及接口方法增加@TenantIgnore liuyusheng 2024-10-15 09:05:38 +0800
• 804d5bc650 监控数据看板跳转 zhangjunwen 2024-10-14 17:23:41 +0800
• eb04363076 Merge remote-tracking branch 'origin/master' liuyusheng 2024-10-14 15:30:46 +0800
• 658e7ba04a 忽略租户 liuyusheng 2024-10-14 15:30:15 +0800
• 69857f25e6 大屏设备信息显示报警数 xusd 2024-10-14 14:57:57 +0800
• 002417b764 报警页面提交工单后关闭报警 xusd 2024-10-14 14:27:37 +0800
• 87f76067f7 版本修改 liuyusheng 2024-10-14 09:48:48 +0800
• 44b813c9e3 版本修改 liuyusheng 2024-10-14 09:48:11 +0800
• 5d07d0d34b Merge branch 'zjw' zhangjunwen 2024-10-14 08:40:22 +0800
• f19ae26020 解决展示fanuc数据时，新数据比旧数据数据小的问题 zhangjunwen 2024-10-14 08:39:43 +0800
• 9cbcb25e9b 解决网关网卡功能增加和修改后不刷新问题 zhangjunwen 2024-10-12 15:47:42 +0800
• 9222ec24a9 Merge branch 'zjw' zhangjunwen 2024-10-12 15:24:04 +0800
• d33a19bcc1 设备详情数据接口对接与样式更新 zhangjunwen 2024-10-12 14:46:00 +0800
• 05af698650 设备详情数据接口对接与样式更新 zhangjunwen 2024-10-12 14:44:48 +0800
• 2594c3bc6b 设备看板按钮 xusd 2024-10-12 14:30:47 +0800
• 67df00064f 维修工单审批流程对应修改机床运行状态字段 xusd 2024-10-12 09:28:17 +0800
• d3a2de1b4d Merge branch 'zjw' zhangjunwen 2024-10-11 16:35:49 +0800
• f33f54e75d 使用mybatisplus自带拼接类方法代替xml的持久层接口 zhangjunwen 2024-10-11 16:34:40 +0800
• 4b5c931159 维修工单中心添加审批功能 xusd 2024-10-11 14:20:52 +0800
• 75daa51e90 Merge branch 'master' into zjw zhangjunwen 2024-10-10 16:03:52 +0800
• 531f3935a4 设备看板相关接口更新 zhangjunwen 2024-10-10 16:02:37 +0800
• 93d682743d 新增、修改维修工单弹窗标题修改 xusd 2024-10-10 14:02:55 +0800
• c29371e319 监控数据管理添加设备选择项 zhangjunwen 2024-10-10 10:13:45 +0800
• cacf21776c 数据接收功能修改 zhangjunwen 2024-10-09 18:01:26 +0800
• 00193a7252 通知和租户功能修改 zhangjunwen 2024-10-09 15:23:37 +0800
• f6e771085a Merge branch 'master' into zjw zhangjunwen 2024-10-09 15:05:41 +0800
• e3ca77c89b 消息通知功能和指定租户编号不进行租户过滤功能通知 zhangjunwen 2024-10-09 14:55:24 +0800
• cce28a2f1a Merge branch 'refs/heads/xusd' xusd 2024-10-08 15:20:26 +0800
• dbb375a240 维修工单审批页面添加报警详情跳转 xusd 2024-10-08 15:17:08 +0800
• e26a0d1daf 点检方案 xusd 2024-10-08 14:38:21 +0800
• ef6edf9ac1 点检方案 xusd 2024-10-08 14:31:50 +0800
• c8052ffa72 报警处理菜单增加可选报警趋势查询功能 zhangjunwen 2024-09-30 17:09:54 +0800
• 118ad97a8d 增加网关采集卡别名和参数别名 zhangjunwen 2024-09-30 09:02:30 +0800
• 4d805279c9 设备增加设备名以及设备看板更新 zhangjunwen 2024-09-29 17:54:18 +0800
• 981bb9e51e Merge branch 'master' into zjw zhangjunwen 2024-09-29 17:11:03 +0800
• fd5a166fa4 监测数据看板功能更新 zhangjunwen 2024-09-29 17:09:50 +0800