Commit Graph

443 Commits

Author SHA1 Message Date
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
fan
d82b89b57e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:32:00 +08:00
fan
a1c4a901af 实训步骤生成 2020-04-07 18:30:46 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
zyy
f26eea8f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:19:34 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
joylink_cuiweidong
2853eb04fd 宁波线路实训操作代码调整 2020-04-07 15:25:33 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
fan
75bb1f315e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:32:49 +08:00
fan
64401f7085 宁波设置通过模式时为止偏移 2020-04-03 18:31:38 +08:00
zyy
0a6f32d6b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:09:23 +08:00
zyy
da896de45b 调整进路流程,定义 2020-04-03 18:09:07 +08:00
fan
1e19840405 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 17:45:44 +08:00
fan
5f7804f090 佛山运行图导入 2020-04-03 17:44:17 +08:00
fan
255ab83233 佛山运行图导入 2020-04-03 17:40:18 +08:00
joylink_cuiweidong
bab89c4bae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 14:44:08 +08:00
joylink_cuiweidong
f323651087 北京一号线现地行调操作步骤调整 2020-04-03 14:43:54 +08:00
fan
62131c2166 成都三实训调整 2020-04-03 13:08:06 +08:00
joylink_cuiweidong
e5067edcce 北京一号线区段操作步骤代码调整 2020-04-02 18:57:04 +08:00
fan
97eca75407 哈尔滨实训 2020-04-02 17:51:59 +08:00
joylink_cuiweidong
e273b1be18 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-02 16:16:56 +08:00
joylink_cuiweidong
5874d8f665 北京一号线操作步骤调整 2020-04-02 16:16:45 +08:00
zyy
8fdd0d27bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/cmdPlugin/ValidateHandler.js
2020-04-02 15:01:18 +08:00
zyy
dd26f5fd96 调整宁波一号线实训步骤定义 2020-04-02 15:00:28 +08:00
fan
75df1f7d2d 宁波考试&教学添加切换集中站 2020-04-02 14:46:21 +08:00
zyy
8117a31c80 调整代码 2020-04-02 10:51:47 +08:00
zyy
a17a02519d 调整宁波线路实训生成 2020-04-02 09:07:50 +08:00
zyy
c7f7f0bc6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 15:45:31 +08:00
zyy
02583b96e4 调整代码 2020-04-01 15:44:54 +08:00
fan
ebd90d2485 本地项目调整&elementUI升版本至2.12.0 2020-04-01 15:32:06 +08:00
joylink_cuiweidong
5d10d40ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 14:15:09 +08:00
joylink_cuiweidong
f64c7d5317 代码调整 2020-04-01 14:14:55 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
joylink_cuiweidong
955ddacbe0 Merge branch 'dev' into test 2020-03-31 19:09:06 +08:00
joylink_cuiweidong
bc6940f80b 仿真界面添加列车详情(未完成) 2020-03-31 19:06:23 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
fan
9a57ab9aa3 哈尔滨调整 2020-03-31 10:45:04 +08:00
zyy
38ada8ccb2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 17:54:01 +08:00
zyy
919639ad03 调整哈尔滨现地操作步骤流程完善 2020-03-30 17:53:44 +08:00
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
joylink_cuiweidong
fba96dcaaa 佛山有轨线路 步骤操作代码调整 2020-03-30 14:34:19 +08:00
joylink_cuiweidong
fa3400790b 宁波一号线步骤操作代码调整 2020-03-30 14:18:07 +08:00
joylink_cuiweidong
3a383793f8 北京一号线 步骤操作代码调整 2020-03-30 13:33:53 +08:00
joylink_cuiweidong
17c26e26a2 佛山一号线 宁波一号线 步骤操作代码调整 2020-03-30 11:27:34 +08:00
joylink_cuiweidong
08dc9befc4 北京一号线 宁波一号线 步骤操作调整 2020-03-30 11:03:35 +08:00
zyy
72f121b7a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 10:28:22 +08:00
zyy
0321340863 调整步骤运行数据 2020-03-30 10:28:08 +08:00
joylink_cuiweidong
1a998f405a 佛山一号线 操作代码调整 2020-03-30 09:45:23 +08:00
joylink_cuiweidong
f51bad9c3a 代码调整 2020-03-27 18:45:48 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
zyy
7380953642 增加宁波线路实训操作 2020-03-27 13:45:36 +08:00
fan
8a90e2389b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 10:42:20 +08:00
joylink_cuiweidong
9a9716e5a9 佛山有轨电车操作代码调整 2020-03-26 09:56:46 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
joylink_cuiweidong
d3b4c090a9 佛山有轨电车 现地操作调整 2020-03-25 13:20:31 +08:00
joylink_cuiweidong
c31c09e88b 佛山有轨电车 现地操作调整 2020-03-24 18:18:01 +08:00
joylink_cuiweidong
089b8960b9 佛山线路现地界面调整 2020-03-24 18:01:10 +08:00
joylink_cuiweidong
f83753102e 北京线宁波线操作代码调整 2020-03-24 16:40:17 +08:00
joylink_cuiweidong
be03a9e623 宁波线操作代码调整 2020-03-24 14:43:58 +08:00
joylink_cuiweidong
21ac6c0ac4 北京一号线宁波一号线控制权转换代码调整 2020-03-24 13:43:30 +08:00
joylink_cuiweidong
22330bf756 宁波一号线自动折返操作代码调整 2020-03-24 11:09:10 +08:00
joylink_cuiweidong
4e38516efb 宁波一号线操作代码调整 2020-03-24 10:12:21 +08:00
joylink_cuiweidong
91e2c81c6f 佛山有轨电车 操作代码调整 2020-03-23 18:12:37 +08:00
joylink_cuiweidong
93fd139b6e 佛山有轨电车 信号机站台操作代码调整 2020-03-23 17:43:37 +08:00
joylink_cuiweidong
3d6f5a2537 佛山有轨电车 区段道岔操作代码调整 2020-03-23 17:25:18 +08:00
fan
d82a2cf297 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-23 16:01:45 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
joylink_cuiweidong
0412a6b1a3 宁波一号线 站台信号机区段操作代码调整 2020-03-23 14:48:26 +08:00
zyy
688aa7310b 增加佛山有轨线路文件,调整区段显示状态 2020-03-23 14:27:57 +08:00
joylink_cuiweidong
fd302bbbdd 北京一号线控制权操作代码调整 2020-03-23 11:09:40 +08:00
joylink_cuiweidong
dd9080c0d0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 18:51:40 +08:00
joylink_cuiweidong
c3e48fe107 北京一号线控制权转换代码调整 2020-03-20 18:51:26 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
fan
471fac0499 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 15:01:22 +08:00
fan
457b78bd7e 操作调整 2020-03-20 15:00:31 +08:00
joylink_cuiweidong
2c4848f4db 北京一号线指令操作调整 2020-03-20 14:48:22 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
joylink_cuiweidong
d50f096b0a 北京一号线站台操作代码调整 2020-03-20 13:30:57 +08:00
joylink_cuiweidong
61d54b2209 北京一号线道岔操作代码调整 2020-03-20 11:23:46 +08:00
fan
cc21437843 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 11:09:16 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
joylink_cuiweidong
59f5336f8a 北京一号线信号机区段操作代码调整 2020-03-20 10:31:19 +08:00
fan
361f28c905 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 18:43:43 +08:00
fan
352215f142 代码调整 2020-03-19 18:43:31 +08:00
zyy
912f0f206f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 18:39:32 +08:00
zyy
2f654975d5 调整哈尔滨信号机状态 2020-03-19 18:39:20 +08:00
fan
85e7fea0ae 代码调整 2020-03-19 18:13:26 +08:00
zyy
67f0712eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:19:01 +08:00
zyy
f78d9e80fe 调整哈尔滨道岔现地操作 2020-03-19 17:18:46 +08:00
fan
5173c4e8d9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:11:46 +08:00
fan
5e2beb6d05 代码调整 2020-03-19 17:11:35 +08:00
joylink_cuiweidong
753534c42a 北京一号线区段操作代码封装 2020-03-19 17:04:53 +08:00
zyy
e4c2cf03b1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 14:04:11 +08:00