joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
11,787 Commits 20 Branches 0 Tags 448 MiB
f1ffae48ef
Commit Graph

11415 Commits

Author SHA1 Message Date
fan
895b909e34 站间透明调整 2022-07-13 14:19:02 +08:00
dong
42cb9d6ee2 添加教学通用项目 2022-07-13 13:33:41 +08:00
joylink_cuiweidong
e9fc978c06 大铁项目 ctc 行车日志 设置超限 2022-07-12 15:49:02 +08:00
joylink_cuiweidong
ed4d2f9e73 大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】 2022-07-12 14:42:52 +08:00
Yuan
71ce383912 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-12 14:01:32 +08:00
Yuan
36c5e3c7db WIP: JD1A 底部操作栏左侧显隐控制部分 2022-07-12 14:01:08 +08:00
joylink_cuiweidong
aaa2cdb557 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-12 11:29:27 +08:00
joylink_cuiweidong
5aed3a7c06 大铁项目 ctc 行车日志 设置始发 设置终到 2022-07-12 11:29:15 +08:00
weizhihong
03e8b90893 【运行计划时间自动变化】 2022-07-11 15:02:31 +08:00
fan
e300d62896 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:45:21 +08:00
fan
e59e2ec8d4 股道视图调整 2022-07-08 17:45:07 +08:00
joylink_cuiweidong
548e737cfd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:39:06 +08:00
joylink_cuiweidong
553ac965ba 大铁项目 ctc 行车日志 设置/取消重点列车 设置允许股道与基本路径不一致 设置进出入口不一致 指令添加 2022-07-08 17:38:47 +08:00
joylink_zhangsai
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
0bf64a3bed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:16:21 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +08:00
dong
9890752f84 修改拖拽窗口选中文本问题 2022-07-08 17:11:30 +08:00
joylink_cuiweidong
b437e9079a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:52:37 +08:00
joylink_cuiweidong
af992f8664 大铁项目 ctc 行车日志 取消到达 取消出发 取消闭塞 指令添加 2022-07-08 16:52:06 +08:00
Yuan
eb2447c69a Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 16:43:55 +08:00
Yuan
178d550db6 bugfix - 判断条件不完整 2022-07-08 16:43:52 +08:00
fan
19f2b8c290 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:34:27 +08:00
dong
04a22ee760 拖拽超出时限制位置 2022-07-08 16:34:02 +08:00
fan
d2f7edbda1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:32:01 +08:00
fan
7be2c6b614 进路序列调整&站间透明暂提 2022-07-08 16:31:42 +08:00
Yuan
d19e8eb3d9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-08 15:30:58 +08:00
dong
c75d283389 调度命令添加校验功能 2022-07-08 14:56:33 +08:00
joylink_cuiweidong
d0f4c4b5cd 代码调整 2022-07-08 13:19:57 +08:00
dong
5b191b60b7 修改调度命令报错，添加中转识别号 2022-07-08 11:14:36 +08:00
Yuan
9d086724fe Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-07 18:14:11 +08:00
Yuan
8d38ee214e JD1A 皮肤修改 2022-07-07 18:14:03 +08:00
dong
998f5dbced 调度命令调整 2022-07-07 17:28:26 +08:00
joylink_cuiweidong
2bb6a88076 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 17:09:54 +08:00
joylink_cuiweidong
7f6a331002 大铁项目 ctc 行车日志 代码调整 2022-07-07 17:09:40 +08:00
dong
8cd5789bae 调度命令代码调整 2022-07-07 16:32:18 +08:00
joylink_cuiweidong
22e4935310 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:23:17 +08:00
joylink_cuiweidong
4f01e767d7 代码调整 2022-07-07 16:22:00 +08:00
fan
8c978c25a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:08:30 +08:00
fan
94f5c498c5 路票调整2 2022-07-07 16:08:04 +08:00
强 董
dafe5f75d3 调度命令下达提示修改 2022-07-07 16:00:03 +08:00
joylink_cuiweidong
1b564f5e6c 大铁项目 ctc 行车日志 代码调整 2022-07-07 15:44:13 +08:00
joylink_cuiweidong
5b171c0d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 15:29:49 +08:00
joylink_cuiweidong
9c9697d706 代码调整 2022-07-07 15:29:37 +08:00
强 董
a22736f0f0 调度命令调整 2022-07-07 15:14:42 +08:00
强 董
9f425fad49 调度命令调整 2022-07-07 15:03:41 +08:00
joylink_cuiweidong
cf7915cef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:59:47 +08:00
joylink_cuiweidong
651e7eceb5 大铁项目 调度台行车计划 列车类型 添加枚举 
大铁项目 衬托出 行车日志 实际时间添加颜色
 2022-07-07 13:58:57 +08:00
