joylink_cuiweidong
|
a2c685d6bb
|
实训管理代码调整
|
2022-10-27 18:13:03 +08:00 |
|
joylink_cuiweidong
|
1381bd8a9c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-26 18:17:36 +08:00 |
|
joylink_cuiweidong
|
75f7165750
|
实训管理代码调整
|
2022-10-26 18:16:54 +08:00 |
|
fan
|
9e4576d30c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-25 18:02:42 +08:00 |
|
joylink_cuiweidong
|
7dee28ea8e
|
代码调整
|
2022-10-25 17:23:44 +08:00 |
|
joylink_cuiweidong
|
21b526bce0
|
代码调整
|
2022-10-25 15:18:22 +08:00 |
|
fan
|
205fce9512
|
代码调整
|
2022-10-25 10:45:23 +08:00 |
|
joylink_cuiweidong
|
6d20dcb132
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:21:16 +08:00 |
|
joylink_cuiweidong
|
1475848fea
|
综合演练代码调整
|
2022-10-24 18:20:45 +08:00 |
|
Yuan
|
d4538b441d
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:13:47 +08:00 |
|
Yuan
|
90a1c03bd4
|
考试面板样式修改
|
2022-10-24 18:13:43 +08:00 |
|
fan
|
67492c4e90
|
代码调整
|
2022-10-24 17:34:14 +08:00 |
|
fan
|
cb61f11753
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:41:53 +08:00 |
|
fan
|
18f1c6231b
|
大铁菜单调整
|
2022-10-24 16:41:38 +08:00 |
|
joylink_cuiweidong
|
1d565398e9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:21:52 +08:00 |
|
joylink_cuiweidong
|
63c362635a
|
代码调整
|
2022-10-24 16:21:38 +08:00 |
|
Yuan
|
4e0635b7ad
|
考试-理论
|
2022-10-24 15:31:54 +08:00 |
|
Yuan
|
a11c8d8829
|
理论考试提交
|
2022-10-24 13:47:36 +08:00 |
|
Yuan
|
0fe83a4f31
|
考试-理论
|
2022-10-24 13:16:01 +08:00 |
|
Yuan
|
44fcdee7cf
|
WIP:考试面板
|
2022-10-24 13:12:14 +08:00 |
|
joylink_cuiweidong
|
bc48d4c82e
|
代码调整
|
2022-10-21 16:53:24 +08:00 |
|
joylink_cuiweidong
|
16beaf8f94
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/newMap/display/terminals/index.vue
# src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:49:14 +08:00 |
|
joylink_cuiweidong
|
42dc17d87e
|
大客流视图代码调整
|
2022-10-21 16:46:35 +08:00 |
|
fan
|
afa5a9aeab
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/terminals/index.vue
src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:12:55 +08:00 |
|
fan
|
354192e953
|
代码调整
|
2022-10-21 16:10:05 +08:00 |
|
joylink_cuiweidong
|
baf089d889
|
大客流策略客户端 代码调整
|
2022-10-21 15:52:20 +08:00 |
|
joylink_cuiweidong
|
b0431f00f8
|
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-10-21 11:30:35 +08:00 |
|
joylink_cuiweidong
|
34ff82d6e9
|
菜单添加实训按钮 代码调整
|
2022-10-21 10:38:36 +08:00 |
|
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 |
|
joylink_cuiweidong
|
6b6ea5d741
|
代码调整
|
2022-09-23 10:39:50 +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 |
|
Yuan
|
3266a7478d
|
Merge branch 'yly' into test
|
2022-09-19 18:02:23 +08:00 |
|
Yuan
|
9b9f0ebfa9
|
仿真时间修改统一
|
2022-09-19 18:01:57 +08:00 |
|
fan
|
62d864d996
|
代码调整
|
2022-09-19 16:58:18 +08:00 |
|
dong
|
62904d9056
|
添加设置调度台数据界面
|
2022-09-19 15:39:55 +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 |
|
fan
|
e766d714b7
|
实训调整
|
2022-09-15 17:43:11 +08:00 |
|
joylink_cuiweidong
|
b72736813a
|
代码调整
|
2022-09-15 10:20:45 +08:00 |
|