joylink_zhaoerwei
|
ce8c842f74
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m25s
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_fanyuhong
|
4624e3f2d4
|
Merge remote-tracking branch 'origin/develop' into local-test
CI / Docker-Build (push) Successful in 2m39s
|
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
CI / Docker-Build (push) Successful in 2m23s
|
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:
CI / Docker-Build (push) Successful in 2m26s
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
CI / Docker-Build (push) Waiting to run
|
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
CI / Docker-Build (push) Successful in 2m23s
|
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:
CI / Docker-Build (push) Successful in 2m29s
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
CI / Docker-Build (push) Successful in 2m27s
|
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
CI / Docker-Build (push) Successful in 2m27s
# 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
|
环境变量测试
CI / Docker-Build (push) Successful in 1m49s
|
2024-04-02 20:14:06 +08:00 |
|
joylink_fanyuhong
|
51719ee5cb
|
环境变量测试
CI / Docker-Build (push) Successful in 2m27s
|
2024-04-02 20:09:25 +08:00 |
|
joylink_fanyuhong
|
bde21fd2b4
|
环境变量测试
CI / Docker-Build (push) Successful in 1m51s
|
2024-04-02 20:05:50 +08:00 |
|
joylink_fanyuhong
|
9d00b2a912
|
环境变量测试
CI / Docker-Build (push) Successful in 2m24s
|
2024-04-02 19:57:55 +08:00 |
|
joylink_fanyuhong
|
dacf2650f6
|
环境变量测试
CI / Docker-Build (push) Successful in 2m28s
|
2024-04-02 19:53:26 +08:00 |
|
joylink_fanyuhong
|
9b0329787a
|
Merge remote-tracking branch 'origin/develop' into local-test
CI / Docker-Build (push) Successful in 2m26s
|
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
CI / Docker-Build (push) Successful in 2m2s
|
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
CI / Docker-Build (push) Successful in 3m3s
|
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
CI / Docker-Build (push) Successful in 2m59s
|
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
CI / Docker-Build (push) Successful in 2m32s
|
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
CI / Docker-Build (push) Successful in 2m34s
|
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
CI / Docker-Build (push) Successful in 2m54s
# 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 |
|