Commit Graph

1484 Commits

Author SHA1 Message Date
joylink_fanyuhong
a936afbeb4 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m28s
2024-10-30 17:20:16 +08:00
joylink_fanyuhong
d31acd3688 环境配置问题修复 2024-10-30 17:19:44 +08:00
joylink_fanyuhong
80bb3ee139 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m30s
2024-10-15 09:36:50 +08:00
joylink_fanyuhong
e04e855c66 创建列车新增列车编组 2024-10-15 09:28:27 +08:00
joylink_fanyuhong
07be0a8d5a Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m33s
2024-10-11 17:08:40 +08:00
joylink_fanyuhong
209f42fead 取消拦截器无权限提示 2024-10-11 17:08:21 +08:00
joylink_fanyuhong
f229298359 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m34s
2024-10-09 17:47:17 +08:00
joylink_fanyuhong
dacebbc9ff 接口服务调整 2024-10-09 17:46:51 +08:00
joylink_fanyuhong
0882a88c0a 权限调整 2024-10-09 16:56:14 +08:00
joylink_fanyuhong
0704c6da0c 权限调整 2024-10-09 16:18:48 +08:00
joylink_fanyuhong
a82c1a3400 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m34s
2024-10-09 15:16:21 +08:00
joylink_zhaoerwei
42ff85422e 调整列车驾驶台元素大小 2024-10-09 15:10:06 +08:00
joylink_fanyuhong
23b727c694 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m34s
2024-10-09 14:11:39 +08:00
joylink_fanyuhong
7f102ad837 项目启动添加loading 2024-10-09 14:11:13 +08:00
joylink_fanyuhong
562279a2fe Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m35s
2024-10-08 16:18:18 +08:00
joylink_fanyuhong
fbdf490a30 列车操作顺序调整 2024-10-08 16:17:22 +08:00
joylink_fanyuhong
01e9c7f78a Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m36s
2024-10-08 15:37:41 +08:00
joylink_fanyuhong
bbcb8edaaa 列车操作顺序调整 2024-10-08 15:37:17 +08:00
joylink_fanyuhong
e25d681556 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m30s
2024-10-08 15:34:04 +08:00
joylink_fanyuhong
34af6397ae Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-10-08 15:33:45 +08:00
joylink_fanyuhong
5aaec3388f 列车右键和面板操作同步 2024-10-08 15:33:44 +08:00
tiger_zhou
06d4c4322c Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m41s
2024-10-08 09:10:52 +08:00
tiger_zhou
c2e79a73f7 proto文件更新 2024-10-08 09:10:32 +08:00
tiger_zhou
1a936f55a9 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m2s
2024-10-08 09:02:49 +08:00
tiger_zhou
dcb01159b3 proto文件更新 2024-10-08 09:02:21 +08:00
tiger_zhou
6e2079aa65 proto文件更新 2024-09-09 09:15:31 +08:00
joylink_fanyuhong
633c07037b Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m41s
2024-08-30 17:28:19 +08:00
joylink_fanyuhong
a4c35bb464 添加紧急制动减速度参数 2024-08-30 16:58:17 +08:00
fan
e426a09ea7 proto同步 2024-08-30 16:48:07 +08:00
joylink_fanyuhong
14a8118e83 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m36s
2024-08-30 10:21:07 +08:00
joylink_fanyuhong
30681803ec 删除基本参数 -最大速度 2024-08-30 10:20:17 +08:00
joylink_zhaoerwei
2216b0282f Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
commit 78b7b6be9f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Aug 30 10:13:13 2024 +0800

    手柄操作请求频率+显示位置百分比
2024-08-30 10:14:22 +08:00
joylink_zhaoerwei
78b7b6be9f 手柄操作请求频率+显示位置百分比 2024-08-30 10:13:13 +08:00
joylink_fanyuhong
9e3698f2ee Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m32s
2024-08-29 19:00:32 +08:00
joylink_fanyuhong
cfd27e6539 拼写错误调整 2024-08-29 19:00:18 +08:00
joylink_fanyuhong
42a4749e9f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
2024-08-29 18:28:22 +08:00
joylink_fanyuhong
34edce551b 参数拼写错误调整 2024-08-29 18:28:02 +08:00
joylink_fanyuhong
766f5bb013 Merge branch 'local-test' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m39s
2024-08-29 17:41:06 +08:00
joylink_fanyuhong
cc4d57d305 Merge remote-tracking branch 'origin/develop' into local-test 2024-08-29 17:41:04 +08:00
joylink_fanyuhong
94607edcfe Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-08-29 17:40:37 +08:00
joylink_fanyuhong
0db11ff3da 列车添加基本信息 2024-08-29 17:40:35 +08:00
joylink_zhaoerwei
87b600fed5 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m37s
commit e39774e4bc
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Aug 29 17:27:47 2024 +0800

    驾驶台手柄0位范围扩大,在范围内自动吸附到0位

commit f61ee0610c
Author: fan <fanyuhong@joylink.club>
Date:   Thu Aug 29 16:55:59 2024 +0800

    proto同步

commit 3c856ec37c
Author: fan <fanyuhong@joylink.club>
Date:   Thu Aug 29 16:14:30 2024 +0800

    protoc同步

commit 0ac19e5d35
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Aug 27 11:44:09 2024 +0800

    修改请求参数(门模式)

commit 8f9c0c852a
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Aug 22 14:31:15 2024 +0800

    驾驶台旋钮操作bug修复
2024-08-29 17:30:26 +08:00
joylink_zhaoerwei
e39774e4bc 驾驶台手柄0位范围扩大,在范围内自动吸附到0位 2024-08-29 17:27:47 +08:00
fan
f61ee0610c proto同步 2024-08-29 16:55:59 +08:00
fan
3c856ec37c protoc同步 2024-08-29 16:14:30 +08:00
joylink_zhaoerwei
aadebddbad Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
commit 0ac19e5d35
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Aug 27 11:44:09 2024 +0800

    修改请求参数(门模式)

commit 8f9c0c852a
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Aug 22 14:31:15 2024 +0800

    驾驶台旋钮操作bug修复
2024-08-27 11:45:32 +08:00
joylink_zhaoerwei
0ac19e5d35 修改请求参数(门模式) 2024-08-27 11:44:09 +08:00
joylink_zhaoerwei
a061a6d1e9 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m38s
commit 8f9c0c852a
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Aug 22 14:31:15 2024 +0800

    驾驶台旋钮操作bug修复
2024-08-22 14:32:18 +08:00
joylink_zhaoerwei
8f9c0c852a 驾驶台旋钮操作bug修复 2024-08-22 14:31:15 +08:00
joylink_fanyuhong
f0706af329 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m48s
2024-08-22 11:26:56 +08:00