joylink_cuiweidong
|
7f7318814c
|
北京一号线 现地 取消进路 信号重开步骤代码调整
|
2020-04-13 18:43:50 +08:00 |
|
fan
|
319d458ca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:31:38 +08:00 |
|
fan
|
b7e6b9a8c1
|
佛山运行图导入上行时间调整&西安二号线车站调整
|
2020-04-13 18:30:21 +08:00 |
|
joylink_cuiweidong
|
be187cf1b3
|
北京一号线 操作定义 代码调整
|
2020-04-13 17:57:10 +08:00 |
|
fan
|
20491dac81
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:13:52 +08:00 |
|
fan
|
f91c8e37d2
|
佛山运行图导入参数调整&西安二号线车站调整
|
2020-04-13 17:12:33 +08:00 |
|
zyy
|
2dc975ef7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:04:01 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
joylink_cuiweidong
|
db93886f7e
|
哈尔滨线路 实训操作代码调整
|
2020-04-13 16:29:39 +08:00 |
|
joylink_cuiweidong
|
8475870cf8
|
哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整
|
2020-04-13 14:54:35 +08:00 |
|
joylink_cuiweidong
|
ccf028e5bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 13:08:30 +08:00 |
|
joylink_cuiweidong
|
e083015580
|
西安二号线 屏蔽门和站台的状态代码调整
|
2020-04-13 13:08:17 +08:00 |
|
fan
|
626e7f701f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 10:44:16 +08:00 |
|
fan
|
472dd1b62a
|
佛山运行图导入校验调整&西安二号线车站调整
|
2020-04-13 10:43:02 +08:00 |
|
joylink_cuiweidong
|
fe41d48a73
|
旧版课程 实训定义 代码调整
|
2020-04-13 10:37:47 +08:00 |
|
joylink_cuiweidong
|
4cc24e3cd2
|
课程章节分页代码调整
|
2020-04-13 10:05:09 +08:00 |
|
joylink_zyy
|
826504d9c7
|
调整考试系统哈尔滨 现地不能操作
|
2020-04-11 11:20:22 +08:00 |
|
joylink_zyy
|
5296521a9c
|
调整实训平台哈尔滨现地操作不能触发
|
2020-04-10 21:46:23 +08:00 |
|
joylink_fanyuhong
|
f6be5ef329
|
试卷规则调整
|
2020-04-10 20:46:17 +08:00 |
|
fan
|
bcee763b85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 19:21:19 +08:00 |
|
fan
|
528aa24bd0
|
实训添加页面调整
|
2020-04-10 19:19:55 +08:00 |
|
joylink_cuiweidong
|
98c6736c17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 19:14:36 +08:00 |
|
joylink_cuiweidong
|
43c7f2c094
|
哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理
|
2020-04-10 18:59:50 +08:00 |
|
sunzhenyu
|
2b0ee65a67
|
新数据三维区段模型自动生成修改，哈尔滨背景模型修改
|
2020-04-10 18:55:06 +08:00 |
|
fan
|
78d2271d2d
|
实训课程编辑路由调整
|
2020-04-10 17:54:24 +08:00 |
|
fan
|
08d02e9563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-10 17:51:36 +08:00 |
|
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 |
|