Commit Graph

584 Commits

Author SHA1 Message Date
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
0ec56f9ad3 作业过程安全监管 2023-10-31 17:42:24 +08:00
d559b9de05 Merge branch 'feature_week_44' into 'main'
特殊作业清单、特殊作业申请

See merge request likehai/ytr-god!21
2023-10-31 17:29:30 +08:00
bac427f280 特殊作业清单、特殊作业申请 2023-10-31 17:28:19 +08:00
11027c0cb3 流程管理 2023-10-31 10:34:44 +08:00
cd396d92f4 Merge branch 'feature_week_44' into 'main'
工作许可报备/清单/申请

See merge request likehai/ytr-god!20
2023-10-30 18:22:21 +08:00
97162028ab 工作许可报备/清单/申请 2023-10-30 18:20:11 +08:00
7e0e7cb2ce 野生动物 页面 2023-10-28 01:49:26 +08:00
b428789628 野生动物 页面 2023-10-27 18:57:06 +08:00
2c7e5527ac 花草植物 2023-10-27 17:37:54 +08:00
c6d6226b2f Merge branch 'feature_day_1027' into 'main'
修改视频弹出框位置

See merge request likehai/ytr-god!19
2023-10-27 17:06:57 +08:00
6737c5d456 修改视频弹出框位置 2023-10-27 17:05:49 +08:00
4a4b647dff 花草植物 2023-10-26 18:39:35 +08:00
20fcd28bb0 权限修改bug 2023-10-26 18:32:11 +08:00
be004e6825 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 18:31:26 +08:00
af436b0499 权限修改bug 2023-10-26 18:30:50 +08:00
6703f82d51 Merge branch 'feature_day_1026' into 'main'
火点坐标在地图上显示

See merge request likehai/ytr-god!18
2023-10-26 17:42:45 +08:00
b78a5db224 火点坐标在地图上显示 2023-10-26 17:41:56 +08:00
562fbadf19 Merge branch 'main' of http://git.inspur.com/likehai/ytr-god into likehai 2023-10-26 17:30:44 +08:00