Commit Graph

496 Commits

Author SHA1 Message Date
dadc04658c Merge branch 'feature_day_1121' into 'main'
事件数据,停车信息,地理信息数据

See merge request likehai/ytr-god!39
2023-11-21 18:26:25 +08:00
40ec600459 事件数据,停车信息,地理信息数据 2023-11-21 18:25:07 +08:00
499b96ca13 Merge branch 'feature_day_1120' into 'main'
九龙坡区管理机构、人员信息、设备信息

See merge request likehai/ytr-god!38
2023-11-20 17:06:10 +08:00
25b098d42c 九龙坡区管理机构、人员信息、设备信息 2023-11-20 17:04:07 +08:00
64ae7bab4a 作业视频信息问题修改 2023-11-20 09:45:49 +08:00
ee38c525b7 feat: 重庆银钢大屏视频循环和删除片头 2023-11-20 09:23:20 +08:00
7462bfec0d feat: 顶部标签title 重刷问题的修复 需要时可回退 2023-11-20 09:23:20 +08:00
6af9839e96 Merge branch 'feature_day_1117' into 'main'
修改权限

See merge request likehai/ytr-god!37
2023-11-17 17:49:57 +08:00
82677307c9 修改权限 2023-11-17 17:48:30 +08:00
799165ce28 Merge branch 'feature_day_1117' into 'main'
作业视频信息

See merge request likehai/ytr-god!36
2023-11-17 10:41:49 +08:00
bd26ba2e28 作业视频信息 2023-11-17 10:41:19 +08:00
d2e7f12cae Merge branch 'feature_day_1116' into 'main'
作业图片信息

See merge request likehai/ytr-god!35
2023-11-16 16:55:57 +08:00
6237c9f6e0 作业图片信息 2023-11-16 16:54:06 +08:00
cc941dc2d4 农机作业时间,农机作业面积 2023-11-16 14:23:48 +08:00
1e9c7ca99b fix: Bug 2023-11-16 09:20:50 +08:00
cb47078c79 Merge branch 'feature_day_1115' into 'main'
农机作业参数上传

See merge request likehai/ytr-god!34
2023-11-15 16:44:31 +08:00
cee49f6729 农机作业参数上传 2023-11-15 16:42:47 +08:00
0028a8f8a1 fix: Bug 2023-11-15 16:42:18 +08:00
7ad9e6d1b0 安全套件 2023-11-15 16:36:16 +08:00
e72f0fad83 农机运行开始时间 2023-11-15 11:12:50 +08:00
b780bd49c8 fix: BUG 2023-11-15 09:28:02 +08:00
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