Commit Graph

13801 Commits

Author SHA1 Message Date
joylink_fanyuhong
99fc3ffcfb Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m29s
2024-09-30 14:35:00 +08:00
joylink_fanyuhong
0d34d83747 现地工作站添加运行图加载 2024-09-30 14:33:11 +08:00
joylink_fanyuhong
4e37183818 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m37s
2024-09-30 09:32:05 +08:00
joylink_fanyuhong
92c66ab4d6 画面管理处理设备map为空 2024-09-29 14:11:41 +08:00
joylink_fanyuhong
5a7c5fdbeb 成都三号线折返进路办理调整 2024-09-29 14:11:09 +08:00
joylink_fanyuhong
ae826ac205 成都三号线折返进路排列调整 2024-09-27 11:03:20 +08:00
joylink_fanyuhong
84b9f52c8f 信号重启逻辑判断调整 2024-09-26 19:34:02 +08:00
joylink_fanyuhong
526fd047e7 成都三设备样式调整 2024-09-26 18:12:26 +08:00
joylink_fanyuhong
529c122278 成都三号线添加站后折返操作 2024-09-26 17:54:59 +08:00
joylink_fanyuhong
5b1362f94b 成都三号线现地仿真操作控制权判断调整 2024-09-26 16:10:09 +08:00
joylink_fanyuhong
2d1da55ffc 草稿地图成员一键生成添加派班员 2024-09-26 15:15:44 +08:00
joylink_fanyuhong
97e121a65a 成都三号线连锁控调整 2024-09-26 13:42:03 +08:00
joylink_fanyuhong
327533c003 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m23s
2024-09-24 11:22:39 +08:00
joylink_fanyuhong
e9a71a1116 成都三号线调整 2024-09-24 11:22:16 +08:00
joylink_fanyuhong
8a80a7d732 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m31s
2024-09-24 11:11:40 +08:00
joylink_fanyuhong
cbdfc57243 成都三号线现地仿真无特殊操作调整 2024-09-24 10:59:08 +08:00
joylink_fanyuhong
8fbaa85b99 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s
2024-09-19 09:10:22 +08:00
joylink_fanyuhong
5c81fc4dcf 实训测验统计得分调整 2024-09-18 14:00:17 +08:00
joylink_fanyuhong
b0ef9e5242 实训总分统计调整 2024-09-18 13:30:36 +08:00
joylink_fanyuhong
f14d998f19 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m32s
2024-09-14 13:58:04 +08:00
joylink_fanyuhong
f2efa437df 实训消失问题调整2 2024-09-14 13:50:40 +08:00
joylink_fanyuhong
32430607dd 实训提示消失问题调整 2024-09-14 11:30:31 +08:00
joylink_fanyuhong
a1c8b4f662 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m44s
2024-09-13 09:27:49 +08:00
joylink_fanyuhong
954ee991fa 实训列表调整 2024-09-11 13:44:23 +08:00
joylink_fanyuhong
13f16e5570 f仿真重置后清楚区故解连续操作状态 2024-09-11 11:18:26 +08:00
joylink_fanyuhong
5470a32bb7 成工院大铁标准线实训测验模式结束后弹出的结果优化 2024-09-11 09:37:17 +08:00
joylink_fanyuhong
eff99d3609 成工院大铁标准站区故解连续操作问题 2024-09-10 16:21:03 +08:00
joylink_fanyuhong
60e7a09d69 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m4s
2024-09-10 12:01:42 +08:00
joylink_fanyuhong
45fbdf0dd7 设备柜 atp切除状态同步 2024-09-10 12:01:14 +08:00
joylink_fanyuhong
904434caf3 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m18s
2024-09-10 10:47:00 +08:00
joylink_fanyuhong
9045d2a118 司机驾驶切除ATP调整 2024-09-10 10:37:45 +08:00
joylink_fanyuhong
1f9541eb31 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 13m8s
2024-08-20 17:13:02 +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
a21524b839 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m57s
2024-08-19 18:42:03 +08:00
joylink_fanyuhong
2b8116afd3 现地客户端列车显示问题调整 2024-08-16 23:09:34 +08:00
joylink_fanyuhong
478261512c Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m48s
2024-08-16 09:59:38 +08:00
joylink_fanyuhong
f66844bc27 实训调整 2024-08-15 15:35:43 +08:00
joylink_fanyuhong
364bd1e539 tms订阅调整 2024-06-28 14:04:27 +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
0147f270f2 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m6s
2024-06-18 15:56:31 +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_zhaoerwei
27418dc041 Squashed commit of the following:
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m24s
commit 1b0ddc2740
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 17:39:39 2024 +0800

    Squashed commit of the following:

    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打开三维场景(待测试)

commit 7d774db362
Merge: b66515eba 0c5bba7c0
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:48:35 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 0c5bba7c0f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:47:37 2024 +0800

    传输信号机调整

commit ef9165faa4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu May 16 15:43:56 2024 +0800

    third

commit ae74123f18
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed May 8 09:17:37 2024 +0800

    成都工学院第三方登录调整

commit b1baeaabcd
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 7 15:46:29 2024 +0800

    成都工业学院第三方登录调整

commit b66515ebad
Merge: 5cf57c4d2 91a8410dc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 11:01:32 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 91a8410dc2
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 10:58:02 2024 +0800

    道岔名称背景颜色更换透明色

commit 5cf57c4d2f
Merge: 5ca4f2be8 c97def5fc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 17:16:40 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 5ca4f2be8d
Merge: 66a376298 31376bc22
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 16:10:23 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 66a3762987
Merge: 9dab09e4d 5be2cea1c
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 15:53:54 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 9dab09e4d0
Merge: b8f90509e dda44c870
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 09:33:42 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit b8f90509eb
Merge: 26d9cc892 5548806ea
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Sun Apr 21 17:51:33 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 26d9cc892f
Merge: ce8d3f453 3fc31777a
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Apr 19 22:27:07 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit ce8d3f4531
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 22:25:43 2024 +0800

    iscs退出仿真调整&iscs绘制地图调整

commit 98662ec177
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 18:25:09 2024 +0800

    实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode
2024-05-27 18:06:53 +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