joylink/rts-sim-testing-client
6
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
1,264 Commits 5 Branches 0 Tags 4.7 MiB
64822d1ab0
Commit Graph

1264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joylink_fanyuhong
64822d1ab0 Merge remote-tracking branch 'origin/develop' into local-test
Some checks are pending
CI / Docker-Build (push) Waiting to run
Details
2024-04-03 10:16:43 +08:00
joylink_fanyuhong
0522c10831 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 2m23s
Details
2024-04-03 10:15:01 +08:00
joylink_fanyuhong
a5c5d3c303 同步 2024-04-03 10:14:58 +08:00
joylink_fanyuhong
548930fd3c Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-04-03 10:14:21 +08:00
joylink_fanyuhong
3e44d8fae4 关闭列车连接调整 2024-04-03 10:13:53 +08:00
joylink_zhaoerwei
8f02542257 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m29s
Details 
commit 2ab1396e33
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Apr 3 09:32:00 2024 +0800

    列车驾驶台交互
 2024-04-03 09:35:07 +08:00
joylink_zhaoerwei
2ab1396e33 列车驾驶台交互 2024-04-03 09:32:00 +08:00
joylink_fanyuhong
80dfc7c0f9 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m27s
Details
2024-04-02 20:31:25 +08:00
joylink_fanyuhong
3d3d614f3c 修改打包命令&CI 2024-04-02 20:30:55 +08:00
joylink_fanyuhong
de7c3b02e0 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m27s
Details 
# Conflicts:
#	quasar.config.js
#	src/configs/UrlManage.ts
 2024-04-02 20:23:34 +08:00
joylink_fanyuhong
9f8d45f450 环境变量调整 2024-04-02 20:20:23 +08:00
joylink_fanyuhong
6b01992c1f 环境变量测试
All checks were successful
CI / Docker-Build (push) Successful in 1m49s
Details
2024-04-02 20:14:06 +08:00
joylink_fanyuhong
51719ee5cb 环境变量测试
All checks were successful
CI / Docker-Build (push) Successful in 2m27s
Details
2024-04-02 20:09:25 +08:00
joylink_fanyuhong
bde21fd2b4 环境变量测试
All checks were successful
CI / Docker-Build (push) Successful in 1m51s
Details
2024-04-02 20:05:50 +08:00
joylink_fanyuhong
9d00b2a912 环境变量测试
All checks were successful
CI / Docker-Build (push) Successful in 2m24s
Details
2024-04-02 19:57:55 +08:00
joylink_fanyuhong
dacf2650f6 环境变量测试
All checks were successful
CI / Docker-Build (push) Successful in 2m28s
Details
2024-04-02 19:53:26 +08:00
joylink_fanyuhong
9b0329787a Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m26s
Details
2024-04-02 19:43:32 +08:00
joylink_fanyuhong
ce211464a9 环境变量测试 2024-04-02 19:43:15 +08:00
joylink_fanyuhong
21290bae9b Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m2s
Details
2024-04-02 19:38:22 +08:00
joylink_fanyuhong
f80dcbb2f7 环境变量测试 2024-04-02 19:37:32 +08:00
joylink_fanyuhong
c6c1876c29 取消环境变量测试内容 2024-04-02 19:33:54 +08:00
joylink_fanyuhong
82cc41db65 Merge remote-tracking branch 'origin/develop' into local-test 2024-04-02 18:50:03 +08:00
joylink_fanyuhong
c9431b94f4 环境变量测试 2024-04-02 18:49:35 +08:00
joylink_fanyuhong
9506b238f2 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m3s
Details
2024-04-02 18:19:37 +08:00
joylink_fanyuhong
a4ace6ca8f 环境变量测试 2024-04-02 18:18:39 +08:00
joylink_fanyuhong
309d97d9c8 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m59s
Details
2024-04-02 18:13:50 +08:00
joylink_fanyuhong
d5dff582b2 环境变量测试 2024-04-02 18:13:21 +08:00
joylink_fanyuhong
f12655546a 环境变量测试 2024-04-02 18:12:59 +08:00
joylink_fanyuhong
fbd936ab69 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m32s
Details
2024-04-02 17:49:00 +08:00
joylink_fanyuhong
707c50aa0b 环境变量测试 2024-04-02 17:48:09 +08:00
joylink_fanyuhong
82cce6d4dc Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m34s
Details
2024-04-02 17:37:05 +08:00
joylink_fanyuhong
f7895a6ac7 local-test环境变量调整 2024-04-02 17:36:24 +08:00
joylink_zhaoerwei
a3c639b414 根据段数动态生成洗车机继电器（考虑3段以上情况） 2024-04-02 16:37:47 +08:00
joylink_fanyuhong
22f0e49845 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m54s
Details 
# Conflicts:
#	src/protos/stationLayoutGraphics.ts
 2024-04-02 16:01:23 +08:00
joylink_fanyuhong
a07c75db68 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-04-02 15:59:22 +08:00
joylink_fanyuhong
2fcab2d9e9 洗车机操作状态调整 2024-04-02 15:59:19 +08:00
joylink_zhaoerwei
82754e40d9 根据段数动态生成洗车机继电器 2024-04-02 14:43:14 +08:00
joylink_zhaoerwei
107f3e50d9 执行proto 2024-04-02 14:25:37 +08:00
joylink_fanyuhong
bc6501efed Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m28s
Details 
# Conflicts:
#	src/protos/stationLayoutGraphics.ts
 2024-04-02 11:35:02 +08:00
joylink_fanyuhong
d3e57cc444 同步 2024-04-02 11:33:17 +08:00
joylink_fanyuhong
5910740c65 洗车机添加属性 2024-04-02 11:30:45 +08:00
joylink_zhaoerwei
b75bc9b9f0 列车驾驶台交互暂提 2024-04-02 10:47:40 +08:00
joylink_zhaoerwei
b5448207ba Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m25s
Details 
commit a474415b9d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Mar 29 18:34:36 2024 +0800

    防淹门生成继电器和关联集中站
 2024-03-29 18:39:39 +08:00
joylink_zhaoerwei
a474415b9d 防淹门生成继电器和关联集中站 2024-03-29 18:34:36 +08:00
joylink_fanyuhong
737e671e15 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m2s
Details
2024-03-29 17:31:37 +08:00
joylink_fanyuhong
9c9a4b4ccf 取消lossState状态&防淹门调整 2024-03-29 17:29:01 +08:00
joylink_zhaoerwei
8e8b0fc42d 注掉old相关字段 2024-03-29 15:18:31 +08:00
joylink_fanyuhong
6e80d2da85 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-03-28 11:16:03 +08:00
joylink_fanyuhong
9e6c007377 防淹门调整 2024-03-28 11:16:00 +08:00
joylink_zhaoerwei
1afcff6071 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m56s
Details 
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