Commit Graph

2988 Commits

Author SHA1 Message Date
Yuan
2601028c19 WIP: 考试 2022-10-20 18:22:56 +08:00
joylink_cuiweidong
090b07bb41 代码调整 2022-10-20 17:56:55 +08:00
joylink_cuiweidong
85e0abea4a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 16:23:16 +08:00
joylink_cuiweidong
77d0488450 代码调整 2022-10-20 16:22:56 +08:00
fan
19db91123c 设备右键菜单暂提 2022-10-19 15:32:56 +08:00
fan
1764b10908 代码调整 2022-10-17 18:03:31 +08:00
fan
470260e03d 代码调整 2022-10-17 15:40:33 +08:00
fan
cb19a6b423 代码调整 2022-10-14 18:02:22 +08:00
joylink_cuiweidong
7260d592ea Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 15:43:44 +08:00
joylink_cuiweidong
170be716d3 代码调整 2022-10-14 15:43:30 +08:00
fan
4434420415 地图绘制返回调整 2022-10-14 15:31:58 +08:00
fan
fd82c05d03 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 14:50:51 +08:00
fan
f6ee224404 代码调整 2022-10-14 14:50:16 +08:00
joylink_cuiweidong
8ceca6ba90 代码调整 2022-10-13 17:50:57 +08:00
fan
322a227fc8 代码调整 2022-10-13 17:48:34 +08:00
fan
bd8d61da61 代码调整 2022-10-13 10:11:54 +08:00
fan
c1ceebed5e 代码调整 2022-10-13 09:37:30 +08:00
fan
a5ca2501da 仿真显示调整 2022-10-11 17:24:40 +08:00
fan
fe212c8cb6 暂提 2022-10-11 15:31:46 +08:00
fan
b42faa34e4 暂提 2022-10-11 11:00:33 +08:00
fan
d37b5a45dd 仿真界面调整 2022-10-11 09:55:07 +08:00
fan
ecc7f73d5b Merge remote-tracking branch 'origin/test' into test_dispaly
# Conflicts:
#	src/utils/stomp.js
#	src/views/jlmap3d/passflow/jl3dpassflow.vue
#	src/views/login/index.vue
2022-10-09 11:02:09 +08:00
fan
2bf3ce2e2a 客户端代码调整 2022-10-09 10:55:53 +08:00
fan
a6917c1d17 实训调整 2022-10-08 18:12:28 +08:00
fan
63962a1f7e 暂提 2022-10-08 15:35:35 +08:00
dong
5da594ec55 代码调整 2022-10-08 10:34:32 +08:00
fan
97670ddb63 去除日志 2022-09-30 17:37:59 +08:00
fan
c73cb667ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-30 17:34:41 +08:00
fan
79e27bf5dc 实训画面位置切换调整 2022-09-30 17:34:23 +08:00
dong
f9fe3ab615 添加调度台code 2022-09-30 17:26:53 +08:00
fan
26062f736c 暂提 2022-09-30 13:11:55 +08:00
fan
eafd1634f5 暂提 2022-09-29 14:36:01 +08:00
fan
0967f30d1a 暂提 2022-09-28 17:06:15 +08:00
fan
307a6e66d0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
 Conflicts:
	src/views/newMap/display/index.vue
2022-09-28 15:47:54 +08:00
fan
0cc9eded9f 仿真结构调整 2022-09-28 15:46:07 +08:00
joylink_cuiweidong
aeb4560684 代码调整 2022-09-28 14:13:23 +08:00
joylink_cuiweidong
b388f10c02 代码调整 2022-09-28 13:36:31 +08:00
joylink_cuiweidong
9ebf00d08a 代码调整 2022-09-27 16:57:42 +08:00
joylink_cuiweidong
37fe752136 代码调整 2022-09-27 16:18:35 +08:00
joylink_cuiweidong
9fe0241959 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-27 11:08:21 +08:00
joylink_cuiweidong
4aea3760fd 行调工作站,初始化之后再按计划行车,没有默认时间 代码调整 2022-09-27 11:07:00 +08:00
Yuan
9fd6156e2d PIS logo更换 2022-09-27 10:48:16 +08:00
joylink_cuiweidong
4b3fefbf27 代码调整 2022-09-26 18:27:05 +08:00
joylink_cuiweidong
e042b728e8 真实cctv 断线重连 2022-09-26 17:51:50 +08:00
joylink_cuiweidong
47bdeed516 增加 仿真 开始/暂停 组件 2022-09-26 15:58:20 +08:00
joylink_cuiweidong
4238abdeb5 代码调整 2022-09-26 10:38:27 +08:00
fan
78b5d5fd76 暂提 2022-09-26 09:14:11 +08:00
joylink_cuiweidong
bea349a439 代码调整 2022-09-23 17:18:38 +08:00
dong
b1d6d3ba3f 实训设计添加按钮Id 2022-09-23 16:22:46 +08:00
joylink_cuiweidong
d6a3be6bc1 代码调整 2022-09-23 14:43:05 +08:00