fan
|
b0797644f9
|
实训课程编辑调整&线二号线调整
|
2020-04-10 17:50:26 +08:00 |
|
zyy
|
2d70c294f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:24:12 +08:00 |
|
zyy
|
3bfb74d55b
|
调整绘图隐藏元素
|
2020-04-10 17:23:53 +08:00 |
|
sunzhenyu
|
8c3dd94cc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:55:00 +08:00 |
|
sunzhenyu
|
e51356c4aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:54:40 +08:00 |
|
joylink_cuiweidong
|
f0fc3712f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:54:34 +08:00 |
|
sunzhenyu
|
01842a7605
|
修改三维轨迹线显示
|
2020-04-10 16:54:32 +08:00 |
|
joylink_cuiweidong
|
c9f7a72d0b
|
代码调整
|
2020-04-10 16:54:17 +08:00 |
|
fan
|
26e9c33736
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:47:20 +08:00 |
|
fan
|
11586aef30
|
哈尔滨现地显示BUG调整&西安二号线皮肤调整
|
2020-04-10 16:45:41 +08:00 |
|
joylink_cuiweidong
|
8cc854e9db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:44:28 +08:00 |
|
joylink_cuiweidong
|
22d587a7a8
|
哈尔滨 行调 道岔操作 实训操作定义修改
|
2020-04-10 16:44:07 +08:00 |
|
zyy
|
74942486fd
|
Merge branch 'master' into test
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/index.vue
# src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
|
2020-04-10 16:43:40 +08:00 |
|
zyy
|
11eedc59ad
|
调整区段计算实际长度出现问题
|
2020-04-10 16:41:48 +08:00 |
|
zyy
|
f058795597
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:19:54 +08:00 |
|
zyy
|
057b627c0d
|
调整区段计算
|
2020-04-10 16:19:37 +08:00 |
|
sunzhenyu
|
8a1746e13f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 16:13:42 +08:00 |
|
sunzhenyu
|
ee0b0ba391
|
添加三维驾驶界面mmi站台，安全距离，行车登记，驾驶模式显示视图
|
2020-04-10 16:13:36 +08:00 |
|
joylink_cuiweidong
|
e3f5d5210b
|
代码调整
|
2020-04-10 16:00:38 +08:00 |
|
joylink_cuiweidong
|
4be8b2dd87
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 15:22:08 +08:00 |
|
joylink_cuiweidong
|
0133b3b5d9
|
代码调整
|
2020-04-10 15:21:46 +08:00 |
|
fan
|
165bde34ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:08:26 +08:00 |
|
fan
|
bb69f81e99
|
哈尔滨指令调整
|
2020-04-10 14:07:05 +08:00 |
|
joylink_cuiweidong
|
f0a4491cb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 14:05:37 +08:00 |
|
joylink_cuiweidong
|
e05057bf3f
|
宁波一号线 自动折返代码调整
|
2020-04-10 14:05:20 +08:00 |
|
fan
|
ec160a8df3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 13:27:58 +08:00 |
|
fan
|
c294e00d46
|
实训定义调整
|
2020-04-10 13:26:37 +08:00 |
|
zyy
|
48ca2388cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 11:20:04 +08:00 |
|
zyy
|
6c7cfe4648
|
调整逻辑区段重新生成及修改逻辑调整
|
2020-04-10 11:19:48 +08:00 |
|
fan
|
c1f6803fa5
|
宁波一号线:现地站台实训集中站显示切换切换问题
|
2020-04-10 11:05:20 +08:00 |
|
joylink_cuiweidong
|
9e45a0d342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:42:19 +08:00 |
|
joylink_cuiweidong
|
888ae6e936
|
宁波一号线 自动折返按钮实训操作代码调整
|
2020-04-10 10:41:41 +08:00 |
|
zyy
|
b4a2e19d77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:19:15 +08:00 |
|
fan
|
cf2d8f479d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 10:18:14 +08:00 |
|
zyy
|
bacb6a9484
|
Merge branch 'master' into test
|
2020-04-10 10:18:13 +08:00 |
|
zyy
|
76851cdff2
|
调整区段字段显隐控制条件
|
2020-04-10 10:17:34 +08:00 |
|
fan
|
162bd4c9f2
|
宁波一号线:实训问题调整
|
2020-04-10 10:16:58 +08:00 |
|
zyy
|
db7acfd6c7
|
调整区段字段显隐
|
2020-04-10 10:10:44 +08:00 |
|
fan
|
e6ad580824
|
宁波一号线： 查看站台信息=》站台详细信息，道岔单解/解封
|
2020-04-10 09:24:21 +08:00 |
|
fan
|
5c55261f55
|
本地导入调整
|
2020-04-10 09:09:06 +08:00 |
|
fan
|
9f5644ccc6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:57:03 +08:00 |
|
fan
|
1e4b7bbfd9
|
本地导入
|
2020-04-09 18:54:22 +08:00 |
|
joylink_cuiweidong
|
25fcebdc75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:52:09 +08:00 |
|
joylink_cuiweidong
|
4e9ccad9e5
|
代码调整
|
2020-04-09 18:51:51 +08:00 |
|
zyy
|
e519aee3e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:39:42 +08:00 |
|
zyy
|
9b68feaba5
|
调整区段字段显隐判断
|
2020-04-09 18:39:27 +08:00 |
|
fan
|
991fa86ede
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 18:23:35 +08:00 |
|
fan
|
7e0834b13a
|
代码哈尔滨实训数据&本地导入导出
|
2020-04-09 18:22:10 +08:00 |
|
zyy
|
ced7cb91b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 17:37:41 +08:00 |
|
zyy
|
289f1dbff0
|
调整现地列车显示
|
2020-04-09 17:37:27 +08:00 |
|