fan
|
18c08018c6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-09 10:56:01 +08:00 |
|
fan
|
2bf3ce2e2a
|
客户端代码调整
|
2022-10-09 10:55:53 +08:00 |
|
fan
|
bc56e72414
|
Revert "Revert "调度命令调整""
This reverts commit 802f4abbc0 .
|
2022-10-09 09:13:49 +08:00 |
|
fan
|
802f4abbc0
|
Revert "调度命令调整"
This reverts commit 062a5f2d73 .
|
2022-10-08 18:25:12 +08:00 |
|
fan
|
6704c4ef4d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-10-08 18:14:10 +08:00 |
|
fan
|
a6917c1d17
|
实训调整
|
2022-10-08 18:12:28 +08:00 |
|
dong
|
623b42332e
|
代码调整
|
2022-10-08 16:58:18 +08:00 |
|
dong
|
062a5f2d73
|
调度命令调整
|
2022-10-08 16:57:48 +08:00 |
|
fan
|
3c1bc4e700
|
Revert "登录页面增加组织选择"
This reverts commit b2acf8dc27 .
|
2022-10-08 16:37:37 +08:00 |
|
fan
|
63962a1f7e
|
暂提
|
2022-10-08 15:35:35 +08:00 |
|
joylink_cuiweidong
|
ba3e306211
|
代码调整
|
2022-10-08 14:04:25 +08:00 |
|
joylink_cuiweidong
|
89e5543aae
|
代码调整
|
2022-10-08 13:29:10 +08:00 |
|
dong
|
5da594ec55
|
代码调整
|
2022-10-08 10:34:32 +08:00 |
|
Yuan
|
87b50ba37c
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-09-30 17:52:18 +08:00 |
|
joylink_cuiweidong
|
3ae2b5acd5
|
代码调整
|
2022-09-30 17:52:16 +08:00 |
|
Yuan
|
2dab07eb44
|
登录页面增加组织选择
|
2022-09-30 17:51:45 +08:00 |
|
Yuan
|
b2acf8dc27
|
登录页面增加组织选择
|
2022-09-30 17:51:38 +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
|
bc5b837d22
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-30 16:59:04 +08:00 |
|
joylink_cuiweidong
|
91c804b2ff
|
代码调整
|
2022-09-30 14:46:02 +08:00 |
|
fan
|
d8686ec6af
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-09-30 13:12:57 +08:00 |
|
fan
|
26062f736c
|
暂提
|
2022-09-30 13:11:55 +08:00 |
|
joylink_cuiweidong
|
1fa85333ad
|
代码调整
|
2022-09-30 10:34:12 +08:00 |
|
joylink_cuiweidong
|
dcfbe22510
|
代码调整
|
2022-09-29 16:59:38 +08:00 |
|
joylink_cuiweidong
|
c2c746406e
|
校验 项目和前端项目配置 是否存在
|
2022-09-29 16:50:22 +08:00 |
|
joylink_cuiweidong
|
e29fdb0cb3
|
代码调整
|
2022-09-29 16:30:20 +08:00 |
|
joylink_cuiweidong
|
3ed2c52a73
|
前端项目配置信息 添加修改操作 代码调整
|
2022-09-29 15:56:17 +08:00 |
|
fan
|
1f8bb3c80b
|
iscs 闸机调整
|
2022-09-29 15:54:18 +08:00 |
|
fan
|
eafd1634f5
|
暂提
|
2022-09-29 14:36:01 +08:00 |
|
joylink_cuiweidong
|
25697b67c9
|
前端项目配置信息 查询删除操作 代码调整
|
2022-09-29 13:45:46 +08:00 |
|
fan
|
e2b51b6737
|
iscs闸机调整
|
2022-09-28 17:38:30 +08:00 |
|
joylink_cuiweidong
|
5587a3e312
|
代码调整
|
2022-09-28 17:37:22 +08:00 |
|
joylink_cuiweidong
|
ae3c42ab29
|
项目 增删改查 接口调整
|
2022-09-28 17:22:25 +08:00 |
|
fan
|
9f792f2667
|
iscs闸机调整
|
2022-09-28 17:08:29 +08:00 |
|
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 |
|
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
|
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 |
|
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 |
|
Yuan
|
d388631b60
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-09-23 16:12:05 +08:00 |
|
Yuan
|
21e3d49f48
|
车辆和站台PIS增加背景图
|
2022-09-23 16:11:59 +08:00 |
|
joylink_cuiweidong
|
d6a3be6bc1
|
代码调整
|
2022-09-23 14:43:05 +08:00 |
|
dong
|
255964bfe3
|
代码调整
|
2022-09-23 14:11:08 +08:00 |
|
Yuan
|
99a364abf9
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-09-23 11:18:34 +08:00 |
|
Yuan
|
b6401aef96
|
ISCS 信息发布修改
|
2022-09-23 11:18:27 +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 |
|
fan
|
8d2a995fba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-23 09:20:26 +08:00 |
|
fan
|
f0ee41a06c
|
pa 时间处理
|
2022-09-23 09:20:06 +08:00 |
|
Yuan
|
6313b17345
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-09-22 18:21:28 +08:00 |
|
Yuan
|
8d314acc54
|
PIS滚动信息修改 && ISCS车站广播
|
2022-09-22 18:19:40 +08:00 |
|
fan
|
22355cf11a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-09-22 17:41:00 +08:00 |
|
fan
|
768af89057
|
ISCS资源增加类型
|
2022-09-22 17:40:50 +08:00 |
|
dong
|
c76ca2288c
|
代码调整
|
2022-09-22 17:03:13 +08:00 |
|
fan
|
986fe7eada
|
PA系统调整
|
2022-09-22 16:58:23 +08:00 |
|
joylink_cuiweidong
|
a4a009b808
|
代码调整
|
2022-09-22 16:43:25 +08:00 |
|