fan
607903c937 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:21:46 +08:00
fan
a692ae3aa7 路票调整 2022-07-07 13:21:27 +08:00
joylink_cuiweidong
cbe0203a66 大铁项目 调度台行车计划 修改到出入口 2022-07-06 18:00:48 +08:00
joylink_cuiweidong
1984dc807c 大铁项目 ctc 行车日志 清除闪烁 2022-07-06 17:26:59 +08:00
joylink_cuiweidong
5854fa5a60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 17:16:16 +08:00
joylink_cuiweidong
58ba63a382 大铁项目 ctc 行车日志 初始化 清空数据 2022-07-06 17:15:54 +08:00
joylink_cuiweidong
1d2cf1c043 大铁项目 调度台行车计划 修改时间 2022-07-06 16:23:40 +08:00
fan
026395d982 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/store/modules/socket.js
 2022-07-06 15:50:08 +08:00
fan
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +08:00
joylink_cuiweidong
00f1d98829 大铁项目 ctc 行车日志 增加 修改股道 发送计划 取消红闪 指令 
修改 发送计划按钮闪烁的标识
 2022-07-06 13:45:41 +08:00
fan
deda8eaf7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 11:19:46 +08:00
fan
1093b8982b 路票流程调整 2022-07-06 11:19:22 +08:00
Yuan
0a4bfa82ae Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 11:18:58 +08:00
joylink_cuiweidong
78c3e41f9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 10:42:14 +08:00
joylink_cuiweidong
84a4192183 代码调整 2022-07-06 10:41:40 +08:00
Yuan
e0e64340fc Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-06 09:30:27 +08:00
fan
2d4b0708bd 路票流程调整暂提 2022-07-05 18:03:14 +08:00
fan
012c8e7137 修复：因无法打开麦克风等错误导致的无法挂断电话BUG 2022-07-05 13:22:36 +08:00
fan
662b7a2332 增加仿真成员 车站助理 STATION_ASSISTANT 2022-07-05 10:59:58 +08:00
fan
a5b4b096f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-05 09:08:35 +08:00
fan
4779efbc23 代码调整&司机驾驶调整 2022-07-05 09:08:12 +08:00
joylink_cuiweidong
2d89a10eae 铁科院 大铁线路 添加 区段故障解锁 指令 2022-07-04 16:09:08 +08:00
强 董
8555ae081a 调度命令调整 2022-07-04 14:46:00 +08:00
强 董
e2b2f80e4d 调度命令代码调整 2022-07-04 14:28:06 +08:00
强 董
eb0dc56616 调度命令代码调整 2022-07-04 11:17:35 +08:00
强 董
1ab714dab9 调度命令弹窗代码调整 2022-07-04 09:59:15 +08:00
强 董
4d5cf7b92c 添加调度命令直接签收界面 2022-07-04 09:57:24 +08:00
Yuan
ac9f9c7675 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-04 09:49:30 +08:00
强 董
5c078cdfbc 调度命令调整 2022-07-01 18:52:17 +08:00
强 董
f8c51df3c9 调度命令调整 2022-07-01 15:37:55 +08:00
强 董
95c739c342 行调命令调整 2022-07-01 13:58:44 +08:00
Yuan
b25c9bd9ad Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-01 09:34:48 +08:00
强 董
49593b2851 添加调度命令收令功能 2022-06-30 18:13:23 +08:00
fan
98916ac312 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 18:08:51 +08:00
fan
a30991a53f 占线板股道视图调整 2022-06-30 18:08:39 +08:00
walker_sheng
aa9e0fe265 修改local-test配置 2022-06-30 17:03:09 +08:00
fan
12d2f98e4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 15:33:13 +08:00
fan
7cb0dc179a 问题调整：未获取到运行图信息 2022-06-30 15:32:58 +08:00
joylink_cuiweidong
599eaa5bd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 15:21:45 +08:00
joylink_cuiweidong
057c39fb21 代码调整 2022-06-30 15:20:41 +08:00
fan
d1f0210b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 14:55:35 +08:00
fan
28a09e0f21 大铁簿册调整 2022-06-30 14:55:18 +08:00
joylink_cuiweidong
8311b453bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 13:52:42 +08:00
joylink_cuiweidong
927687aa9b 大铁项目 代码调整 2022-06-30 13:52:27 +08:00
walker_sheng
f950bf8536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 13:09:56 +08:00
walker_sheng
ed21d70bc4 local-test 打包配置 2022-06-30 13:09:40 +08:00
Yuan
f3e52724a3 大铁JD1A - 区段颜色修改 2022-06-30 10:55:51 +08:00
joylink_cuiweidong
f10a118132 大铁项目 代码调整 2022-06-30 10:40:36 +08:00
joylink_cuiweidong
64d98d84a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 10:05:41 +08:00
joylink_cuiweidong
d4ad56e142 大铁项目 ctc 行车计划 签收 代码调整 2022-06-30 10:05:27 +08:00
fan
19b9803342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 09:04:59 +08:00
fan
8048cfd34c 大铁簿册调整&合众title调整 2022-06-30 09:04:44 +08:00
joylink_cuiweidong
218cd5e2e5 代码调整 2022-06-29 17:55:40 +08:00
joylink_cuiweidong
889f3c60d0 代码调整 2022-06-29 17:41:36 +08:00
joylink_cuiweidong
1e2f294185 代码调整 2022-06-29 16:23:58 +08:00
joylink_cuiweidong
2ec521603c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-29 16:05:55 +08:00
joylink_cuiweidong
1f52b72eb5 代码调整 2022-06-29 16:05:29 +08:00
fan
6b117a66e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/jmapNew/theme/components/utils/menuOperate.js
	src/scripts/cmdPlugin/CommandEnum.js
	src/scripts/cmdPlugin/OperationHandler.js
 2022-06-29 15:59:56 +08:00
