Commit Graph

Select branches

Hide Pull Requests

3dtest

develop

iscs

local-test

master

master_0109

tes_0308

test

test-newChat

test_0110

test_client

test_conflictRoute

test_dispaly

test_eg2d

test_initData

test_revert5.6

test_switch

test_thirdLogin

thailand

zhengxiong

Mono Color

• 711534599f 修改代码 ival 2019-08-05 09:58:33 +0800
• 072495709a 调整：列车配置项结构调整 fan 2019-08-05 09:36:15 +0800
• 9f06837e48 修改jenkins发布路径 joylink_admin 2019-08-05 01:35:41 +0000
• ee16c35aaa 调整：standControl调整 fan 2019-08-05 08:42:45 +0800
• 1e6a5510ac 修改格式 ival 2019-08-02 18:09:25 +0800
• ad6e98da39 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-08-02 18:05:17 +0800
• 77db948f68 修改皮肤配置 ival 2019-08-02 18:05:08 +0800
• 9c51e10ec1 调整：皮肤调整 fan 2019-08-02 17:57:14 +0800
• e385704360 调整：代码修改 fan 2019-08-02 17:41:12 +0800
• 7dec924ac4 调整：代码修改 fan 2019-08-02 17:38:21 +0800
• ce5600c173 调整：代码修改 fan 2019-08-02 17:22:23 +0800
• b7e021d737 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 17:14:21 +0800
• af0fd392d1 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 17:14:02 +0800
• 44a1d197cb 调整：代码调整 fan 2019-08-02 17:06:37 +0800
• 803dd3f823 修改皮肤配置 ival 2019-08-02 17:02:43 +0800
• 33c71a20f6 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 16:31:49 +0800
• 347db0d6eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-08-02 14:55:02 +0800
• e64a26f621 修改eventBus大小问题 ival 2019-08-02 14:54:51 +0800
• 3ad9becbd8 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 14:38:27 +0800
• 02ba15964c 调整：代码调整 fan 2019-08-02 14:38:05 +0800
• 0b93d7ef16 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-08-02 14:32:42 +0800
• 4cf032df11 desc: 增加区段折返箭头代码 zyy 2019-08-02 14:31:29 +0800
• 0abe6e61e6 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 14:29:43 +0800
• b1db745ed6 修改 zc不显示 ival 2019-08-02 14:29:18 +0800
• 92bdbf7a99 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-08-02 14:26:58 +0800
• d68daaa837 调整：代码调整 fan 2019-08-02 14:26:50 +0800
• 543b05f848 修改配置 ival 2019-08-02 14:23:37 +0800
• dd5218dae5 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-08-02 14:19:06 +0800
• 60aa181598 修改皮肤配置 ival 2019-08-02 14:17:43 +0800
• 4ff4d812a9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-08-02 10:58:34 +0800
• a010f71252 调整运行图加载， eventbus代码调整 zyy 2019-08-02 10:58:28 +0800
• 7162f5ce42 调整：stationControl调整 fan 2019-08-02 10:39:59 +0800
• 04e13a7a73 调整代码 zyy 2019-08-02 10:36:17 +0800
• ff9e69585d desc: 调整剧本加载，删除城市注释 zyy 2019-08-01 15:19:24 +0800
• 4be4c87327 调整：福州control调整 fan 2019-08-01 09:57:29 +0800
• cba988e5d3 调整：仿真管理地图列表页调整 fan 2019-08-01 08:50:24 +0800
• 7bba3d49d6 desc: 修改代码 zyy 2019-07-31 19:09:45 +0800
• 5af196522e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-31 18:46:51 +0800
• 99bcfa56ac 修改代码 zyy 2019-07-31 18:46:37 +0800
• 0d379faf11 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-07-31 18:39:08 +0800
• a03798a748 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-07-31 18:38:29 +0800
• 0fc306714b 调整：control增加悬浮移出事件 fan 2019-07-31 18:24:28 +0800
• cfbb21b9bb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-31 18:20:39 +0800
• 1a44bfb002 修改代码 zyy 2019-07-31 18:19:15 +0800
• 871a9fbbe2 修改代码 ival 2019-07-31 15:54:20 +0800
• 3042cf229d 修改代码 ival 2019-07-31 14:59:38 +0800
• 1d18028d41 调整：福州列车从左往右不显示 fan 2019-07-31 13:56:44 +0800
• 5270c0bc2a 删除无用代码，增加信号机和站台鼠标代码 ival 2019-07-31 11:06:14 +0800
• 0157f32fc0 修改加载代码 ival 2019-07-31 09:13:37 +0800
• 851c0a4a6a desc: 修改代码 zyy 2019-07-30 18:45:32 +0800
• deccfc537a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-30 18:03:04 +0800
• 09285fb326 修改代码 zyy 2019-07-30 18:02:58 +0800
• 2919ae5a15 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-07-30 17:27:39 +0800
• dd4d83f02b 调整：代码调整 fan 2019-07-30 17:27:29 +0800
• b00bb22a8c 修改菜单状态控制 ival 2019-07-30 16:57:08 +0800
• 7a71fc42ae Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-30 16:47:22 +0800
• 276f68e7bc 修改优化代码 ival 2019-07-30 16:47:11 +0800
• 82c49c97e2 调整代码 zyy 2019-07-30 15:52:30 +0800
• 2099c6f8ba Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-30 13:30:33 +0800
• d65f7fb334 desc: 修改代码 zyy 2019-07-30 13:29:54 +0800
• 66b2406d91 修改回拉设置bug ival 2019-07-30 12:44:51 +0800
• 9152b6a55e 增加 Line 和 Text 设备移植，以及调试代码 ival 2019-07-30 12:37:31 +0800
• 5b4cbba9eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-30 09:48:23 +0800
• ce82f25422 修改代码 ival 2019-07-30 09:48:14 +0800
• d580c31e58 调整：table页form表头不生效 fan 2019-07-30 09:45:52 +0800
• 0742f9b633 修改操作 ival 2019-07-30 09:35:00 +0800
• a59d579d57 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-30 09:19:18 +0800
• ca433c2eb6 修改设备结构 ival 2019-07-30 09:18:24 +0800
• 4b69c12542 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient fan 2019-07-29 18:15:11 +0800
• 42caa08fc2 调整：跑图调整 fan 2019-07-29 18:11:33 +0800
• 33e6b6ab43 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-29 17:57:55 +0800
• c4a6b076da 修改菜单处理 ival 2019-07-29 17:57:00 +0800
• 5517f5a467 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-29 17:10:37 +0800
• 264eea1d78 修改 车站 道岔地图绘制 配置 zyy 2019-07-29 17:10:30 +0800
• cdccd7b41f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-29 16:03:27 +0800
• 05c90f1079 修改代码 ival 2019-07-29 16:03:14 +0800
• 4da098c1fd desc: 调整绘图数据 zyy 2019-07-29 15:49:28 +0800
• c05db4daed 调整格式 zyy 2019-07-29 15:30:11 +0800
• d5e5f3b644 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-29 15:24:04 +0800
• 00dc541830 调整配置代码 zyy 2019-07-29 15:23:55 +0800
• 9693c2a2f9 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-29 13:45:53 +0800
• 69ed6c5eea 处理菜单 ival 2019-07-29 13:45:38 +0800
• 1eb577a2ed 调整：代码修改 fan 2019-07-29 13:38:02 +0800
• b50fd1aae3 调整：代码修改 fan 2019-07-29 13:29:30 +0800
• ca01e0aeb7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-29 11:20:20 +0800
• 33442905be 修改道岔状态变化 ival 2019-07-29 11:18:50 +0800
• 9e8e5afe41 修改配置文件代码 zyy 2019-07-29 10:59:02 +0800
• c2400c07e1 desc: 增加区段配置 zyy 2019-07-29 10:20:18 +0800
• 10cd98fe6f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-29 09:27:49 +0800
• 21fd4ec516 修改区段状态变化 ival 2019-07-29 09:27:33 +0800
• 9241e91364 调整：列车问题调整 fan 2019-07-29 08:46:29 +0800
• a74053360d Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient ival 2019-07-26 18:54:52 +0800
• 02bd1e9d40 调试跑车 ival 2019-07-26 18:54:42 +0800
• a9127022fd Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-26 18:53:51 +0800
• 06c5c60364 desc: 增加section配置 zyy 2019-07-26 18:53:44 +0800
• ed01ac7180 修改代码 ival 2019-07-26 17:39:05 +0800
• 8f2712e3d8 修改代码 ival 2019-07-26 17:35:58 +0800
• ab86340524 修改列车跑车计算 ival 2019-07-26 17:18:27 +0800
• c161f19b1b 修改跑车 ival 2019-07-26 17:13:03 +0800
• 7be6ca66fc Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient zyy 2019-07-26 16:01:18 +0800