joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: joylink:develop
Branches Tags
joylink:master
joylink:develop
joylink:local-test
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest
...
pull from: joylink:master
Branches Tags
joylink:develop
joylink:local-test
joylink:master
joylink:test
joylink:zhengxiong
joylink:tes_0308
joylink:thailand
joylink:test_client
joylink:test_revert5.6
joylink:test-newChat
joylink:test_dispaly
joylink:test_0110
joylink:master_0109
joylink:test_eg2d
joylink:test_switch
joylink:test_conflictRoute
joylink:test_initData
joylink:test_thirdLogin
joylink:iscs
joylink:3dtest

14 Commits
develop ... master

Author SHA1 Message Date
joylink_fanyuhong
99fc3ffcfb Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m29s
Details
2024-09-30 14:35:00 +08:00
joylink_fanyuhong
4e37183818 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m37s
Details
2024-09-30 09:32:05 +08:00
joylink_fanyuhong
327533c003 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m23s
Details
2024-09-24 11:22:39 +08:00
joylink_fanyuhong
8a80a7d732 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m31s
Details
2024-09-24 11:11:40 +08:00
joylink_fanyuhong
8fbaa85b99 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s
Details
2024-09-19 09:10:22 +08:00
joylink_fanyuhong
f14d998f19 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m32s
Details
2024-09-14 13:58:04 +08:00
joylink_fanyuhong
a1c8b4f662 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m44s
Details
2024-09-13 09:27:49 +08:00
joylink_fanyuhong
60e7a09d69 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m4s
Details
2024-09-10 12:01:42 +08:00
joylink_fanyuhong
904434caf3 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m18s
Details
2024-09-10 10:47:00 +08:00
joylink_fanyuhong
1f9541eb31 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 13m8s
Details
2024-08-20 17:13:02 +08:00
joylink_fanyuhong
a21524b839 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m57s
Details
2024-08-19 18:42:03 +08:00
joylink_fanyuhong
478261512c Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m48s
Details
2024-08-16 09:59:38 +08:00
joylink_fanyuhong
0147f270f2 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m6s
Details
2024-06-18 15:56:31 +08:00
joylink_zhaoerwei
27418dc041 Squashed commit of the following:
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m24s
Details 
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
Show Stats Expand all files Collapse all files

Diff Content Not Available