fan
21e8785ecb 大铁 路票调整 2022-06-29 15:57:24 +08:00
joylink_cuiweidong
6d6c7c3074 大铁项目 ctc 行车日志 签收计划 2022-06-29 15:53:51 +08:00
joylink_cuiweidong
ec5c6f5ff4 大铁项目 调度台行车计划修改股道 删除计划 2022-06-29 13:53:35 +08:00
joylink_cuiweidong
47da7cfc43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-29 10:59:32 +08:00
joylink_cuiweidong
933ecb9748 大铁 调度台 发布所有行车计划 车站签收行车计划 代码调整 2022-06-29 10:59:16 +08:00
强 董
371e090195 修改调度命令界面 2022-06-29 10:36:57 +08:00
joylink_cuiweidong
a7db35f139 代码调整 2022-06-28 18:13:01 +08:00
joylink_cuiweidong
78d67ad0ec 大铁 调度台 添加运行计划 代码调整 2022-06-28 17:23:52 +08:00
joylink_cuiweidong
ff3ae565bc 代码调整 2022-06-28 16:50:48 +08:00
joylink_cuiweidong
4ef0db920d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-28 16:19:44 +08:00
joylink_cuiweidong
ab24f99392 大铁 调度台 添加运行计划 删除运行计划 指令添加 代码调整 2022-06-28 16:18:57 +08:00
强 董
0c49120dd9 修改路由里的调度台地址 2022-06-28 15:28:51 +08:00
fan
ebb204c475 大铁综合演练调整 2022-06-28 15:04:00 +08:00
fan
9248fd22ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/views/newMap/displayNew/menuDemon.vue
 2022-06-28 13:07:51 +08:00
