Commit Graph

4326 Commits

Author SHA1 Message Date
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
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