Commit Graph

11322 Commits

Author SHA1 Message Date
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