强 董
f934b70b3e 代码调整 2022-06-28 13:06:52 +08:00
fan
6724587aed 打铁综合演练 2022-06-28 13:06:21 +08:00
强 董
251c79a10a 添加调度台功能 2022-06-28 11:29:38 +08:00
fan
2fb45a7bfe 路票暂提1 2022-06-27 18:08:25 +08:00
joylink_cuiweidong
ffd1ab06b8 大铁项目 调度台 运行图 增加阶段计划 2022-06-27 16:19:52 +08:00
joylink_cuiweidong
fa1004067e 大铁项目 调度台 运行图 消息订阅 和返回的数据 代码调整 2022-06-27 14:45:31 +08:00
fan
8b8bdec3db 子系统栏显示调整 2022-06-27 13:22:25 +08:00
fan
83702c4c22 路票暂提 2022-06-27 13:09:22 +08:00
fan
717a629ea2 子系统栏显示调整 2022-06-27 13:08:46 +08:00
joylink_cuiweidong
73bf18ad86 大铁项目 调度台 代码调整 2022-06-27 11:05:12 +08:00
joylink_cuiweidong
6384208d93 代码调整 2022-06-24 16:51:17 +08:00
fan
8b3c7eadc5 JD_1A线路建立-调整 2022-06-24 16:37:42 +08:00
fan
3f40d29731 JD_1A线路建立 2022-06-24 16:23:21 +08:00
fan
afd3c54df2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-24 14:57:38 +08:00
fan
8dd185cd9a 占线板闪烁调整 2022-06-24 14:57:20 +08:00
joylink_cuiweidong
07e82fce24 铁科院 大铁线路 道岔 添加对应指令 2022-06-24 14:14:35 +08:00
joylink_cuiweidong
3e13058b3a 铁科院 大铁线路 道岔右键菜单添加 2022-06-24 13:59:23 +08:00
joylink_cuiweidong
985180eba7 代码调整 2022-06-23 16:52:51 +08:00
joylink_cuiweidong
caf5bca3c8 大铁项目 ctc 车务管理端 列车固定路径 删除路径 2022-06-23 16:48:16 +08:00
joylink_cuiweidong
ce67bb0a13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 16:25:16 +08:00
joylink_cuiweidong
5cb096bfda 代码调整 2022-06-23 16:24:59 +08:00
fan
0931e54a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 15:52:09 +08:00
fan
a953bcff6c 注册增加来源 2022-06-23 15:51:49 +08:00
joylink_cuiweidong
4bbe980c21 大铁项目 ctc 车务管理端 样式调整 2022-06-23 14:22:42 +08:00
joylink_cuiweidong
0269ae8144 大铁项目 ctc 车务管理端 列车固定路径 代码调整 2022-06-23 14:00:47 +08:00
joylink_cuiweidong
c58262a066 铁科院 大铁线路 信号机右键菜单添加 2022-06-23 13:44:39 +08:00
joylink_cuiweidong
9b4e93ae7c 代码调整 2022-06-21 17:20:12 +08:00
joylink_cuiweidong
e7edd338fd 代码调整 2022-06-21 16:13:01 +08:00
joylink_cuiweidong
6e779510a2 车务管理端 车站股道 代码调整 2022-06-21 16:10:17 +08:00
fan
e699ed2e9b ibp设备调整 2022-06-21 15:05:58 +08:00
fan
9247ccedf5 设备管理 找不到链接设备name 显示设备code 2022-06-21 14:35:49 +08:00
fan
24cdeecb04 红河财经增加设备管理 2022-06-21 13:38:14 +08:00
fan
80361b40a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-21 13:21:33 +08:00
fan
4d89aef6b8 红河财经登录页调整 2022-06-21 13:21:18 +08:00
joylink_cuiweidong
06d4e8005b 大铁项目 ctc 车务管理端 车站股道 代码调整 2022-06-21 11:33:11 +08:00
joylink_cuiweidong
cf3a0f80ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-20 17:57:47 +08:00
joylink_cuiweidong
15f70ee501 铁科院 大铁线路 代码调整 2022-06-20 17:57:12 +08:00
fan
58427fb837 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-20 17:45:13 +08:00
fan
de47b74def 添加合众登录页面 && 成都工职院虚拟仿真中心跳转调整 2022-06-20 17:44:33 +08:00
joylink_cuiweidong
5973a3c1ee 大铁项目 行车日志 修改车次号(大铁CTC) 代码调整 2022-06-20 11:24:22 +08:00
joylink_cuiweidong
4f855c3836 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 17:29:54 +08:00
joylink_cuiweidong
fa65f53643 大铁项目 ctc 代码调整 2022-06-17 17:29:34 +08:00
fan
5da99fcd14 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 14:17:07 +08:00
fan
0a5ced4098 大铁ctc调整 增加端title 2022-06-17 14:16:54 +08:00
joylink_cuiweidong
893f1d0192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:28:09 +08:00
joylink_cuiweidong
a18f5418e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:27:41 +08:00
fan
e30836d323 大铁ctc调整 表调位置调整 2022-06-17 13:27:21 +08:00
joylink_cuiweidong
d6b42cc241 代码调整 2022-06-17 13:27:16 +08:00
fan
82e1378870 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:22:55 +08:00
fan
cb86c8477b 大铁ctc调整 进路序列表状态调整 2022-06-17 13:22:34 +08:00
joylink_cuiweidong
5b4fb009a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:16:36 +08:00
joylink_cuiweidong
ba4ed6e7c1 代码调整 2022-06-17 13:16:12 +08:00
fan
3843c01f40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:08:23 +08:00
fan
ef22b07945 大铁ctc调整 2022-06-17 13:08:08 +08:00
joylink_cuiweidong
307600ec5e 大铁项目 代码调整 2022-06-17 13:01:51 +08:00
joylink_cuiweidong
8b475d497f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 11:34:22 +08:00
joylink_cuiweidong
7d7718c1a1 大铁项目 ctc 车务管理端 列车固定路径 增加 车次校验规则 
列表调整
 2022-06-17 11:34:09 +08:00
fan
37d984378c 大铁ctc调整 2022-06-17 11:30:10 +08:00
fan
db9ca50400 大铁ctc调整 2022-06-17 11:26:03 +08:00
fan
4ef230a4e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 10:18:57 +08:00
joylink_cuiweidong
2da496887b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 10:17:09 +08:00
joylink_cuiweidong
eb7d096fe3 大铁项目 ctc 车务管理端 列车固定路径 订阅路径修改 
列车固定路径列表代码调整
 2022-06-17 10:16:49 +08:00
