|
|
af5f25e206
|
OkrTree新增isClickInput字段，控制是否子节点能够填写结果
|
2024-10-29 14:12:32 +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 |
|
|
|
002417b764
|
报警页面提交工单后关闭报警
|
2024-10-14 14:27:37 +08:00 |
|
|
|
87f76067f7
|
版本修改
|
2024-10-14 09:48:48 +08:00 |
|
|
|
44b813c9e3
|
版本修改
|
2024-10-14 09:48:11 +08:00 |
|
|
|
5d07d0d34b
|
Merge branch 'zjw'
|
2024-10-14 08:40:22 +08:00 |
|
|
|
f19ae26020
|
解决展示fanuc数据时，新数据比旧数据数据小的问题
|
2024-10-14 08:39:43 +08:00 |
|
|
|
9cbcb25e9b
|
解决网关网卡功能增加和修改后不刷新问题
|
2024-10-12 15:47:42 +08:00 |
|
|
|
9222ec24a9
|
Merge branch 'zjw'
|
2024-10-12 15:24:04 +08:00 |
|
|
|
d33a19bcc1
|
设备详情数据接口对接与样式更新
|
2024-10-12 14:46:00 +08:00 |
|
|
|
05af698650
|
设备详情数据接口对接与样式更新
|
2024-10-12 14:44:48 +08:00 |
|
|
|
2594c3bc6b
|
设备看板按钮
|
2024-10-12 14:30:47 +08:00 |
|
|
|
67df00064f
|
维修工单审批流程对应修改机床运行状态字段
|
2024-10-12 09:28:17 +08:00 |
|
|
|
d3a2de1b4d
|
Merge branch 'zjw'
|
2024-10-11 16:35:49 +08:00 |
|
|
|
f33f54e75d
|
使用mybatisplus自带拼接类方法代替xml的持久层接口
|
2024-10-11 16:34:40 +08:00 |
|
|
|
4b5c931159
|
维修工单中心添加审批功能
|
2024-10-11 14:20:52 +08:00 |
|
|
|
75daa51e90
|
Merge branch 'master' into zjw
|
2024-10-10 16:03:52 +08:00 |
|
|
|
531f3935a4
|
设备看板相关接口更新
|
2024-10-10 16:02:37 +08:00 |
|
|
|
93d682743d
|
新增、修改维修工单弹窗标题修改
|
2024-10-10 14:02:55 +08:00 |
|
|
|
c29371e319
|
监控数据管理添加设备选择项
|
2024-10-10 10:13:45 +08:00 |
|
|
|
cacf21776c
|
数据接收功能修改
|
2024-10-09 18:01:26 +08:00 |
|
|
|
00193a7252
|
通知和租户功能修改
|
2024-10-09 15:23:37 +08:00 |
|
|
|
f6e771085a
|
Merge branch 'master' into zjw
# Conflicts:
# imt-ui/src/views/system/alarm/alarmdata/index.vue
|
2024-10-09 15:05:41 +08:00 |
|
|
|
e3ca77c89b
|
消息通知功能和指定租户编号不进行租户过滤功能通知
|
2024-10-09 14:55:24 +08:00 |
|
|
|
cce28a2f1a
|
Merge branch 'refs/heads/xusd'
# Conflicts:
# imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/service/maintenance/MaintenanceOrderService.java
|
2024-10-08 15:20:26 +08:00 |
|
|
|
dbb375a240
|
维修工单审批页面添加报警详情跳转
|
2024-10-08 15:17:08 +08:00 |
|
