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 |
|
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
CI / Docker-Build (push) Successful in 2m28s
# 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:
CI / Docker-Build (push) Successful in 2m25s
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
CI / Docker-Build (push) Successful in 2m2s
|
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:
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
|
e964b8bf27
|
道岔编辑修改
|
2024-03-28 09:58:05 +08:00 |
|
joylink_fanyuhong
|
dcd7f3322c
|
防淹门调整
|
2024-03-28 09:22:06 +08:00 |
|
joylink_fanyuhong
|
7d2a1be457
|
车库门调整暂提
|
2024-03-28 09:19:15 +08:00 |
|
joylink_fanyuhong
|
3fb3eb8135
|
Merge branch 'develop' of http://120.46.212.6:3000/joylink/rts-sim-testing-client into develop
|
2024-03-27 17:20:34 +08:00 |
|
joylink_fanyuhong
|
d9b5841cfb
|
车库门状态显示调整
|
2024-03-27 17:20:17 +08:00 |
|
joylink_zhaoerwei
|
e9479ac1ff
|
Squashed commit of the following:
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_zhaoerwei
|
5210c9d9cd
|
屏蔽门右键bug
|
2024-03-27 17:04:26 +08:00 |
|
joylink_fanyuhong
|
1ac34663fb
|
Merge remote-tracking branch 'origin/develop' into local-test
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
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
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
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:
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 |
|