fan
36198b3945 大铁ctc调整 2022-06-17 10:10:28 +08:00
fan
8bcd522b74 大铁ctc调整 2022-06-16 18:24:28 +08:00
fan
fa3914ba76 大铁ctc调整 2022-06-16 18:15:50 +08:00
fan
ada089484d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 18:06:15 +08:00
fan
4f177ad7a3 大铁ctc调整 2022-06-16 18:06:01 +08:00
joylink_cuiweidong
667bca7aa2 大铁项目 ctc 车务管理端 列车固定路径 更新至ctc 导入 代码调整 2022-06-16 16:36:18 +08:00
fan
7c924dcec5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 15:39:58 +08:00
fan
b82828afd3 大铁ctc调整 2022-06-16 15:39:46 +08:00
joylink_cuiweidong
a48698877d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 15:21:04 +08:00
joylink_cuiweidong
746c54651a 大铁项目 ctc 车务管理端 列车固定路径 备份 订阅路径更改 2022-06-16 15:20:12 +08:00
fan
858f064a2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 14:55:34 +08:00
fan
c0cf6e6077 大铁ctc调整 6/16 2022-06-16 14:55:17 +08:00
joylink_cuiweidong
41a22bae92 大铁项目 ctc 车务管理端 列车固定路径 增加指令代码调整 2022-06-16 14:18:04 +08:00
joylink_cuiweidong
52e4b911b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/scripts/cmdPlugin/OperationHandler.js
 2022-06-16 10:20:33 +08:00
joylink_cuiweidong
387a92cb34 大铁项目 车务管理端 添加 2022-06-16 10:07:19 +08:00
fan
e13a74d9f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-15 17:47:32 +08:00
fan
6beeab667c 大铁ctc调整 占线板操作调整 2022-06-15 17:47:21 +08:00
joylink_cuiweidong
4d83303f23 大铁项目 ctc 车务管理端 列车固定路径 增加 页面调整 2022-06-15 17:38:23 +08:00
fan
b740955d7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-15 15:39:37 +08:00
fan
006f789032 大铁ctc调整6/15 2022-06-15 15:39:11 +08:00
joylink_cuiweidong
a4d49ae7a9 大铁项目 代码调整 2022-06-15 14:46:03 +08:00
joylink_cuiweidong
6296ee141a 大铁项目 代码调整 2022-06-15 14:36:25 +08:00
joylink_cuiweidong
244f36842e 大铁项目 ctc 发送预告 代码调整 2022-06-15 14:18:35 +08:00
joylink_cuiweidong
e697233c6c 大铁项目 发送发车预告 代码调整 2022-06-15 13:32:42 +08:00
joylink_cuiweidong
30ca5c7cb1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-15 09:58:03 +08:00
joylink_cuiweidong
9e917f09eb 发送发车预告 同意发车预告 指令添加 2022-06-15 09:57:48 +08:00
fan
00fd8a168b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/views/newMap/displayNew/menuSchema.vue
 2022-06-15 09:20:26 +08:00
