Commit Graph

373 Commits

Author SHA1 Message Date
lVAL
c6fc85397a 修改排列进路的操作的问题 2021-02-18 09:55:15 +08:00
lVAL
f05a3d496e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/map.js
#	src/jmapNew/shape/Cross/index.js
#	src/jmapNew/shape/Section/index.js
2021-02-18 09:23:17 +08:00
fan
510b26c86c 宁波一新指令 2021-02-05 18:10:55 +08:00
lVAL
3475d573a6 修改代码 2021-02-05 18:07:35 +08:00
lVAL
a038ca7040 增加 宁波线处理 2021-02-05 18:01:16 +08:00
fan
b6550e6500 国赛取消注释 取消临时限速函数 2021-02-05 16:30:11 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
fan
3bfa419bbe 宁波一 上电解锁调整 2021-02-04 13:23:42 +08:00
fan
3b87f7ef14 注释:执行关键操作测试 2021-02-04 13:10:24 +08:00
fan
e8de151360 宁波一操作实训策略调整&线路配置参数 2021-02-04 13:08:59 +08:00
lVAL
ff7e32ec0d 线路:宁波1,成都3
问题:补充缺失部分实训,成都的全线取消扣车,宁波的设置折返
2021-02-03 17:07:05 +08:00
fan
3e50519732 宁波一实训折返策略调整 2021-02-02 19:00:48 +08:00
fan
18dcc3b089 BUG 160: 宁波一:控制模式(按钮)处缺少紧急站控 2021-02-02 17:54:40 +08:00
fan
1729082bac 折返策略 宁波一实训 2021-02-02 17:28:56 +08:00
fan
ec32fb62ff 折返策略 宁波一实训 2021-02-02 17:13:05 +08:00
joylink_cuiweidong
efd8c86762 宁波一号线,南京二号线,哈尔滨一号线 删除不需要的代码 2021-02-02 16:28:03 +08:00
fan
a431f17246 实训调整 2021-02-02 14:53:33 +08:00
fan
f66e3e3cc0 实训代码调整 2021-02-02 11:03:11 +08:00
fan
07efc9ae51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:31:23 +08:00
fan
fa384b79ee 代码调整 2021-02-01 18:31:09 +08:00
joylink_cuiweidong
def8b44d97 佛山 宁波 竞赛 车站操作 调整 2021-02-01 15:23:45 +08:00
fan
8982177e99 代码调整 2021-02-01 14:31:16 +08:00
fan
143f517097 卡斯柯 紧急站控实训调整 2021-02-01 10:18:54 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线,西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +08:00
lVAL
1f9ade8ec8 修改宁波一 实训代码格式 2021-01-25 17:43:38 +08:00
fan
ff6dac7c60 南二强解道岔&强解区段 2021-01-21 17:44:57 +08:00
fan
6df9350155 卡斯柯实训调整&南京二号线封锁调整 2021-01-21 13:45:20 +08:00
fan
89700f2245 卡斯柯调整 2021-01-21 10:05:59 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
fan
2c23ec76e9 ZC故障调整 2020-12-22 10:03:17 +08:00
zyy
49a6fffdfc 调整宁波线路实操定义 2020-12-21 15:18:51 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
joylink_cuiweidong
1f7c3f3bf7 宁波一号线 人解进路更换指令(之前为信号机取消引导,换为人解进路) 2020-11-26 18:52:53 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
zyy
a752dcd2e5 调整路径配置,删除多余配置 2020-11-13 17:05:10 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
zyy
81144131b8 调整右键区段操作 2020-11-10 13:55:49 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
joylink_cuiweidong
fc46f0b55e 运行图 车次号方向代码调整 2020-11-04 18:35:27 +08:00
fan
45d8df8897 调整设置备用车位置 2020-10-28 15:18:57 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
c660931d92 注释 2020-10-28 11:27:17 +08:00
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
joylink_cuiweidong
4842dca6f4 代码调整 2020-10-26 11:13:37 +08:00
joylink_cuiweidong
683f73c005 运行图 展示界面 车次号调整 2020-10-22 18:30:02 +08:00
fan
ed6651cc4c 触发故障菜单 2020-10-16 11:25:07 +08:00
fan
fd00154f0c 宁波一取消临时限速 2020-10-12 18:53:04 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +08:00
joylink_cuiweidong
2ed40ee117 宁波一号线实训操作代码调整 2020-09-02 18:40:51 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
joylink_cuiweidong
c76205790a 宁波一号线实训操作代码调整 2020-08-31 15:58:55 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
d92a86f146 代码调整 2020-08-19 14:11:58 +08:00
zyy
901af70400 调整线路右键操作 2020-08-18 16:41:19 +08:00
zyy
9f22395605 删除多余右键操作组件,调整发布状态 2020-08-17 14:46:48 +08:00
zyy
179ad8fa1d 调整信号机字段调整 2020-08-14 16:02:01 +08:00
zyy
d1fdb7af5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 14:32:29 +08:00
zyy
3d4230e78d 调整佛山线路错误提示,增加联锁配置字段 2020-08-14 14:32:14 +08:00
joylink_cuiweidong
255c59629b 道岔故障模式下右键菜单代码调整 2020-08-14 13:28:44 +08:00
joylink_cuiweidong
2615460674 剧本编制代码调整 2020-08-13 17:25:52 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00
joylink_cuiweidong
cc6bbe8073 北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整 2020-08-07 14:00:32 +08:00
joylink_cuiweidong
e08dcd9c8d 宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
2020-08-07 13:17:09 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
joylink_cuiweidong
026a8d9a7f 仿真左上角菜单样式调整 2020-08-06 13:21:55 +08:00
joylink_cuiweidong
dbc017763a 宁波线控制权转移代码调整 2020-08-03 18:52:39 +08:00
zyy
31be09323b 调整综合演练顶部菜单判断,增加哈尔滨项目 行调设备登陆显示指令模式 2020-08-03 14:12:56 +08:00
joylink_cuiweidong
48cd28bd88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:03:48 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
zyy
a011ab03f8 增加宁波指令 2020-07-31 15:27:37 +08:00
joylink_cuiweidong
329b3efef3 宁波一号线 站遥控 控制权转移代码调整 2020-07-30 18:59:48 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +08:00
joylink_cuiweidong
7e920993f4 宁波一号线控制权转换代码调整 2020-07-29 17:19:14 +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
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
joylink_cuiweidong
c3e6cf2b56 代码调整 2020-07-29 13:56:50 +08:00
fan
a18c84f684 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 11:14:57 +08:00
fan
24e3a606fa 调整会话按钮名称&宁波一剩余菜单回车快捷键 2020-07-29 11:14:45 +08:00
joylink_cuiweidong
a13b21613f 宁波一号线 键盘操作调整(回车事件) 2020-07-29 10:39:58 +08:00
joylink_cuiweidong
c0e3df14bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 18:30:10 +08:00
joylink_cuiweidong
9cc57c0a44 宁波一号线 键盘操作调整(回车事件) 2020-07-28 18:29:56 +08:00
fan
f13ba95407 宁波菜单回车快捷键(区段、信号机、车站)&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整 2020-07-28 18:28:31 +08:00
fan
0ad13f9fe8 宁波菜单弹框回车快捷键 2020-07-28 16:28:55 +08:00
zyy
59a75280a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/lesson/lessoncategory/edit/chapter/list.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/newMap/displayNew/index.vue
2020-07-27 18:09:38 +08:00