Commit Graph

167 Commits

Author SHA1 Message Date
joylink_cuiweidong
59371074ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 15:18:58 +08:00
joylink_cuiweidong
b8fde7dd74 地图绘图代码调整
成都三号线 行调工作站 指令代码调整
2020-12-22 15:18:10 +08:00
fan
2c23ec76e9 ZC故障调整 2020-12-22 10:03:17 +08:00
fan
a00b5c0581 道岔名称 站台E灰显 2020-12-21 20:10:48 +08:00
zyy
49a6fffdfc 调整宁波线路实操定义 2020-12-21 15:18:51 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
joylink_cuiweidong
a0e3875e69 实训平台样式调整 2020-12-04 15:46:45 +08:00
joylink_cuiweidong
3132506382 宁波一号线 取消进路 指令 换成 总取消 2020-11-26 18:21:57 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
zyy
a752dcd2e5 调整路径配置,删除多余配置 2020-11-13 17:05:10 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
joylink_cuiweidong
1a7a6e27c7 连挂操作代码调整 2020-11-11 18:49:32 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
zyy
d34b528cd4 调整描述名称 2020-11-10 14:41:51 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
joylink_cuiweidong
30c71d02fb 供电线故障代码调整 2020-11-02 18:51:53 +08:00
joylink_cuiweidong
cfdb7d3187 故障操作 添加手动开启屏蔽门 2020-11-02 17:54:25 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
c660931d92 注释 2020-10-28 11:27:17 +08:00
fan
eb35221c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 11:11:48 +08:00
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
zyy
791e02aaf7 调整接口删除多余配置 2020-10-28 10:22:46 +08:00
joylink_cuiweidong
da1b5f27d1 代码调整 2020-10-26 13:59:17 +08:00
joylink_cuiweidong
f34092741b 竞赛 添加 道岔钩锁指令(非语音指令)
删除不必要文件
2020-10-26 13:51:53 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
18c74bb3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 11:28:25 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
4f1a2f03cb 哈尔滨盈达科技项目页添加 2020-09-07 11:08:26 +08:00
fan
5af9956f5b 佛山修改列车识别好调整 2020-09-04 17:57:37 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +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
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
zyy
901af70400 调整线路右键操作 2020-08-18 16:41:19 +08:00
zyy
3d4230e78d 调整佛山线路错误提示,增加联锁配置字段 2020-08-14 14:32:14 +08:00
zyy
c948e517b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 19:27:13 +08:00
zyy
86d6cf7a14 调整区段延时解锁流程 2020-08-13 19:27:02 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
zyy
2e2feac47d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:03:43 +08:00
zyy
6e61050067 整合右键操作 2020-08-13 11:03:28 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +08:00
zyy
2d5f4520d4 增加佛山线路 强制取消扣车 2020-08-12 09:50:10 +08:00
joylink_cuiweidong
fd6360611b 福州一号线,西安三号线控制权转移代码调整 2020-08-07 18:20:45 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
joylink_cuiweidong
fda52feb52 代码调整 2020-08-07 14:12:32 +08:00
fan
fff5acab5d 创建考试调整&路由replace调整 2020-07-29 14:14:34 +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
ed4b5047bd 代码调整 2020-07-28 18:47:05 +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
42d9906550 调整地图加载多余配置,增加宁波右键列车新指令 2020-07-27 18:04:47 +08:00
zyy
dd22ce9940 调整西安线路故障模式操作 2020-07-22 11:23:02 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
zyy
b37fbdd967 调整西安线路列车操作 2020-07-16 13:35:54 +08:00
joylink_cuiweidong
fe5787b3ce 新增 确认列车行驶之前方站台 进路闭塞法行车 指令 2020-07-13 18:54:42 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
joylink_cuiweidong
5f1a5b3092 西安线路和宁波一号线添加动手zc故障 2020-07-06 17:49:17 +08:00
zyy
fa5097cd8d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 18:47:57 +08:00
zyy
3b39a9a04b 调整区段字段,控制权操作 2020-07-02 18:47:39 +08:00
joylink_cuiweidong
1b714c86c8 成都三号线 站台操作代码调整 2020-07-02 16:01:22 +08:00
zyy
58a874c9b8 调整设置和取消故障的时候,默认选择第一个选项 2020-07-02 09:56:51 +08:00
joylink_cuiweidong
b0f7d125a3 成都三号线右键操作代码调整 2020-07-01 16:10:07 +08:00
zyy
485533ff33 调整成都三号线现地操作 2020-07-01 09:39:13 +08:00
fan
f7e162cab0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 14:25:45 +08:00
fan
3f80fc1d0e 公共菜单提取 2020-06-29 14:25:35 +08:00
zyy
db1c1daf2f 调整成都三号线行调操作,及现地样式 2020-06-29 09:53:30 +08:00
zyy
7873917d43 调整数据模型过滤空置,调整成都3号线实操 2020-06-28 16:03:59 +08:00
joylink_cuiweidong
c0c60e0bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:39:11 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +08:00
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
joylink_cuiweidong
8c7a5e7796 右键操作代码整理 2020-06-19 17:03:39 +08:00
joylink_cuiweidong
ee12c33025 西安一号线右键操作代码调整 2020-06-19 16:13:21 +08:00
joylink_cuiweidong
dd9959b2f4 右键菜单代码调整 2020-06-19 15:34:20 +08:00
zyy
5934c61b8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
2020-06-19 13:32:40 +08:00
zyy
8e409078d9 调整公共文件 2020-06-19 13:31:31 +08:00
joylink_cuiweidong
645e425e2c 宁波北京一号线操作代码调整 2020-06-19 13:28:53 +08:00
zyy
96456b2280 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 11:29:30 +08:00
zyy
6236e70494 调整限速配置 2020-06-19 11:29:12 +08:00
fan
5bf46c151c 合并代码 2020-06-19 09:18:50 +08:00
fan
915f1fb959 故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发) 2020-06-19 09:17:03 +08:00
zyy
0da6a64af7 调整临时限速配置 2020-06-18 18:13:28 +08:00
zyy
003bf13395 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:31:29 +08:00
zyy
47e44c0a76 调整全局组件配置 2020-06-18 17:31:14 +08:00
fan
cf961927db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:30:00 +08:00
fan
b8dfa50306 调整西安三号箱操作定义 2020-06-18 17:29:46 +08:00