Commit Graph

11405 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
204d14e57c 代码调整 2022-04-29 14:02:43 +08:00
joylink_cuiweidong
06b954eca0 接发车状态 辅助灯状态 区间灯状态 具体颜色前端判断 2022-04-29 11:34:09 +08:00
joylink_cuiweidong
20c5f0ebfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 14:46:20 +08:00
joylink_cuiweidong
59be3f8fcc 改方按钮 加参数pressDown 1按下、0弹起 2022-04-28 14:46:08 +08:00
fan
c14c484152 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 13:34:36 +08:00
fan
7c2cddd441 大铁线路调整26 关联信号机调整 2022-04-28 13:34:17 +08:00
joylink_cuiweidong
a7e9638d4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 11:24:51 +08:00
joylink_cuiweidong
55b435c805 代码调整 2022-04-28 11:24:11 +08:00
fan
7e8fdaf1a3 大铁线路调整25 2022-04-28 10:40:18 +08:00
fan
48fcadb40e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-28 10:36:03 +08:00
fan
af2ffa23f3 大铁线路调整24 指示灯关联联锁数据调整 2022-04-28 10:35:41 +08:00
joylink_cuiweidong
6a51b9e626 大铁 接发车状态 区间占用状态 辅助状态 代码调整 2022-04-27 17:51:28 +08:00
fan
89642964bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
2022-04-27 17:37:08 +08:00
fan
1c04fd0bd6 大铁线路调整23 2022-04-27 17:35:36 +08:00
joylink_cuiweidong
ce1d6527ed 代码调整 2022-04-27 16:57:03 +08:00
joylink_cuiweidong
6fb7296348 代码调整 2022-04-25 10:22:00 +08:00
fan
e65abe322a 大铁线路调整22 2022-04-24 17:40:55 +08:00
fan
0c57bdac50 大铁线路调整21 2022-04-24 17:06:21 +08:00
fan
9ed6c38a4e 大铁线路调整20 2022-04-24 15:20:12 +08:00
fan
b8a27f74aa 大铁线路调整19 2022-04-24 14:05:08 +08:00
fan
216166c572 大铁线路调整18 2022-04-24 14:03:48 +08:00
fan
279522f544 大铁线路调整17 precess调整 2022-04-24 13:17:57 +08:00
fan
6d5276d95f 大铁线路调整16 2022-04-24 11:26:49 +08:00
fan
e24b992ab9 大铁线路调整15 2022-04-24 11:14:44 +08:00
fan
a32a230ed8 大铁线路调整14 2022-04-24 11:04:04 +08:00
fan
cd326ea8f6 大铁线路调整13 - 修改接发车箭头大小 2022-04-24 09:18:18 +08:00
fan
3202fc1b40 大铁线路调整12 2022-04-22 19:13:44 +08:00
fan
e155975b43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 17:56:01 +08:00