fan
e4fb05c1bf 打铁ctc调整 2022-06-15 09:18:36 +08:00
joylink_cuiweidong
e2ccfa8ca4 删除 修改股道 指令 2022-06-14 17:46:16 +08:00
joylink_cuiweidong
a885b634a6 大铁项目 行车日志 修改车次号调整 2022-06-14 17:39:59 +08:00
joylink_cuiweidong
389a700798 大铁项目 ctc 车务管理端 消息处理代码调整 2022-06-14 16:36:40 +08:00
joylink_cuiweidong
949e3c3feb 大铁项目 车务管理端 代码调整 2022-06-14 14:39:07 +08:00
joylink_cuiweidong
4cf019e10d 大铁项目 车务管理端消息 订阅信息 代码调整 2022-06-14 11:30:15 +08:00
joylink_cuiweidong
d45dc22212 大铁项目 代码调整 2022-06-13 17:44:07 +08:00
joylink_cuiweidong
be0ad85168 大铁项目 代码调整 2022-06-13 17:20:03 +08:00
joylink_cuiweidong
57b9d5cce6 大铁项目 代码调整 2022-06-13 16:02:33 +08:00
joylink_cuiweidong
c3685d12ac 大铁项目 管理终端 车站股道 页面调整 2022-06-13 14:31:31 +08:00
joylink_cuiweidong
16586b35f0 大铁项目 管理终端 车站股道页面添加 2022-06-13 10:45:15 +08:00
joylink_cuiweidong
f715084708 代码调整 2022-06-10 17:26:18 +08:00
joylink_cuiweidong
94389e6d7c 代码调整 2022-06-10 17:21:55 +08:00
joylink_cuiweidong
66892862cb 代码调整 2022-06-10 16:48:23 +08:00
joylink_cuiweidong
dc7a117b0f 大铁项目 管理终端 页面 添加 2022-06-10 16:23:09 +08:00
joylink_cuiweidong
4b07b1c559 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-10 11:31:10 +08:00
joylink_cuiweidong
ca643604e1 代码调整 2022-06-10 11:30:56 +08:00
fan
3b63d62eae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-10 11:23:30 +08:00
fan
1ea7818c47 IBP盘调整 2022-06-10 11:23:16 +08:00
joylink_cuiweidong
c2b3034cd1 大铁项目 删除行车日志 页面调整 2022-06-10 11:06:33 +08:00
joylink_cuiweidong
09e72ea133 代码调整 2022-06-10 10:38:43 +08:00
joylink_cuiweidong
2a27cf6f46 大铁项目 地图绘制 指示灯关联 增加名称属性 2022-06-10 10:09:30 +08:00
fan
0c620de1e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-09 18:07:12 +08:00
fan
d36ee77d00 ctc显示调整 2022-06-09 18:06:47 +08:00
joylink_cuiweidong
ae86731795 代码调整 2022-06-09 17:17:00 +08:00
joylink_cuiweidong
c83cf31bf3 大铁项目 行车日志 修改车次号 代码调整 2022-06-09 17:16:01 +08:00
joylink_cuiweidong
602732bb6d 大铁项目 行车日志 修改行车计划邻站信息操作 代码调整 2022-06-09 15:36:05 +08:00
joylink_cuiweidong
23d72e7962 大铁项目 行车日志 删除行车日志操作 代码调整 2022-06-09 14:31:17 +08:00
joylink_cuiweidong
36069ec68e 代码调整 2022-06-09 11:31:02 +08:00
joylink_cuiweidong
9425ef8239 大铁项目 代码调整 2022-06-08 17:05:44 +08:00
joylink_cuiweidong
3167b551b9 大铁项目 增加 批量修改股道指令 代码调整 2022-06-08 16:37:30 +08:00
fan
ffcd9faab8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 13:06:16 +08:00
fan
9826b6b6f2 ctc调整 总人解 2022-06-08 13:05:54 +08:00
joylink_cuiweidong
aa056628a1 代码调整 2022-06-08 11:16:40 +08:00
joylink_cuiweidong
5b78c43b06 大铁项目 代码调整 2022-06-08 11:13:46 +08:00
joylink_cuiweidong
37644ef8fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 09:55:48 +08:00
joylink_cuiweidong
1da8364afa 代码调整 2022-06-08 09:55:31 +08:00
fan
5e7c67205e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 09:40:01 +08:00
fan
e5f484f3bb ctc调整 2022-06-08 09:36:14 +08:00
joylink_cuiweidong
7a083b93a7 代码调整 2022-06-07 18:12:19 +08:00
joylink_cuiweidong
8e0062a33b 代码调整 2022-06-07 17:37:45 +08:00
joylink_cuiweidong
a7f6f51b57 代码调整 2022-06-07 17:18:39 +08:00
joylink_cuiweidong
74888dfdfe 大铁项目 修改股道 代码调整 2022-06-07 17:01:25 +08:00
joylink_cuiweidong
5fcd8d4830 大铁项目 行车日志 修改股道 页面调整 2022-06-07 15:18:13 +08:00
fan
a0eaa636f9 实训双击问题调整 2022-06-06 16:43:11 +08:00
fan
d5e2e69965 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-06 16:30:38 +08:00
fan
19e70608a0 ctc显示调整 06/06 2022-06-06 16:29:42 +08:00
joylink_cuiweidong
3f8d4d919a 大铁项目 CTC 运行计划列表 弹窗代码调整 2022-06-06 16:29:06 +08:00
joylink_cuiweidong
8294a217ed 代码调整 2022-06-02 16:57:55 +08:00
joylink_cuiweidong
942f728596 大铁项目 CTC 运行计划列表 代码调整 2022-06-02 15:13:59 +08:00
joylink_cuiweidong
eaafd6e041 代码调整 2022-06-02 11:02:42 +08:00
joylink_cuiweidong
0529b94a5b 代码调整 2022-06-01 18:15:26 +08:00
joylink_cuiweidong
fcd3110e9f 代码调整 2022-06-01 15:34:53 +08:00
joylink_cuiweidong
c1e7198fa8 代码调整 2022-06-01 13:18:17 +08:00
joylink_cuiweidong
3adb71b96a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-31 18:13:47 +08:00
joylink_cuiweidong
2976889742 代码调整 2022-05-31 18:12:47 +08:00
fan
2d041bd676 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-31 18:09:57 +08:00
fan
270c32052c ctc显示调整 05/31 2022-05-31 18:09:34 +08:00
joylink_cuiweidong
90428b6f8e 代码调整 2022-05-31 14:28:15 +08:00
joylink_cuiweidong
0c0b907433 ctc 添加 阶段计划相关页面 2022-05-31 11:31:21 +08:00
joylink_cuiweidong
6e6c548d73 代码调整 2022-05-30 18:06:03 +08:00
fan
93c5bc4fb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-30 17:34:58 +08:00
fan
81667572fc 实训仿真结束 退出实训界面 2022-05-30 17:34:44 +08:00
fan
85dac873de ctc界面调整2 2022-05-30 17:28:46 +08:00
joylink_cuiweidong
669650f8d7 代码调整 2022-05-30 15:44:45 +08:00
joylink_cuiweidong
4647e6530b 代码调整 2022-05-30 15:17:31 +08:00
fan
6c5c2b8d4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-27 15:55:22 +08:00
fan
758b5b69e2 ctc界面调整1 2022-05-27 15:55:03 +08:00
fan
2d4a196dc8 区段增加方向运行端点 2022-05-27 15:54:14 +08:00
joylink_cuiweidong
a53798ebbe 代码调整 2022-05-27 13:08:39 +08:00
fan
5ebb0139ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-27 09:51:51 +08:00
fan
6149770821 指示灯关联调整 2022-05-27 09:51:29 +08:00
joylink_cuiweidong
e4af19e155 添加 删车次号 指令 
修改操作的名称
增加备用车 -》 增加车次
删除列车   -》 删车次号
修改车次   -》 变更车次号
 2022-05-26 16:41:40 +08:00
