Commit Graph

1451 Commits

Author SHA1 Message Date
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
joylink_fanyuhong
e5e632104c 引入文件问题调整 2024-08-22 11:26:35 +08:00
soul-walker
5c5d8181eb 修改gitea action使用的setup-node版本
Some checks failed
CI / Docker-Build (push) Failing after 1m28s
2024-08-22 11:01:40 +08:00
joylink_zhaoerwei
281f64dcb7 Squashed commit of the following:
Some checks failed
CI / Docker-Build (push) Failing after 6m56s
commit 67ae3156c6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Aug 22 08:45:02 2024 +0800

    驾驶台钥匙增加列车门模式类型
2024-08-22 08:55:36 +08:00
joylink_fanyuhong
98583049be Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
CI / Docker-Build (push) Failing after 7m0s
2024-08-22 08:45:33 +08:00
joylink_fanyuhong
8073286da7 merge
Some checks failed
CI / Docker-Build (push) Has been cancelled
2024-08-22 08:45:24 +08:00
joylink_zhaoerwei
67ae3156c6 驾驶台钥匙增加列车门模式类型 2024-08-22 08:45:02 +08:00
joylink_fanyuhong
191203c274 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-08-22 08:41:59 +08:00
joylink_fanyuhong
3773aef4ac 添加公里标长短链数据 2024-08-22 08:41:56 +08:00
joylink_zhaoerwei
f37f323cd6 Squashed commit of the following:
Some checks failed
CI / Docker-Build (push) Failing after 7m1s
commit 1b85571005
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Aug 21 18:23:43 2024 +0800

    驾驶台接收信息修改(待与后端测试)

commit fe56bdc27d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Aug 21 17:37:48 2024 +0800

    旋钮请求更改

commit 5313a00dc6
Author: fan <fanyuhong@joylink.club>
Date:   Wed Aug 21 16:57:21 2024 +0800

    proto同步

commit f73b171f15
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Aug 12 18:00:50 2024 +0800

    计轴区段的显示和状态(待与后端测试)
2024-08-21 18:25:36 +08:00
joylink_zhaoerwei
1b85571005 驾驶台接收信息修改(待与后端测试) 2024-08-21 18:23:43 +08:00
joylink_zhaoerwei
cef4a47bbc Squashed commit of the following:
Some checks failed
CI / Docker-Build (push) Failing after 7m7s
commit fe56bdc27d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Aug 21 17:37:48 2024 +0800

    旋钮请求更改

commit 5313a00dc6
Author: fan <fanyuhong@joylink.club>
Date:   Wed Aug 21 16:57:21 2024 +0800

    proto同步

commit f73b171f15
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Aug 12 18:00:50 2024 +0800

    计轴区段的显示和状态(待与后端测试)
2024-08-21 17:40:34 +08:00
joylink_zhaoerwei
fe56bdc27d 旋钮请求更改 2024-08-21 17:37:48 +08:00
fan
5313a00dc6 proto同步 2024-08-21 16:57:21 +08:00
joylink_zhaoerwei
fbc12f12ee Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m10s
commit f73b171f15
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Aug 12 18:00:50 2024 +0800

    计轴区段的显示和状态(待与后端测试)
2024-08-12 18:02:03 +08:00
joylink_zhaoerwei
f73b171f15 计轴区段的显示和状态(待与后端测试) 2024-08-12 18:00:50 +08:00
joylink_fanyuhong
2eb43f9e4c Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m46s
2024-08-12 16:25:35 +08:00
joylink_fanyuhong
eabfd3ddb7 联锁编号映射数据调整 2024-08-12 16:25:16 +08:00
fan
21d4c0aa8f proto同步数据 2024-08-12 16:05:39 +08:00
joylink_fanyuhong
ea0f1a1781 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m41s
2024-08-09 15:01:22 +08:00
joylink_fanyuhong
73fc258109 应答器报文编辑调整 2024-08-08 15:11:55 +08:00
joylink_fanyuhong
62cdb1e8d9 草稿应答器报文属性可编辑 2024-08-08 14:58:28 +08:00
joylink_fanyuhong
69ccdf56d5 Merge branch 'develop' into local-test 2024-08-06 13:23:11 +08:00
joylink_zhaoerwei
a6f0604423 同步protoc 2024-08-06 13:15:20 +08:00
joylink_fanyuhong
1181bfd270 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 7m21s
2024-07-19 14:57:27 +08:00
joylink_zhaoerwei
4c1889c250 第三方接口增加服务描述 2024-07-19 14:32:32 +08:00
joylink_fanyuhong
87eb3906e1 列车链接状态调整 2024-07-19 14:25:21 +08:00
joylink_fanyuhong
f6ba3de79d 链接key值调整 2024-07-19 10:21:59 +08:00
tiger_zhou
a4c08b3e3d 添加北京现场打包脚本及地址
Some checks failed
CI / Docker-Build (push) Failing after 7m6s
2024-07-19 09:24:37 +08:00
joylink_fanyuhong
9be34a00c7 列车连击调整 2024-07-19 09:21:32 +08:00
joylink_fanyuhong
e23f1ee474 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
2024-07-11 16:30:12 +08:00
joylink_fanyuhong
9112a3c73a 应答器添加LEU索引数据 2024-07-11 16:29:10 +08:00
joylink_fanyuhong
2136bd3c0f message同步 2024-07-11 16:12:47 +08:00
joylink_fanyuhong
363ff066ed merage
All checks were successful
CI / Docker-Build (push) Successful in 2m45s
2024-07-04 17:59:39 +08:00