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

1302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fan
275fa685ef Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m47s
Details
2024-04-19 20:38:15 +08:00
fan
eaf84b5fe6 dialog调整 2024-04-19 20:38:01 +08:00
fan
19a3adebcb Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m26s
Details
2024-04-18 13:35:07 +08:00
fan
e5336ed74e 列车参数设置调整 2024-04-18 13:34:55 +08:00
fan
a3b618945f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m25s
Details
2024-04-16 17:53:09 +08:00
fan
e379b58871 列车连接调整 2024-04-16 17:52:54 +08:00
fan
ed3eb8926e Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 3m51s
Details
2024-04-16 16:33:25 +08:00
fan
a4c4ae1ab3 列车连接调整 2024-04-16 16:32:39 +08:00
fan
0b0daba16e draggabelDialog调整暂提 2024-04-12 17:52:56 +08:00
joylink_zhaoerwei
2d24b69694 第三方连接加个列车PC仿真 2024-04-12 10:03:56 +08:00
joylink_fanyuhong
a3485c94f7 列车添加载荷参数 2024-04-11 17:18:44 +08:00
joylink_fanyuhong
1621380e85 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 1m48s
Details
2024-04-11 15:37:31 +08:00
joylink_fanyuhong
870856f3d7 diglog调整 2024-04-11 15:36:41 +08:00
joylink_zhaoerwei
cbe419e516 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 1m53s
Details 
commit 0330c00cbc
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Apr 9 10:33:17 2024 +0800

    钥匙交互传参修改

commit 4c9a9b29b7
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Apr 9 10:28:37 2024 +0800

    驾驶台弹框调整

commit d726b1ac76
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Apr 9 10:08:21 2024 +0800

    所有弹框点击界面不关闭弹框
 2024-04-09 10:35:11 +08:00
joylink_zhaoerwei
0330c00cbc 钥匙交互传参修改 2024-04-09 10:33:17 +08:00
joylink_zhaoerwei
4c9a9b29b7 驾驶台弹框调整 2024-04-09 10:28:37 +08:00
joylink_zhaoerwei
d726b1ac76 所有弹框点击界面不关闭弹框 2024-04-09 10:08:21 +08:00
joylink_fanyuhong
c9a6d91832 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 1m51s
Details
2024-04-08 15:31:23 +08:00
joylink_fanyuhong
f810b63589 列车添加取消连接选项 2024-04-08 15:29:07 +08:00
joylink_fanyuhong
13338610e5 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 1m45s
Details
2024-04-08 08:32:15 +08:00
joylink_fanyuhong
6ec566d7ce Merge remote-tracking branch 'origin/develop' into local-test 2024-04-08 08:24:05 +08:00
joylink_fanyuhong
2f0ab96b68 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-04-07 17:54:36 +08:00
joylink_fanyuhong
fde31acc72 代码调整 2024-04-07 17:54:31 +08:00
joylink_zhaoerwei
ce8c842f74 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m25s
Details 
commit 85a5ad1d35
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Sun Apr 7 10:59:07 2024 +0800

    列车驾驶台调整--改变位置后调接口
 2024-04-07 11:00:16 +08:00
joylink_zhaoerwei
85a5ad1d35 列车驾驶台调整--改变位置后调接口 2024-04-07 10:59:07 +08:00
joylink_fanyuhong
4624e3f2d4 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m39s
Details
2024-04-07 09:58:13 +08:00
joylink_fanyuhong
5f7c04ee99 洗车机调整 2024-04-07 09:55:52 +08:00
joylink_fanyuhong
4b02850488 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 16:47:36 +08:00
joylink_fanyuhong
c26f35e008 Merge remote-tracking branch 'origin/develop' into local-test 
# Conflicts:
#	src/protos/stationLayoutGraphics.ts
 2024-04-03 16:46:12 +08:00
joylink_fanyuhong
7c8bd92030 删除日志&洗车机调整 2024-04-03 16:43:53 +08:00
joylink_fanyuhong
bdcd3ac6b2 Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-04-03 16:37:14 +08:00
joylink_zhaoerwei
1c99ed9b50 执行protoc 2024-04-03 16:36:39 +08:00
joylink_fanyuhong
be50562f0e 车库门防淹门状态调整 2024-04-03 16:36:01 +08:00
joylink_fanyuhong
2517ab5e8d Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop 2024-04-03 15:22:53 +08:00
joylink_fanyuhong
f4ed04eed3 洗车机显示调整 2024-04-03 15:22:50 +08:00
joylink_zhaoerwei
f6852212d8 Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m26s
Details 
commit bd73f65860
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Apr 3 14:56:06 2024 +0800

    列车驾驶台交互优化

commit e894f02e38
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Apr 3 11:17:12 2024 +0800

    列车驾驶台交互调整
 2024-04-03 14:58:36 +08:00
joylink_zhaoerwei
bd73f65860 列车驾驶台交互优化 2024-04-03 14:56:06 +08:00
joylink_zhaoerwei
e894f02e38 列车驾驶台交互调整 2024-04-03 11:17:12 +08:00
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