Commit Graph

11365 Commits

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