Commit Graph

175 Commits

Author SHA1 Message Date
31461c4d36 fix: BUG 2023-11-15 09:28:02 +08:00
c3cf7d80d0 北斗定位信息 2023-11-15 09:14:08 +08:00
f0b2178cbe Merge remote-tracking branch 'origin/main' 2023-11-14 17:12:21 +08:00
e32a8b0503 自动驾驶套件 2023-11-14 17:12:12 +08:00
2fa48debe8 Merge branch 'feature_day_1114' into 'main'
农机运行状态/农机运行功率

See merge request likehai/ytr-god!33
2023-11-14 17:11:48 +08:00
4d7282d61c 农机运行状态/农机运行功率 2023-11-14 17:10:28 +08:00
a8500639e1 feat: 重庆银钢科技数字农机管理平台大屏 2023-11-14 15:22:30 +08:00
1a9a6a42e0 北斗定位信息 2023-11-14 11:12:36 +08:00
5f6264df91 feat: 重庆钢银首页 2023-11-14 10:30:58 +08:00
e25d7b7c3e feat: 重庆银钢登录页 2023-11-14 10:29:37 +08:00
3c9bf18566 Merge branch 'feature_day_1113' into 'main'
HTTP协议对接

See merge request likehai/ytr-god!32
2023-11-13 17:29:13 +08:00
2f16f44dac HTTP协议对接 2023-11-13 17:28:23 +08:00
251c49dc12 自动驾驶套件 2023-11-13 17:21:34 +08:00
69943c4301 Merge branch 'feature_add_cells' into 'main'
表格中单元格合并

See merge request likehai/ytr-god!31
2023-11-13 17:04:10 +08:00
bbbe0a3895 表格中单元格合并 2023-11-13 17:02:54 +08:00
e3b94b29d9 Merge branch 'feature_day_1113' into 'main'
数字农机编码规则

See merge request likehai/ytr-god!30
2023-11-13 16:11:05 +08:00
8fe5f2b0be 数字农机编码管理 2023-11-13 16:09:36 +08:00
3cec371963 数字农机编码规则 2023-11-13 14:14:47 +08:00
03a7808c68 工业园区数据平台对接中心 2023-11-10 18:42:34 +08:00
f50785e059 Merge remote-tracking branch 'origin/main' 2023-11-10 17:18:00 +08:00
e473bd4162 车间公厕管理 2023-11-10 17:17:07 +08:00
2ffb796625 Merge branch 'feature_day_1110' into 'main'
照明报警管理、维护管理

See merge request likehai/ytr-god!29
2023-11-10 17:04:41 +08:00
9f26337b48 照明报警管理、维护管理 2023-11-10 17:02:59 +08:00
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