Commit Graph

8434 Commits

Author SHA1 Message Date
fan
056570c096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:18:42 +08:00
fan
76f9db3eb6 留言板添加至新标签页
(cherry picked from commit a509af1e09)
2020-11-27 14:17:54 +08:00
zyy
eabb4b8782 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:15:32 +08:00
zyy
6b8bfffd21 调整限速实训流程 2020-11-27 14:15:19 +08:00
joylink_cuiweidong
90ec120603 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:05:28 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
sunzhenyu
c3a8ab7929 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:00:05 +08:00
sunzhenyu
c2f2698092 修改三维客流窗口操作 2020-11-27 13:59:54 +08:00
zyy
032c3036b8 调整国赛系统样式名称 2020-11-27 09:22:25 +08:00
joylink_cuiweidong
1f7c3f3bf7 宁波一号线 人解进路更换指令(之前为信号机取消引导,换为人解进路) 2020-11-26 18:52:53 +08:00
joylink_cuiweidong
3132506382 宁波一号线 取消进路 指令 换成 总取消 2020-11-26 18:21:57 +08:00
joylink_cuiweidong
2dad05d63f 福州一号线 西安三号线 实训定义代码调整 2020-11-26 17:22:49 +08:00
joylink_cuiweidong
00e60e877c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 16:43:23 +08:00
joylink_cuiweidong
d1eec65783 西安三号线 福州一号线 实训定义代码调整 2020-11-26 16:43:00 +08:00
sunzhenyu
9794e37274 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:52:58 +08:00
fan
43c0de245d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:54:58 +08:00
fan
5abdfc9883 哈尔滨操作调整 2020-11-26 14:54:37 +08:00
sunzhenyu
3dba656827 修复三维客流列车初始画面更新人物显示 2020-11-26 14:47:40 +08:00
joylink_cuiweidong
17e5f13202 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:39:15 +08:00
joylink_cuiweidong
5d02a56646 福州线路新版 操作调整 2020-11-26 14:37:48 +08:00
fan
b98ab0ae4b merge 2020-11-26 14:27:45 +08:00
fan
8b8b5bd028 哈尔滨操作调整 2020-11-26 14:26:35 +08:00
joylink_cuiweidong
c6ec7c9049 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 11:15:42 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
sunzhenyu
e56cc5f146 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 10:24:36 +08:00
sunzhenyu
ec5d118b80 修改三维通号故障内容初始化 2020-11-26 10:24:26 +08:00
sunzhenyu
d82ec7e6c0 修改三维通号故障内容 2020-11-26 10:21:59 +08:00
fan
a84120c2e5 语音路径调整 2020-11-26 09:33:30 +08:00
fan
78c04585a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-11-26 09:09:45 +08:00
fan
dbc807d703 语音路径调整 2020-11-26 09:09:18 +08:00
fan
10d8b674b4 哈尔滨操作调整 2020-11-25 18:41:35 +08:00
joylink_cuiweidong
a5dad072ca 实训平台代码调整 2020-11-25 18:28:20 +08:00
joylink_cuiweidong
10c007e9cf 福州一号线/西安三号线 实训定义调整 2020-11-25 17:32:07 +08:00
joylink_cuiweidong
2732e60a94 教学系统 实训代码调整 2020-11-25 15:52:52 +08:00
joylink_cuiweidong
1949d81cac 实训平台代码调整 2020-11-25 15:08:18 +08:00
joylink_cuiweidong
8c054f492f 实训平台 代码调整 2020-11-25 13:31:36 +08:00
fan
7e0c3696ab 地图发布管理导入数据后重置table数据 2020-11-25 11:20:55 +08:00
fan
9ef4299527 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-25 10:29:14 +08:00
fan
dad52de123 发布地图管理编辑信息添加数据版本 2020-11-25 10:28:47 +08:00
joylink_cuiweidong
e355191291 教学系统 实训代码调整 2020-11-25 09:45:59 +08:00
joylink_cuiweidong
b99f0d7551 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 19:17:27 +08:00
joylink_cuiweidong
c7a98096a2 教学系统 代码调整 2020-11-24 19:17:10 +08:00
fan
31c0a1f466 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:28:31 +08:00
fan
db9bcd0cc1 进入iscs路径添加lineCode 2020-11-24 18:28:15 +08:00
joylink_cuiweidong
8388bf42b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:07:45 +08:00
joylink_cuiweidong
275b44e056 北交大 客流仿真 提示添加 2020-11-24 18:07:09 +08:00
fan
a69d3b45a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:01:07 +08:00
fan
345b676cbc 调整登录错误码 2020-11-24 17:48:36 +08:00
zyy
e249c344eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:35:27 +08:00
zyy
9ba73cbb77 调整哈尔滨综合监控数据 2020-11-24 17:35:14 +08:00