Commit Graph

11969 Commits

Author SHA1 Message Date
fan
0cc9eded9f 仿真结构调整 2022-09-28 15:46:07 +08:00
fan
78b5d5fd76 暂提 2022-09-26 09:14:11 +08:00
fan
55570dbc03 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-23 09:41:08 +08:00
joylink_cuiweidong
a4a009b808 代码调整 2022-09-22 16:43:25 +08:00
joylink_cuiweidong
e9256df83b 代码调整 2022-09-22 13:11:34 +08:00
fan
d68008ad83 代码调整 2022-09-22 09:04:32 +08:00
fan
77cbbea8e2 暂提 2022-09-21 14:12:32 +08:00
joylink_cuiweidong
c7001e1946 代码调整 2022-09-21 13:20:40 +08:00
fan
a15c916719 暂提 2022-09-21 10:17:36 +08:00
fan
d184687860 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
 Conflicts:
	src/views/newMap/display/simulationMenu.vue
2022-09-21 09:16:40 +08:00
joylink_cuiweidong
b82a1c535a 代码调整 2022-09-20 18:05:02 +08:00
fan
198c8fb170 暂提 2022-09-20 17:21:01 +08:00
joylink_cuiweidong
5c948ea596 北交大 项目 菜单代码调整 2022-09-20 16:17:02 +08:00
fan
91c04e97b1 暂提 2022-09-20 14:22:44 +08:00
fan
62d864d996 代码调整 2022-09-19 16:58:18 +08:00
joylink_cuiweidong
b79202c70e 代码调整 2022-09-16 15:28:44 +08:00
joylink_cuiweidong
9657620d15 大铁线路 终端切换代码调整 2022-09-16 14:47:15 +08:00
joylink_cuiweidong
bf4b376d04 代码调整 2022-09-15 18:04:30 +08:00
joylink_cuiweidong
b72736813a 代码调整 2022-09-15 10:20:45 +08:00
joylink_cuiweidong
67bc0ba2db 代码调整 2022-09-14 16:45:08 +08:00
joylink_cuiweidong
bab3449b9a 代码调整 2022-09-14 16:16:20 +08:00
joylink_cuiweidong
cd9db0aa12 代码调整 2022-09-14 16:12:23 +08:00
joylink_cuiweidong
90554bd2be 代码调整 2022-09-13 17:37:26 +08:00
joylink_cuiweidong
d9a51cbcec 代码调整 2022-09-13 10:41:01 +08:00
joylink_cuiweidong
b5c0c0051d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-07 11:18:19 +08:00
joylink_cuiweidong
29af1e57f5 代码调整 2022-09-07 11:18:04 +08:00
Yuan
dca92ed5cb Merge branch 'yly' into test 2022-09-07 10:52:42 +08:00
Yuan
a202e872fa format 2022-09-07 10:52:18 +08:00
fan
b1419ef839 pictureList 显示调整 2022-09-07 09:50:59 +08:00
fan
b09e2f003c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-07 09:37:49 +08:00
fan
aea62ada61 增加prdType 2022-09-07 09:37:37 +08:00
Yuan
c7419c7066 操作日志查询&&信息窗口 2022-09-06 16:52:07 +08:00
fan
31f95a02c1 实训调整 2022-09-06 15:43:43 +08:00
fan
9e22641b95 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 17:55:52 +08:00
fan
6e049fd3e1 代码调整 2022-09-05 17:55:39 +08:00
joylink_cuiweidong
27b664aad7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-05 17:28:16 +08:00
joylink_cuiweidong
4413c17327 大铁线路 分路不良 代码调整 2022-09-05 17:27:47 +08:00
Yuan
f24d39b0d5 Merge branch 'yly' into test 2022-09-05 17:25:25 +08:00
Yuan
f67a43b92a 站存车管理页面 2022-09-05 17:25:07 +08:00
Yuan
eca2b2898c 站存车管理页面 2022-09-05 17:25:02 +08:00
joylink_cuiweidong
4a128b5f89 代码调整 2022-09-05 16:40:46 +08:00
joylink_cuiweidong
cd3c6e586a 大铁线路 现地 上电解锁代码调整 2022-09-05 16:35:42 +08:00
fan
229528d1ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 15:48:10 +08:00
fan
9edc8a12ae 代码调整 2022-09-05 15:47:56 +08:00
fan
802cc70bfc 区段增加最大最小公里标 2022-09-05 15:47:14 +08:00
dong
4093d02a54 代码调整 2022-09-05 14:32:26 +08:00
dong
cb5179fafb 实训设计代码调整 2022-09-05 14:23:20 +08:00
fan
0c626140ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 14:03:11 +08:00
fan
acc83c30be 点灯&&分路不良 2022-09-05 14:02:53 +08:00
dong
f7881c85e2 代码调整 2022-09-05 11:08:46 +08:00