joylink_cuiweidong
56f6c6923c 大铁 把【修改车次】【添加备用车】放到普通模式下 2022-05-25 15:22:26 +08:00
joylink_cuiweidong
8127b76cb6 大铁项目 仿真 不显示 时间 2022-05-25 14:18:55 +08:00
joylink_cuiweidong
83832344e0 大铁项目 修改车次 页面代码调整 2022-05-25 14:10:14 +08:00
joylink_cuiweidong
df872fc852 大铁线路 添加 修改车次号指令 2022-05-25 09:56:57 +08:00
joylink_cuiweidong
c1880fad4b 大铁线路 增加备用车 输入车次号【自动判别上下行】，无需人工输入上下行 单号是下行 2022-05-24 17:43:11 +08:00
joylink_cuiweidong
d3041dc121 添加 停止行驶 指令（右键列车->停车，普通模式也可以操作） 2022-05-24 17:13:37 +08:00
fan
0668dc181d 大铁取消 橙光带故障和 驾驶至 2022-05-23 15:50:22 +08:00
fan
bc15cb8d12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-23 15:12:07 +08:00
fan
7a7cbf9ae8 大铁调整 n5 2022-05-23 15:11:55 +08:00
joylink_cuiweidong
2de695cea3 修改分路不良状态字段 2022-05-23 09:47:37 +08:00
joylink_cuiweidong
e6876ee7f4 代码调整 2022-05-19 14:29:16 +08:00
joylink_cuiweidong
6dc2afe158 大铁线路 分路不良 指令代码调整 2022-05-19 14:23:46 +08:00
joylink_cuiweidong
ca534acac6 大铁项目 分路不良 弹窗页面调整 2022-05-19 13:33:21 +08:00
joylink_cuiweidong
fc8359273d 分路不良 界面代码调整 2022-05-18 17:42:16 +08:00
joylink_cuiweidong
90e26a800c 大铁线路 添加 上电解锁操作 2022-05-18 17:09:51 +08:00
joylink_cuiweidong
4da6ce092d 大铁项目 添加 非常站控 指令 
允许自律 状态代码调整
 2022-05-17 16:32:39 +08:00
joylink_cuiweidong
8b2bb77c12 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-17 10:12:31 +08:00
joylink_cuiweidong
81cdaafa58 大铁线路 列车 车次号显示 调整 2022-05-17 10:10:06 +08:00
fan
0253210cf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-17 09:24:34 +08:00
fan
45975a34ee 大铁调整 n4 2022-05-17 09:23:34 +08:00
joylink_cuiweidong
6e9ca25459 代码调整 2022-05-16 18:23:44 +08:00
joylink_cuiweidong
9a3a4242fc 代码调整 2022-05-16 18:15:47 +08:00
joylink_cuiweidong
0353d4dfa2 代码调整 2022-05-16 17:47:49 +08:00
joylink_cuiweidong
5fa8169d43 代码调整 2022-05-16 17:41:55 +08:00
joylink_cuiweidong
fe71d218a9 代码调整 2022-05-16 17:39:43 +08:00
joylink_cuiweidong
62c2a3dbda 大铁项目 添加 模拟车次输入 操作、 
大铁小敏 车身显示车次号
 2022-05-16 17:35:31 +08:00
