Commit Graph

1367 Commits

Author SHA1 Message Date
joylink_zhaoerwei
dd46053ced Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 1m51s
commit 0e7de4afa8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 19:02:34 2024 +0800

    增加数据位置调整功能

commit 35eab5ac87
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 15:48:06 2024 +0800

    驱采数据加清空
2024-06-25 19:06:29 +08:00
joylink_zhaoerwei
ec8056e1b7 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m52s
commit 54ee649581
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 11:25:09 2024 +0800

    微调

commit 94060bd5e8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 11:21:30 2024 +0800

    修改继电器布局

commit 8e62b39f34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 09:16:17 2024 +0800

    继电器状态图显示调整+spks生成调整

commit 059a333370
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 21:08:58 2024 +0800

    生成继电器增加展示编号配置

commit ad7a1a8451
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 18:35:14 2024 +0800

    增加IBP盘扣车继电器(IKCJ)、增加GDJ(计轴电源故障继电器)和ZFWJ

commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 08:41:16 2024 +0800

    道岔物理区段也生成GJ继电器

commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Jun 20 17:41:27 2024 +0800

    集中区分割线代码优化(风格线位于边界处一侧未关联区段)

commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验

# Conflicts:
#	src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue
2024-06-25 11:28:40 +08:00
joylink_zhaoerwei
4cc5330ec9 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m54s
commit 8e62b39f34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 09:16:17 2024 +0800

    继电器状态图显示调整+spks生成调整
2024-06-25 09:45:26 +08:00
joylink_zhaoerwei
99a7cdfae0 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 3m9s
commit 059a333370
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 21:08:58 2024 +0800

    生成继电器增加展示编号配置

commit ad7a1a8451
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 18:35:14 2024 +0800

    增加IBP盘扣车继电器(IKCJ)、增加GDJ(计轴电源故障继电器)和ZFWJ

commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 08:41:16 2024 +0800

    道岔物理区段也生成GJ继电器

commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Jun 20 17:41:27 2024 +0800

    集中区分割线代码优化(风格线位于边界处一侧未关联区段)

commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
2024-06-24 21:14:02 +08:00
joylink_zhaoerwei
36e7a532d6 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m33s
commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 08:41:16 2024 +0800

    道岔物理区段也生成GJ继电器

commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Jun 20 17:41:27 2024 +0800

    集中区分割线代码优化(风格线位于边界处一侧未关联区段)

commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
2024-06-24 08:44:44 +08:00
joylink_zhaoerwei
23ff38bbc7 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m32s
commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Jun 20 17:41:27 2024 +0800

    集中区分割线代码优化(风格线位于边界处一侧未关联区段)

commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
2024-06-20 17:42:21 +08:00
joylink_zhaoerwei
371755d2b5 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m34s
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
2024-06-19 10:57:21 +08:00
joylink_zhaoerwei
4fc4fa6c4f Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m49s
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
2024-06-19 10:09:53 +08:00
joylink_fanyuhong
77166baf11 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m7s
2024-06-12 17:38:12 +08:00
fan
e83a0211ed Merge branch 'develop' of https://gitea.joylink.club/joylink/rts-sim-testing-client into develop 2024-06-12 17:36:51 +08:00
fan
542745ef84 连锁映射数据调整 2024-06-12 17:36:47 +08:00
joylink_fanyuhong
7781551d18 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m47s
2024-06-06 17:53:49 +08:00
joylink_fanyuhong
0ca1979eba Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-06-06 17:47:19 +08:00
joylink_fanyuhong
97b767248e 通信状态提示位置调整 2024-06-06 17:47:17 +08:00
joylink_zhaoerwei
103beaa722 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m28s
commit d621373abb
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 5 10:03:51 2024 +0800

    url更改
