Commit Graph

12219 Commits

Author SHA1 Message Date
fan
0967f30d1a 暂提 2022-09-28 17:06:15 +08:00
fan
f68f1ce275 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-28 16:57:53 +08:00
fan
4217b149df ISCS闸机状态变化 2022-09-28 16:57:35 +08:00
joylink_cuiweidong
a9fbdec815 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-28 16:01:04 +08:00
joylink_cuiweidong
178c9f63a4 添加项目配置接口 2022-09-28 16:00:53 +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
Yuan
be0a8cc9da pis类名修改避免污染 2022-09-28 14:37:52 +08:00
Yuan
b94acfb533 pis类名修改避免污染 2022-09-28 14:36:15 +08:00
Yuan
f2e26ac289 pis类名修改避免污染 2022-09-28 14:18:24 +08:00
joylink_cuiweidong
f58cdd4f1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-28 14:13:56 +08:00
joylink_cuiweidong
aeb4560684 代码调整 2022-09-28 14:13:23 +08:00
Yuan
3603c6eae5 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-28 14:02:58 +08:00
Yuan
487c798399 PIS轮播: 窗口隐藏时暂停 2022-09-28 14:02:51 +08:00
joylink_cuiweidong
b2d9b4fc9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-28 13:37:03 +08:00
joylink_cuiweidong
b388f10c02 代码调整 2022-09-28 13:36:31 +08:00
Yuan
6f77bdac0c 滚动信息发布去掉声音播放 2022-09-28 09:32:40 +08:00
Yuan
fe20f16b70 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-27 18:11:47 +08:00
Yuan
c4d2bad24e PIS轮播图 2022-09-27 18:11:40 +08:00
joylink_cuiweidong
9ebf00d08a 代码调整 2022-09-27 16:57:42 +08:00
joylink_cuiweidong
6068021153 代码调整 2022-09-27 16:19:48 +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
Yuan
47d5850517 站台PIS使用后端滚动字幕 2022-09-27 09:30:53 +08:00
Yuan
94d56cff1d Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 18:32:34 +08:00
Yuan
9b611239a9 pis滚动文字修改 2022-09-26 18:32:30 +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
43a43f2724 修改三维的订阅路径 2022-09-26 16:31:33 +08:00
joylink_cuiweidong
47bdeed516 增加 仿真 开始/暂停 组件 2022-09-26 15:58:20 +08:00
dong
5b95a05e29 代码调整 2022-09-26 15:31:00 +08:00
dong
419742737b 代码调整 2022-09-26 15:29:14 +08:00
dong
1bd6c8ea2e 代码调整 2022-09-26 15:11:55 +08:00
fan
9bc3133f02 ISCS状态调整 2022-09-26 14:27:41 +08:00
Yuan
c403857230 ISCS信息发布修改 2022-09-26 10:46:28 +08:00
joylink_cuiweidong
4238abdeb5 代码调整 2022-09-26 10:38:27 +08:00
Yuan
5e0983b124 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 10:09:44 +08:00
Yuan
276bffb930 PIS修改LOGO, 列车PIS适配, 文字修改 2022-09-26 10:09:36 +08:00
fan
282001a7be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-26 09:51:56 +08:00
fan
a3c280bf73 iSCS定时任务广播系统取仿真系统时间 2022-09-26 09:51:36 +08:00
fan
78b5d5fd76 暂提 2022-09-26 09:14:11 +08:00
2b96d9168b 修改PA系统停止播放无效bug 2022-09-23 21:25:16 +08:00
Yuan
c80213c9b1 站台PIS列车时间显示调整 2022-09-23 18:32:48 +08:00
joylink_cuiweidong
bea349a439 代码调整 2022-09-23 17:18:38 +08:00
Yuan
c467da9a09 图片URL改为PNG 2022-09-23 16:37:58 +08:00
Yuan
285e9b8ab6 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:30:11 +08:00
Yuan
06ff678a48 图片URL修改 2022-09-23 16:30:05 +08:00
dong
b1d6d3ba3f 实训设计添加按钮Id 2022-09-23 16:22:46 +08:00