Commit Graph

13791 Commits

Author SHA1 Message Date
joylink_fanyuhong
b85e8c0074 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m36s
2024-09-10 16:21:30 +08:00
joylink_fanyuhong
eff99d3609 成工院大铁标准站区故解连续操作问题 2024-09-10 16:21:03 +08:00
joylink_fanyuhong
0212e1af47 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 3m46s
2024-09-10 12:15:53 +08:00
joylink_fanyuhong
45fbdf0dd7 设备柜 atp切除状态同步 2024-09-10 12:01:14 +08:00
joylink_fanyuhong
f6d4cfb665 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m8s
2024-09-10 10:38:22 +08:00
joylink_fanyuhong
9045d2a118 司机驾驶切除ATP调整 2024-09-10 10:37:45 +08:00
joylink_fanyuhong
bb4d6ef7e9 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 14m47s
2024-08-20 15:17:57 +08:00
joylink_fanyuhong
10e27697fb 代码调整 2024-08-20 15:16:56 +08:00
joylink_fanyuhong
acf3109c0b 添加ats客户端 只能操作特殊操作 2024-08-20 15:13:45 +08:00
joylink_fanyuhong
3590705238 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 9m45s
2024-08-16 23:09:55 +08:00
joylink_fanyuhong
2b8116afd3 现地客户端列车显示问题调整 2024-08-16 23:09:34 +08:00
joylink_fanyuhong
4a424cfb7f Merge branch 'develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m36s
2024-08-15 15:37:10 +08:00
joylink_fanyuhong
f66844bc27 实训调整 2024-08-15 15:35:43 +08:00
joylink_fanyuhong
26301345e7 Revert "成都工院统计页面"
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 12m41s
This reverts commit 399fb47f
2024-08-15 13:37:23 +08:00
joylink_fanyuhong
399fb47f67 成都工院统计页面
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Has been cancelled
2024-08-15 13:34:38 +08:00
joylink_fanyuhong
25f94a4a57 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 3m5s
2024-06-28 14:04:50 +08:00
joylink_fanyuhong
364bd1e539 tms订阅调整 2024-06-28 14:04:27 +08:00
joylink_fanyuhong
d2e6fe2d52 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m49s
2024-06-25 10:02:50 +08:00
joylink_fanyuhong
0c4c5bebb0 运行图编制问题调整 2024-06-24 19:40:07 +08:00
joylink_fanyuhong
22a2e11517 发布信息提示 2024-06-24 18:43:00 +08:00
joylink_fanyuhong
4841ebdda7 TMS切换客户端调整 2024-06-24 18:20:30 +08:00
joylink_fanyuhong
74b08651a2 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 6m59s
2024-06-18 15:37:41 +08:00
joylink_fanyuhong
916bc645ed 添加运行图测试客户端 2024-06-18 15:36:57 +08:00
joylink_fanyuhong
37e0779d23 成都工业学院第三方新开页面关闭调整 2024-06-04 11:42:34 +08:00
joylink_fanyuhong
081d5bf630 成都工业学院登录调整 2024-06-04 11:17:37 +08:00
joylink_fanyuhong
1909e9397c 成都工业学院登录调整
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m2s
2024-06-04 11:14:54 +08:00
joylink_zhaoerwei
1b0ddc2740 Squashed commit of the following:
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m33s
commit cef55a4c6b
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 17:09:01 2024 +0800

    三维url调整

commit 869c86b94d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 16:57:01 2024 +0800

    更改三维地址

commit dc2165733e
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 16:33:48 2024 +0800

    场景添加三维场景,实训中可根据url打开三维场景(待测试)
2024-05-27 17:39:39 +08:00
joylink_zhaoerwei
cef55a4c6b 三维url调整 2024-05-27 17:09:01 +08:00
joylink_zhaoerwei
869c86b94d 更改三维地址 2024-05-27 16:57:01 +08:00
joylink_zhaoerwei
dc2165733e 场景添加三维场景,实训中可根据url打开三维场景(待测试) 2024-05-27 16:33:48 +08:00
joylink_fanyuhong
7d774db362 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m20s
2024-05-21 16:48:35 +08:00
joylink_fanyuhong
0c5bba7c0f 传输信号机调整 2024-05-21 16:47:37 +08:00
joylink_fanyuhong
ef9165faa4 third 2024-05-16 15:43:56 +08:00
joylink_fanyuhong
ae74123f18 成都工学院第三方登录调整 2024-05-08 09:17:37 +08:00
joylink_fanyuhong
b1baeaabcd 成都工业学院第三方登录调整 2024-05-07 15:46:29 +08:00
joylink_fanyuhong
b66515ebad Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 2m37s
2024-04-24 11:01:32 +08:00
joylink_fanyuhong
91a8410dc2 道岔名称背景颜色更换透明色 2024-04-24 11:00:44 +08:00
joylink_fanyuhong
5cf57c4d2f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m14s
2024-04-22 17:16:40 +08:00
joylink_fanyuhong
c97def5fca 没有综合演练不显示联机
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m34s
2024-04-22 17:15:20 +08:00
joylink_fanyuhong
5ca4f2be8d Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m24s
2024-04-22 16:10:23 +08:00
joylink_fanyuhong
31376bc221 道岔钩锁调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m29s
2024-04-22 16:09:03 +08:00
joylink_fanyuhong
66a3762987 Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m58s
2024-04-22 15:53:54 +08:00
joylink_fanyuhong
5be2cea1ca 列车pis和站台pis调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m30s
2024-04-22 15:52:58 +08:00
joylink_fanyuhong
9dab09e4d0 Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m1s
2024-04-22 09:33:42 +08:00
joylink_fanyuhong
dda44c870f pa客户端车站选择禁用
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m54s
2024-04-22 09:31:41 +08:00
joylink_fanyuhong
b8f90509eb Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 4m9s
2024-04-21 17:51:33 +08:00
joylink_fanyuhong
5548806ea5 pa客户端调整&标准线未开放调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m54s
2024-04-21 17:49:03 +08:00
joylink_fanyuhong
26d9cc892f Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 12m39s
2024-04-19 22:27:07 +08:00
fan
3fc31777a2 iscs退出仿真调整&iscs绘制地图调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 14m22s
2024-04-19 22:26:30 +08:00
fan
ce8d3f4531 iscs退出仿真调整&iscs绘制地图调整
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Has been cancelled
2024-04-19 22:25:43 +08:00