2024-06-05 10:05:15 +08:00
joylink_zhaoerwei
d621373abb url更改 2024-06-05 10:03:51 +08:00
fan
229efac247 Merge branch 'develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 1m51s
2024-05-29 16:01:20 +08:00
fan
13e5b77a97 连锁映射数据切换丢失数据问题调整 2024-05-29 14:16:34 +08:00
fan
6e6c665e6b 连锁映射问题调整 2024-05-29 14:03:01 +08:00
fan
5ca9ed1d21 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m3s
2024-05-28 13:23:32 +08:00
fan
e0714ffbde 删除日志 2024-05-28 13:23:06 +08:00
fan
f63c639dc1 连锁编号映射数据调整 2024-05-28 13:19:56 +08:00
fan
cb7037dcee 联锁映射调整暂提 2024-05-27 22:25:12 +08:00
fan
c1741e0aba 扣车按钮&无人折返按钮 2024-05-27 20:52:52 +08:00
joylink_fanyuhong
b504c7482b 联锁编号映射暂提 2024-05-25 10:06:05 +08:00
fan
1035f1751a protoc同步 2024-05-25 08:58:58 +08:00
joylink_fanyuhong
d45232e6c9 联锁编号映射暂提 2024-05-24 20:45:37 +08:00
joylink_fanyuhong
e769e16fc3 列车链接平台调整 2024-05-23 16:39:14 +08:00
fan
d7099b3163 Merge branch 'develop' of https://gitea.joylink.club/joylink/rts-sim-testing-client into develop 2024-05-23 16:29:31 +08:00
fan
8acf4b0308 同步protoc 2024-05-23 16:29:27 +08:00
fan
0fe4de834f 同步protoc 2024-05-23 16:28:58 +08:00
tiger_zhou
d8600d9460 添加北京现场打包脚本及地址 2024-05-21 17:28:27 +08:00
tiger_zhou
c3fc0c18e6 添加北京现场打包脚本及地址 2024-05-21 16:46:53 +08:00
fan
c6b36773ae Merge branch 'local-test' of https://gitea.joylink.club/joylink/rts-sim-testing-client into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m19s
2024-05-20 15:48:17 +08:00
fan
aee078290a Merge branch 'develop' into local-test 2024-05-20 15:48:01 +08:00
joylink_fanyuhong
f0db718c54 列车调整 2024-05-13 10:32:13 +08:00
joylink_fanyuhong
cc8c2cf8de Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-05-11 17:05:14 +08:00
joylink_fanyuhong
c4b35b3493 列车调整 2024-05-11 17:05:11 +08:00
joylink_zhaoerwei
4acd4ccfe5 前端pixi框架版本更新 2024-05-11 15:34:35 +08:00
joylink_fanyuhong
aa7ad1edac 列车激活端方向调整 2024-05-11 11:00:54 +08:00
joylink_fanyuhong
a4231d1813 列车车头调整 2024-05-11 09:58:23 +08:00
joylink_fanyuhong
182ea7c099 列车车头激活端调整 2024-05-11 09:27:48 +08:00
joylink_zhaoerwei
959592c17b 同步protoc 2024-05-11 08:27:32 +08:00
joylink_zhaoerwei
d54779279d Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 1m56s
commit 00b61a2891
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri May 10 15:27:30 2024 +0800

    配置生成区段继电器

commit 9738678e54
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu May 9 17:23:28 2024 +0800

    打开列车驾驶台优化

commit 89012e6290
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu May 9 16:08:02 2024 +0800

    列车驾驶台方向按钮操作失败会回到之前的位置
2024-05-10 15:29:22 +08:00
joylink_zhaoerwei
00b61a2891 配置生成区段继电器 2024-05-10 15:27:30 +08:00
joylink_zhaoerwei
15702d4ac6 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 1m49s
commit 9738678e54
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu May 9 17:23:28 2024 +0800

    打开列车驾驶台优化

commit 89012e6290
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu May 9 16:08:02 2024 +0800

    列车驾驶台方向按钮操作失败会回到之前的位置
2024-05-09 17:34:33 +08:00
joylink_zhaoerwei
9738678e54 打开列车驾驶台优化 2024-05-09 17:23:28 +08:00
joylink_zhaoerwei
9e8abf4624 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 1m54s
commit 89012e6290
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu May 9 16:08:02 2024 +0800

    列车驾驶台方向按钮操作失败会回到之前的位置
2024-05-09 16:34:22 +08:00
joylink_zhaoerwei
89012e6290 列车驾驶台方向按钮操作失败会回到之前的位置 2024-05-09 16:08:02 +08:00
joylink_fanyuhong
60ca381302 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m8s
2024-05-09 15:43:48 +08:00