Commit Graph

11446 Commits

Author SHA1 Message Date
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
f950bf8536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 13:09:56 +08:00
ed21d70bc4 local-test 打包配置 2022-06-30 13:09:40 +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