Commit Graph

10964 Commits

Author SHA1 Message Date
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
0929b54f9d 实训双击问题调整 2022-06-06 16:51:06 +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
215dab7074 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
2022-05-30 17:44:09 +08:00
fan
013e667452 实训仿真结束 退出实训界面 2022-05-30 17:38:16 +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
b05cedd44c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/jmapNew/config/skinCode/datie_02.js
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
2022-05-20 18:24:36 +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