Commit Graph

702 Commits

Author SHA1 Message Date
76d503e94e fix: Bug 2023-11-10 17:02:44 +08:00
69ca122d14 feat: 工业园区数据看板 2023-11-10 15:10:42 +08:00
e0fd963950 feat: 工业园区安全生产综合服务监测大屏的细微调整 2023-11-10 09:30:04 +08:00
71702e0b94 feat: 配置大屏跳转 2023-11-09 17:28:08 +08:00
1c5cf4162e Merge branch 'feature_big_screen' 2023-11-09 17:24:35 +08:00
a5f3ddd9c5 大屏的开发 2023-11-09 17:19:07 +08:00
8a26c53a66 车间公厕管理 2023-11-09 17:04:59 +08:00
4732a9f1d1 Merge branch 'feature_day_1109' into 'main'
照明数据分析、故障检测

See merge request likehai/ytr-god!27
2023-11-09 16:42:10 +08:00
151859037b 照明数据分析、故障检测 2023-11-09 16:40:29 +08:00
b8bc6de5ea 照明智能控制 2023-11-09 14:32:02 +08:00
0b166e0d4a feat: 文字修改 2023-11-09 12:46:38 +08:00
c0dd68e029 fix: Bug 2023-11-09 12:46:38 +08:00
36abf0dbaa 车间公厕管理 2023-11-09 11:26:48 +08:00
b609177bf2 feat: 智慧生活服务保障中心大屏 2023-11-09 11:10:25 +08:00
zhaofei06
b44438a05f Merge remote-tracking branch 'origin/main' 2023-11-09 09:30:02 +08:00
zhaofei06
b0c4eef7b7 fix:预警看板表格样式修改 2023-11-09 09:28:39 +08:00
1b019ecffa feat: 两个大屏 2023-11-09 09:27:56 +08:00
8bda410da9 feat: 大屏时间修改&工业园区首页 2023-11-09 09:27:56 +08:00
6abbb4b65f bug 2023-11-08 18:16:26 +08:00
ed15e9c356 车间公厕管理 2023-11-08 18:06:34 +08:00
ad1c679c22 Merge branch 'feature_day_1107' into 'main'
设备、工序、部门能耗分析

See merge request likehai/ytr-god!26
2023-11-08 17:12:36 +08:00
468b879fbb 灯具信息管理 2023-11-08 17:10:56 +08:00
ea60df9d4f 后台指向接口 2023-11-08 16:25:51 +08:00
a82e900ce4 设备、工序、部门能耗分析 2023-11-08 16:10:51 +08:00
zhaofei06
f4449b6217 feat:巡检工单制定、派发;预警看板页面 2023-11-08 16:07:28 +08:00
zhaofei06
54d4bede4a feat:巡检工单制定、派发;预警看板 2023-11-08 16:04:21 +08:00
d5a3331662 修正打包bug 2023-11-08 10:54:40 +08:00
765db7c5dd feat: 工业园区登录页&首页 2023-11-08 10:46:00 +08:00
1c9e3522d9 flowabale 2023-11-08 10:44:27 +08:00
f26d33fb4c fix: Bug 2023-11-08 09:35:39 +08:00
1583800c4e fix: Bug 2023-11-08 09:24:10 +08:00
878191ffe5 feat: 对企业作业平台的单独处理 2023-11-08 09:16:06 +08:00
d900df3811 Merge branch 'feature_day_1107' into 'main'
设备能耗情况

See merge request likehai/ytr-god!25
2023-11-07 17:58:18 +08:00
729c28106f 设备能耗情况 2023-11-07 17:45:43 +08:00
41837cb994 生产作业数据统计分析 2023-11-07 17:43:15 +08:00
c88be91126 feat: 大屏数据与样式调整 2023-11-07 11:09:12 +08:00
b3cd2441d9 feat: 企业作业综合可视化首页 2023-11-07 10:45:58 +08:00
2d5b579129 按钮没权限问题修改 2023-11-07 09:31:14 +08:00
307d3169d5 Merge branch 'feature_week_46' into 'main'
设备管理

See merge request likehai/ytr-god!24
2023-11-06 17:34:10 +08:00
ca76b1454c 减少日志 2023-11-06 17:33:04 +08:00
1d11f2bc84 生产作业数据统计分析 2023-11-06 17:32:54 +08:00
4c2e5b715a 设备管理 2023-11-06 17:31:55 +08:00
bbab6d3c76 feat: 登录页和大屏 2023-11-06 17:28:15 +08:00
f0259283dd feat: git忽略target 2023-11-06 10:40:36 +08:00
39fbc9ccec Merge branch 'feature_day_1102' into 'main'
工作许可申请提交工作流管理

See merge request likehai/ytr-god!23
2023-11-02 17:58:40 +08:00
c4e89e751d 工作许可申请提交工作流管理 2023-11-02 17:36:53 +08:00
5352099e59 Merge remote-tracking branch 'origin/main' 2023-11-01 17:37:55 +08:00
5dd23675f9 作业过程安全监管 2023-11-01 17:37:44 +08:00
477b776bbb Merge branch 'feature_day_1101' into 'main'
特殊作业验收、特殊作业归档

See merge request likehai/ytr-god!22
2023-11-01 16:48:34 +08:00
0d0fa0951e 特殊作业验收、特殊作业归档 2023-11-01 16:46:33 +08:00