Commit Graph

12024 Commits

Author SHA1 Message Date
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
fan
93a3deb20c 大铁线路调整11 2022-04-22 17:55:42 +08:00
joylink_cuiweidong
3772012be2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 17:23:27 +08:00
joylink_cuiweidong
cc08d0f51b 代码调整 2022-04-22 17:23:12 +08:00
fan
3e5ad8b05f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 16:34:55 +08:00
fan
3420059adf 大铁线路调整10 2022-04-22 16:34:34 +08:00
joylink_cuiweidong
6115eaa54e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 15:50:40 +08:00
joylink_cuiweidong
aad698880e 代码调整 2022-04-22 15:50:27 +08:00
fan
82aaeee2cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-22 15:34:18 +08:00
fan
daff80c19e 大铁线路调整9 2022-04-22 15:33:57 +08:00
joylink_cuiweidong
0d6be6e129 添加改方指令 2022-04-22 15:23:50 +08:00
joylink_cuiweidong
de4f4d2aa6 区段占用,辅助状态,接发车箭头 状态代码调整 2022-04-22 15:08:36 +08:00
fan
5e30c99d2c 大铁线路调整8 2022-04-22 14:40:31 +08:00
fan
140f6306ed 大铁线路调整7 2022-04-21 16:13:33 +08:00
fan
c5d60323e2 大铁线路调整6 联锁数据调整 2022-04-21 15:10:43 +08:00
fan
a90fbd6f67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-21 10:02:32 +08:00
fan
a045d2c776 大铁线路调整5 2022-04-21 10:02:13 +08:00
joylink_cuiweidong
e191d0354d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 19:18:38 +08:00
joylink_cuiweidong
a7f24b860b 代码调整 2022-04-19 19:18:31 +08:00
fan
c0bbf35455 大铁线路调整4 2022-04-19 17:55:27 +08:00
fan
e07e06a3bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 16:14:41 +08:00
fan
0099c51a9d 大铁线路调整3 2022-04-19 16:14:17 +08:00
joylink_cuiweidong
4d694c459c 代码调整 2022-04-19 14:07:27 +08:00
joylink_cuiweidong
46fa576fa4 代码调整 2022-04-19 14:03:06 +08:00
joylink_cuiweidong
3b839937ac 代码调整 2022-04-19 13:45:00 +08:00
joylink_cuiweidong
4b86b7ac03 代码调整 2022-04-18 18:54:21 +08:00
joylink_cuiweidong
0312ebd77c 代码调整 2022-04-18 18:43:39 +08:00
joylink_cuiweidong
63ecb61501 代码调整 2022-04-18 17:13:54 +08:00
joylink_cuiweidong
377c1d34b6 代码调整 2022-04-18 17:10:12 +08:00
joylink_cuiweidong
955311e03c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-18 16:20:23 +08:00
joylink_cuiweidong
dfec35ff2c 代码调整 2022-04-18 15:41:37 +08:00
fan
1dcb5fe1dc 大铁线路调整2
(cherry picked from commit 6ed22109af)
2022-04-18 15:02:14 +08:00