zyy
|
e480de2dc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 15:24:58 +08:00 |
|
zyy
|
d15328de57
|
调整地图绘制流程
|
2020-07-31 15:24:44 +08:00 |
|
fan
|
65d25678db
|
plc网关配置调整&考试试卷问题调整
|
2020-07-31 10:37:50 +08:00 |
|
joylink_cuiweidong
|
35dba1b27b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 19:00:24 +08:00 |
|
joylink_cuiweidong
|
329b3efef3
|
宁波一号线 站遥控 控制权转移代码调整
|
2020-07-30 18:59:48 +08:00 |
|
zyy
|
ea333e6c6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 18:42:54 +08:00 |
|
zyy
|
f1d72d0968
|
调整综合演练流程
|
2020-07-30 18:42:41 +08:00 |
|
sunzhenyu
|
85e1c63a8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 18:25:40 +08:00 |
|
sunzhenyu
|
d95b41adef
|
修改三维vr案例站台模型
|
2020-07-30 18:25:28 +08:00 |
|
zyy
|
a7144dd4da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 17:49:34 +08:00 |
|
zyy
|
e4c20b1bf8
|
调整老版地图绘制文件位置
|
2020-07-30 17:49:20 +08:00 |
|
sunzhenyu
|
f333d7367d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 16:57:26 +08:00 |
|
sunzhenyu
|
e721fe80a3
|
修改三维vr转辙机案例模型贴图gui面板
|
2020-07-30 16:57:18 +08:00 |
|
joylink_cuiweidong
|
8663a4fba0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 16:45:22 +08:00 |
|
joylink_cuiweidong
|
c2c3fc0b22
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 16:44:41 +08:00 |
|
fan
|
0a7d3d97bd
|
调整剧本会话@
|
2020-07-30 16:33:08 +08:00 |
|
fan
|
71d3ff5d87
|
调整驾驶终端进入跳转
|
2020-07-30 15:58:28 +08:00 |
|
joylink_cuiweidong
|
50f4b1a0f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:38:47 +08:00 |
|
joylink_cuiweidong
|
0da1fc09e8
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 15:37:49 +08:00 |
|
zyy
|
c85139fe48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:32:54 +08:00 |
|
zyy
|
48491044ce
|
调整列表样式
|
2020-07-30 15:32:39 +08:00 |
|
sunzhenyu
|
3990b41cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:12:23 +08:00 |
|
zyy
|
1ed90362c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 15:10:26 +08:00 |
|
sunzhenyu
|
b8b3292e37
|
merge
|
2020-07-30 15:10:17 +08:00 |
|
zyy
|
a6feabd406
|
调整地图绘制逻辑
|
2020-07-30 15:10:10 +08:00 |
|
sunzhenyu
|
ef09632c8b
|
新增三维通号VR测试场景
|
2020-07-30 15:08:17 +08:00 |
|
fan
|
955ad3a89d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 13:46:55 +08:00 |
|
fan
|
c15860b104
|
代码调整
|
2020-07-30 13:43:00 +08:00 |
|
joylink_cuiweidong
|
2408797a04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 11:09:25 +08:00 |
|
joylink_cuiweidong
|
31a2854a15
|
运行图预览运行列车颜色代码调整
|
2020-07-30 11:08:59 +08:00 |
|
zyy
|
a229051584
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-30 10:03:14 +08:00 |
|
zyy
|
33969bd5e8
|
调整哈尔滨站台操作
|
2020-07-30 10:03:00 +08:00 |
|
fan
|
c741783ea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 18:27:19 +08:00 |
|
fan
|
95e4479d04
|
考试设备定位调整
|
2020-07-29 18:26:58 +08:00 |
|
zyy
|
ef1fd94643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:41:32 +08:00 |
|
zyy
|
841946ce29
|
调整按钮样式
|
2020-07-29 17:41:19 +08:00 |
|
joylink_cuiweidong
|
652968bf1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:19:30 +08:00 |
|
joylink_cuiweidong
|
7e920993f4
|
宁波一号线控制权转换代码调整
|
2020-07-29 17:19:14 +08:00 |
|
zyy
|
0110502711
|
删除多余注释
|
2020-07-29 16:59:57 +08:00 |
|
fan
|
2648ed6a4a
|
仿真会话调整
|
2020-07-29 16:24:51 +08:00 |
|
zyy
|
e6551dd4a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 16:15:53 +08:00 |
|
zyy
|
480d98deb9
|
调整成员聊天样式
|
2020-07-29 16:15:39 +08:00 |
|
joylink_cuiweidong
|
b9f8e1d3ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 16:02:32 +08:00 |
|
joylink_cuiweidong
|
2ba34b5d0b
|
宁波一号线控制权转换代码调整
|
2020-07-29 16:02:14 +08:00 |
|
fan
|
33a8a17bc3
|
综合仿真按钮调整
|
2020-07-29 15:42:10 +08:00 |
|
fan
|
add4a4dc8b
|
仿真右下侧按钮调整
|
2020-07-29 14:40:16 +08:00 |
|
fan
|
7403c53baa
|
merge
|
2020-07-29 14:16:32 +08:00 |
|
fan
|
fff5acab5d
|
创建考试调整&路由replace调整
|
2020-07-29 14:14:34 +08:00 |
|
joylink_cuiweidong
|
40a7170f69
|
西安三号线宁波一号线 控制权菜单显示代码调整
|
2020-07-29 14:10:44 +08:00 |
|
joylink_cuiweidong
|
7ad5e06a07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
|
2020-07-29 13:59:48 +08:00 |
|