joylink_cuiweidong
e0f39c9f3d 大铁线路 列车添加发车指令 2022-05-16 15:07:25 +08:00
Yuan
53a2a1478d 信号机灯状态增加RW 2022-05-12 11:29:55 +08:00
fan
a69e27f434 大铁调整 n3 2022-05-11 16:10:54 +08:00
fan
3f35cfab91 大铁调整 n2 2022-05-11 16:02:14 +08:00
fan
54d73107cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-11 14:56:20 +08:00
fan
85fd48f700 大铁调整 n1 2022-05-11 14:56:08 +08:00
joylink_cuiweidong
6b28de5174 闭塞、还原的口令验证删除 
事故的pressDown删除
 2022-05-11 14:29:35 +08:00
fan
2612a71b08 大铁调整 列车显示问题调整1 2022-05-10 15:30:55 +08:00
fan
5057180826 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-10 14:18:54 +08:00
fan
4a98985e75 大铁调整 列车显示问题调整 2022-05-10 14:18:32 +08:00
joylink_cuiweidong
f07ce67081 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-09 11:27:15 +08:00
joylink_cuiweidong
2499d6139d 添加 事故指令 2022-05-09 11:26:52 +08:00
fan
88b21fc723 信号机增加类型 2022-05-09 09:12:48 +08:00
fan
4552ac568b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-07 10:26:23 +08:00
fan
cca1c4f5e1 大铁线路调整35 2022-05-07 10:25:55 +08:00
joylink_cuiweidong
3d4b2eeec1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 18:08:58 +08:00
joylink_cuiweidong
0a57b5343f 代码调整 2022-05-06 18:08:42 +08:00
fan
52a304ef95 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 17:42:59 +08:00
fan
e2179ba453 大铁线路调整34 2022-05-06 17:42:05 +08:00
joylink_cuiweidong
d91c6cbbfd 代码调整 2022-05-06 16:55:50 +08:00
joylink_cuiweidong
310abf5778 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 16:36:23 +08:00
joylink_cuiweidong
25dc683c81 代码调整 2022-05-06 16:36:09 +08:00
fan
5b8a672342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 16:27:53 +08:00
fan
9cce0ba353 大铁线路调整33 2022-05-06 16:27:30 +08:00
joylink_cuiweidong
08a08646ac 代码调整 2022-05-06 16:17:50 +08:00
joylink_cuiweidong
663d542e55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 16:06:00 +08:00
joylink_cuiweidong
4d575c84cb 代码调整 2022-05-06 16:05:40 +08:00
fan
050df85465 大铁线路调整32 2022-05-06 15:09:55 +08:00
fan
9cd2b9b2d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 14:22:52 +08:00
fan
826fbae799 大铁线路调整31 2022-05-06 14:22:26 +08:00
joylink_cuiweidong
5ecdf0cb86 代码调整 2022-05-06 11:14:27 +08:00
joylink_cuiweidong
90b6f6d6f9 代码调整 2022-05-06 11:07:16 +08:00
joylink_cuiweidong
50c0f3abaf 闭塞状态 代码调整 2022-05-06 10:32:28 +08:00
joylink_cuiweidong
c01e352610 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-06 09:39:48 +08:00
joylink_cuiweidong
0544fc753c 添加 阻塞 复原指令 2022-05-06 09:39:21 +08:00
fan
aee6474645 大铁线路调整30 2022-05-05 17:08:17 +08:00
fan
86b955698b 大铁线路调整29 2022-05-05 15:08:34 +08:00
fan
12dda78b7b 大铁线路调整28 控制模式调整 2022-05-05 13:54:29 +08:00
fan
b164e99a77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-29 16:32:40 +08:00
fan
7c8cbdf59c 大铁线路调整27 增加信号机类型 2022-04-29 16:32:23 +08:00
joylink_cuiweidong
67ac268077 代码调整 2022-04-29 16:07:45 +08:00
joylink_cuiweidong
a7cad4ab2e 总辅助 接辅助指令 发辅助指令 代码调整 2022-04-29 15:46:57 +08:00
joylink_cuiweidong
0212d2c0de 状态代码调整 2022-04-29 15:29:25 +08:00