Commit Graph

1209 Commits

Author SHA1 Message Date
joylink_zhaoerwei
1afcff6071 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m56s
commit e964b8bf27
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Mar 28 09:58:05 2024 +0800

    道岔编辑修改

commit dcd7f3322c
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Mar 28 09:22:06 2024 +0800

    防淹门调整

commit 7d2a1be457
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu Mar 28 09:18:23 2024 +0800

    车库门调整暂提

commit 3fb3eb8135
Merge: d9b5841 5210c9d
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Mar 27 17:20:34 2024 +0800

    Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop

commit d9b5841cfb
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Mar 27 17:20:17 2024 +0800

    车库门状态显示调整

commit 5210c9d9cd
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 17:04:26 2024 +0800

    屏蔽门右键bug
2024-03-28 10:04:31 +08:00
joylink_zhaoerwei
e9479ac1ff Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m26s
commit 5210c9d9cd
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 17:04:26 2024 +0800

    屏蔽门右键bug
2024-03-27 17:14:57 +08:00
joylink_fanyuhong
1ac34663fb Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m21s
2024-03-27 16:59:18 +08:00
joylink_fanyuhong
4012e3c2f7 psl场景加载调整 2024-03-27 16:57:44 +08:00
joylink_fanyuhong
7c1ea16fce Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m30s
2024-03-27 15:50:03 +08:00
joylink_fanyuhong
2048eb43dd 车库门显示调整 2024-03-27 15:48:27 +08:00
joylink_fanyuhong
9c95c229e5 psl切换地图数据不更新调整 2024-03-27 15:48:12 +08:00
joylink_fanyuhong
f0db7a70ab 本地发布调整 2024-03-27 15:47:56 +08:00
joylink_fanyuhong
4b4e3ae631 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
2024-03-27 14:26:37 +08:00
joylink_fanyuhong
b0b0074608 url调整 2024-03-27 14:25:37 +08:00
joylink_fanyuhong
b0265ad86e Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
2024-03-27 14:15:44 +08:00
joylink_fanyuhong
43a8993eb9 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-03-27 14:11:53 +08:00
joylink_fanyuhong
f21690988d 车库门调整 2024-03-27 14:11:49 +08:00
joylink_zhaoerwei
5fcc66b2dc Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
commit 0a2641c20f
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 13:43:00 2024 +0800

    一键生成继电器修改:增加边界条件的判断

commit e2ac7e4ae5
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 12:14:15 2024 +0800

    继电器K变大写
2024-03-27 13:47:31 +08:00
joylink_zhaoerwei
0a2641c20f 一键生成继电器修改:增加边界条件的判断 2024-03-27 13:43:00 +08:00
joylink_zhaoerwei
e2ac7e4ae5 继电器K变大写 2024-03-27 12:14:15 +08:00
joylink_fanyuhong
6e1b972d2f 同步 2024-03-26 17:32:28 +08:00
joylink_fanyuhong
ebcfbfd891 车库门添加操作&状态 2024-03-26 17:31:37 +08:00
joylink_fanyuhong
504b8cf825 应答器添加原编号并导入
All checks were successful
CI / Docker-Build (push) Successful in 2m27s
2024-03-25 14:06:41 +08:00
joylink_fanyuhong
6c94a8a511 Merge remote-tracking branch 'origin/master' into develop 2024-03-21 13:27:16 +08:00
joylink_fanyuhong
d843e81fd4 Merge branch 'master' of http://120.46.212.6:3000/joylink/rts-sim-testing-client 2024-03-21 09:12:31 +08:00
joylink_fanyuhong
82fabffdb8 同步 2024-03-21 09:11:46 +08:00
joylink_fanyuhong
ec135451d4 添加车库门盒子 2024-03-21 09:11:07 +08:00
e13cf51e4e 修改发布tar命令错误
All checks were successful
CI / Docker-Build (push) Successful in 2m26s
2024-03-20 22:50:39 +08:00
bd066d7fc6 修改tar解压bug
All checks were successful
CI / Docker-Build (push) Successful in 2m40s
2024-03-20 22:42:39 +08:00
8d733e2e6f 修改scp添加overwrite标识
Some checks failed
CI / Docker-Build (push) Failing after 1m53s
2024-03-20 22:37:06 +08:00
7a37876dc4 修改scp target问题(target必须是目录,而不是文件)
Some checks failed
CI / Docker-Build (push) Failing after 1m9s
2024-03-20 22:31:50 +08:00
ab15fcf568 完善本地测试发布流程
Some checks failed
CI / Docker-Build (push) Failing after 32m28s
2024-03-20 21:57:05 +08:00
33fc91f9de 测试命令 2024-03-20 15:14:07 +08:00
df535cc73c 修改local-test工作流定义
All checks were successful
CI / Docker-Build (push) Successful in 7m33s
2024-03-19 21:52:16 +08:00
a180682b82 Merge branch 'master' into develop 2024-03-19 21:43:43 +08:00
3b8c7d2b00 message模块同步 2024-03-19 21:42:57 +08:00
feb8edeb44 submodule 地址更新
local-test持续发布集成工作流定义
2024-03-19 21:41:44 +08:00
joylink_zhaoerwei
22d3a1794a 驾驶台--状态数据结构和交互调整 2024-03-19 17:47:35 +08:00
joylink_zhaoerwei
9261a95f78 驾驶台相关 2024-03-19 14:20:53 +08:00
joylink_fanyuhong
eee398eaa1 列车连接操作&列车连接状态 2024-03-19 10:22:17 +08:00
joylink_zhaoerwei
1fa571f777 列车控制室相关 2024-03-15 16:41:38 +08:00
joylink_zhaoerwei
309931be31 增加列车驾驶台图--壳 2024-03-14 18:02:45 +08:00
joylink_zhaoerwei
b6c031d7b9 修改执行proto的文件名 2024-03-14 15:48:40 +08:00
joylink_zhaoerwei
875a566b38 防淹门一键关联集中站 2024-03-14 09:46:05 +08:00
2fb6f91372 修改submodule及依赖graphic-pixi 2024-03-13 19:09:24 +08:00
joylink_zhaoerwei
ef0637003a 洗车机和车库门继电器和一键关联集中站 2024-03-13 16:15:18 +08:00
joylink_fanyuhong
53f1be79e9 icon调整 2024-03-13 16:08:59 +08:00
joylink_fanyuhong
c640f3f85a 車庫門調整 2024-03-13 16:06:11 +08:00
joylink_fanyuhong
efb8140a29 防淹门颜色调整 2024-03-13 15:36:39 +08:00
joylink_fanyuhong
dd5f77d6f1 防淹门、车库门、洗车机调整 2024-03-13 15:31:26 +08:00
joylink_zhaoerwei
4314e0db79 可手动录入车库门洗车机继电器相关信息 2024-03-13 09:13:55 +08:00
joylink_zhaoerwei
db7911985a proto同步 2024-03-12 15:29:04 +08:00
joylink_fanyuhong
268a964ef0 添加速传输入和雷达输出 2024-03-12 15:21:43 +08:00
joylink_zhaoerwei
fe789210dc proto同步 2024-03-12 14:05:51 +08:00