joylink_cuiweidong
|
74888dfdfe
|
大铁项目 修改股道 代码调整
|
2022-06-07 17:01:25 +08:00 |
|
joylink_cuiweidong
|
5fcd8d4830
|
大铁项目 行车日志 修改股道 页面调整
|
2022-06-07 15:18:13 +08:00 |
|
fan
|
a0eaa636f9
|
实训双击问题调整
|
2022-06-06 16:43:11 +08:00 |
|
fan
|
d5e2e69965
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-06 16:30:38 +08:00 |
|
fan
|
19e70608a0
|
ctc显示调整 06/06
|
2022-06-06 16:29:42 +08:00 |
|
joylink_cuiweidong
|
3f8d4d919a
|
大铁项目 CTC 运行计划列表 弹窗代码调整
|
2022-06-06 16:29:06 +08:00 |
|
joylink_cuiweidong
|
8294a217ed
|
代码调整
|
2022-06-02 16:57:55 +08:00 |
|
joylink_cuiweidong
|
942f728596
|
大铁项目 CTC 运行计划列表 代码调整
|
2022-06-02 15:13:59 +08:00 |
|
joylink_cuiweidong
|
eaafd6e041
|
代码调整
|
2022-06-02 11:02:42 +08:00 |
|
joylink_cuiweidong
|
0529b94a5b
|
代码调整
|
2022-06-01 18:15:26 +08:00 |
|
joylink_cuiweidong
|
fcd3110e9f
|
代码调整
|
2022-06-01 15:34:53 +08:00 |
|
joylink_cuiweidong
|
c1e7198fa8
|
代码调整
|
2022-06-01 13:18:17 +08:00 |
|
joylink_cuiweidong
|
3adb71b96a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-31 18:13:47 +08:00 |
|
joylink_cuiweidong
|
2976889742
|
代码调整
|
2022-05-31 18:12:47 +08:00 |
|
fan
|
2d041bd676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-31 18:09:57 +08:00 |
|
fan
|
270c32052c
|
ctc显示调整 05/31
|
2022-05-31 18:09:34 +08:00 |
|
joylink_cuiweidong
|
90428b6f8e
|
代码调整
|
2022-05-31 14:28:15 +08:00 |
|
joylink_cuiweidong
|
0c0b907433
|
ctc 添加 阶段计划相关页面
|
2022-05-31 11:31:21 +08:00 |
|
joylink_cuiweidong
|
6e6c548d73
|
代码调整
|
2022-05-30 18:06:03 +08:00 |
|
fan
|
93c5bc4fb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-30 17:34:58 +08:00 |
|
fan
|
81667572fc
|
实训仿真结束 退出实训界面
|
2022-05-30 17:34:44 +08:00 |
|
fan
|
85dac873de
|
ctc界面调整2
|
2022-05-30 17:28:46 +08:00 |
|
joylink_cuiweidong
|
669650f8d7
|
代码调整
|
2022-05-30 15:44:45 +08:00 |
|
joylink_cuiweidong
|
4647e6530b
|
代码调整
|
2022-05-30 15:17:31 +08:00 |
|
fan
|
6c5c2b8d4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-27 15:55:22 +08:00 |
|
fan
|
758b5b69e2
|
ctc界面调整1
|
2022-05-27 15:55:03 +08:00 |
|
fan
|
2d4a196dc8
|
区段增加方向运行端点
|
2022-05-27 15:54:14 +08:00 |
|
joylink_cuiweidong
|
a53798ebbe
|
代码调整
|
2022-05-27 13:08:39 +08:00 |
|
fan
|
5ebb0139ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-27 09:51:51 +08:00 |
|
fan
|
6149770821
|
指示灯关联调整
|
2022-05-27 09:51:29 +08:00 |
|
joylink_cuiweidong
|
e4af19e155
|
添加 删车次号 指令
修改操作的名称
增加备用车 -》 增加车次
删除列车 -》 删车次号
修改车次 -》 变更车次号
|
2022-05-26 16:41:40 +08:00 |
|
joylink_cuiweidong
|
56f6c6923c
|
大铁 把【修改车次】【添加备用车】放到普通模式下
|
2022-05-25 15:22:26 +08:00 |
|
joylink_cuiweidong
|
8127b76cb6
|
大铁项目 仿真 不显示 时间
|
2022-05-25 14:18:55 +08:00 |
|
joylink_cuiweidong
|
83832344e0
|
大铁项目 修改车次 页面代码调整
|
2022-05-25 14:10:14 +08:00 |
|
joylink_cuiweidong
|
df872fc852
|
大铁线路 添加 修改车次号指令
|
2022-05-25 09:56:57 +08:00 |
|
joylink_cuiweidong
|
c1880fad4b
|
大铁线路 增加备用车 输入车次号【自动判别上下行】，无需人工输入上下行 单号是下行
|
2022-05-24 17:43:11 +08:00 |
|
joylink_cuiweidong
|
d3041dc121
|
添加 停止行驶 指令（右键列车->停车，普通模式也可以操作）
|
2022-05-24 17:13:37 +08:00 |
|
fan
|
0668dc181d
|
大铁取消 橙光带故障和 驾驶至
|
2022-05-23 15:50:22 +08:00 |
|
fan
|
bc15cb8d12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-23 15:12:07 +08:00 |
|
fan
|
7a7cbf9ae8
|
大铁调整 n5
|
2022-05-23 15:11:55 +08:00 |
|
joylink_cuiweidong
|
2de695cea3
|
修改分路不良状态字段
|
2022-05-23 09:47:37 +08:00 |
|
joylink_cuiweidong
|
e6876ee7f4
|
代码调整
|
2022-05-19 14:29:16 +08:00 |
|
joylink_cuiweidong
|
6dc2afe158
|
大铁线路 分路不良 指令代码调整
|
2022-05-19 14:23:46 +08:00 |
|
joylink_cuiweidong
|
ca534acac6
|
大铁项目 分路不良 弹窗页面调整
|
2022-05-19 13:33:21 +08:00 |
|
joylink_cuiweidong
|
fc8359273d
|
分路不良 界面代码调整
|
2022-05-18 17:42:16 +08:00 |
|
joylink_cuiweidong
|
90e26a800c
|
大铁线路 添加 上电解锁操作
|
2022-05-18 17:09:51 +08:00 |
|
joylink_cuiweidong
|
4da6ce092d
|
大铁项目 添加 非常站控 指令
允许自律 状态代码调整
|
2022-05-17 16:32:39 +08:00 |
|
joylink_cuiweidong
|
8b2bb77c12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 10:12:31 +08:00 |
|
joylink_cuiweidong
|
81cdaafa58
|
大铁线路 列车 车次号显示 调整
|
2022-05-17 10:10:06 +08:00 |
|
fan
|
0253210cf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 09:24:34 +08:00 |
|
fan
|
45975a34ee
|
大铁调整 n4
|
2022-05-17 09:23:34 +08:00 |
|
joylink_cuiweidong
|
6e9ca25459
|
代码调整
|
2022-05-16 18:23:44 +08:00 |
|
joylink_cuiweidong
|
9a3a4242fc
|
代码调整
|
2022-05-16 18:15:47 +08:00 |
|
joylink_cuiweidong
|
0353d4dfa2
|
代码调整
|
2022-05-16 17:47:49 +08:00 |
|
joylink_cuiweidong
|
5fa8169d43
|
代码调整
|
2022-05-16 17:41:55 +08:00 |
|
joylink_cuiweidong
|
fe71d218a9
|
代码调整
|
2022-05-16 17:39:43 +08:00 |
|
joylink_cuiweidong
|
62c2a3dbda
|
大铁项目 添加 模拟车次输入 操作、
大铁小敏 车身显示车次号
|
2022-05-16 17:35:31 +08:00 |
|
joylink_cuiweidong
|
e0f39c9f3d
|
大铁线路 列车添加发车指令
|
2022-05-16 15:07:25 +08:00 |
|
Yuan
|
53a2a1478d
|
信号机灯状态增加RW
|
2022-05-12 11:29:55 +08:00 |
|
fan
|
a69e27f434
|
大铁调整 n3
|
2022-05-11 16:10:54 +08:00 |
|
fan
|
3f35cfab91
|
大铁调整 n2
|
2022-05-11 16:02:14 +08:00 |
|
fan
|
54d73107cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-11 14:56:20 +08:00 |
|
fan
|
85fd48f700
|
大铁调整 n1
|
2022-05-11 14:56:08 +08:00 |
|
joylink_cuiweidong
|
6b28de5174
|
闭塞、还原的口令验证删除
事故的pressDown删除
|
2022-05-11 14:29:35 +08:00 |
|
fan
|
2612a71b08
|
大铁调整 列车显示问题调整1
|
2022-05-10 15:30:55 +08:00 |
|
fan
|
5057180826
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-10 14:18:54 +08:00 |
|
fan
|
4a98985e75
|
大铁调整 列车显示问题调整
|
2022-05-10 14:18:32 +08:00 |
|
joylink_cuiweidong
|
f07ce67081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-09 11:27:15 +08:00 |
|
joylink_cuiweidong
|
2499d6139d
|
添加 事故指令
|
2022-05-09 11:26:52 +08:00 |
|
fan
|
88b21fc723
|
信号机增加类型
|
2022-05-09 09:12:48 +08:00 |
|
fan
|
4552ac568b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-07 10:26:23 +08:00 |
|
fan
|
cca1c4f5e1
|
大铁线路调整35
|
2022-05-07 10:25:55 +08:00 |
|
joylink_cuiweidong
|
3d4b2eeec1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 18:08:58 +08:00 |
|
joylink_cuiweidong
|
0a57b5343f
|
代码调整
|
2022-05-06 18:08:42 +08:00 |
|
fan
|
52a304ef95
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 17:42:59 +08:00 |
|
fan
|
e2179ba453
|
大铁线路调整34
|
2022-05-06 17:42:05 +08:00 |
|
joylink_cuiweidong
|
d91c6cbbfd
|
代码调整
|
2022-05-06 16:55:50 +08:00 |
|
joylink_cuiweidong
|
310abf5778
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:36:23 +08:00 |
|
joylink_cuiweidong
|
25dc683c81
|
代码调整
|
2022-05-06 16:36:09 +08:00 |
|
fan
|
5b8a672342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:27:53 +08:00 |
|
fan
|
9cce0ba353
|
大铁线路调整33
|
2022-05-06 16:27:30 +08:00 |
|
joylink_cuiweidong
|
08a08646ac
|
代码调整
|
2022-05-06 16:17:50 +08:00 |
|
joylink_cuiweidong
|
663d542e55
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:06:00 +08:00 |
|
joylink_cuiweidong
|
4d575c84cb
|
代码调整
|
2022-05-06 16:05:40 +08:00 |
|
fan
|
050df85465
|
大铁线路调整32
|
2022-05-06 15:09:55 +08:00 |
|
fan
|
9cd2b9b2d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 14:22:52 +08:00 |
|
fan
|
826fbae799
|
大铁线路调整31
|
2022-05-06 14:22:26 +08:00 |
|
joylink_cuiweidong
|
5ecdf0cb86
|
代码调整
|
2022-05-06 11:14:27 +08:00 |
|
joylink_cuiweidong
|
90b6f6d6f9
|
代码调整
|
2022-05-06 11:07:16 +08:00 |
|
joylink_cuiweidong
|
50c0f3abaf
|
闭塞状态 代码调整
|
2022-05-06 10:32:28 +08:00 |
|
joylink_cuiweidong
|
c01e352610
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 09:39:48 +08:00 |
|
joylink_cuiweidong
|
0544fc753c
|
添加 阻塞 复原指令
|
2022-05-06 09:39:21 +08:00 |
|
fan
|
aee6474645
|
大铁线路调整30
|
2022-05-05 17:08:17 +08:00 |
|
fan
|
86b955698b
|
大铁线路调整29
|
2022-05-05 15:08:34 +08:00 |
|
fan
|
12dda78b7b
|
大铁线路调整28 控制模式调整
|
2022-05-05 13:54:29 +08:00 |
|
fan
|
b164e99a77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-29 16:32:40 +08:00 |
|
fan
|
7c8cbdf59c
|
大铁线路调整27 增加信号机类型
|
2022-04-29 16:32:23 +08:00 |
|
joylink_cuiweidong
|
67ac268077
|
代码调整
|
2022-04-29 16:07:45 +08:00 |
|
joylink_cuiweidong
|
a7cad4ab2e
|
总辅助 接辅助指令 发辅助指令 代码调整
|
2022-04-29 15:46:57 +08:00 |
|
joylink_cuiweidong
|
0212d2c0de
|
状态代码调整
|
2022-04-29 15:29:25 +08:00 |
|
joylink_cuiweidong
|
204d14e57c
|
代码调整
|
2022-04-29 14:02:43 +08:00 |
|
joylink_cuiweidong
|
06b954eca0
|
接发车状态 辅助灯状态 区间灯状态 具体颜色前端判断
|
2022-04-29 11:34:09 +08:00 |
|
joylink_cuiweidong
|
20c5f0ebfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 14:46:20 +08:00 |
|
joylink_cuiweidong
|
59be3f8fcc
|
改方按钮 加参数pressDown 1按下、0弹起
|
2022-04-28 14:46:08 +08:00 |
|
fan
|
c14c484152
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 13:34:36 +08:00 |
|
fan
|
7c2cddd441
|
大铁线路调整26 关联信号机调整
|
2022-04-28 13:34:17 +08:00 |
|
joylink_cuiweidong
|
a7e9638d4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 11:24:51 +08:00 |
|
joylink_cuiweidong
|
55b435c805
|
代码调整
|
2022-04-28 11:24:11 +08:00 |
|
fan
|
7e8fdaf1a3
|
大铁线路调整25
|
2022-04-28 10:40:18 +08:00 |
|
fan
|
48fcadb40e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 10:36:03 +08:00 |
|
fan
|
af2ffa23f3
|
大铁线路调整24 指示灯关联联锁数据调整
|
2022-04-28 10:35:41 +08:00 |
|
joylink_cuiweidong
|
6a51b9e626
|
大铁 接发车状态 区间占用状态 辅助状态 代码调整
|
2022-04-27 17:51:28 +08:00 |
|
fan
|
89642964bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButton.vue
|
2022-04-27 17:37:08 +08:00 |
|
fan
|
1c04fd0bd6
|
大铁线路调整23
|
2022-04-27 17:35:36 +08:00 |
|
joylink_cuiweidong
|
ce1d6527ed
|
代码调整
|
2022-04-27 16:57:03 +08:00 |
|
joylink_cuiweidong
|
6fb7296348
|
代码调整
|
2022-04-25 10:22:00 +08:00 |
|
fan
|
e65abe322a
|
大铁线路调整22
|
2022-04-24 17:40:55 +08:00 |
|
fan
|
0c57bdac50
|
大铁线路调整21
|
2022-04-24 17:06:21 +08:00 |
|
fan
|
9ed6c38a4e
|
大铁线路调整20
|
2022-04-24 15:20:12 +08:00 |
|
fan
|
b8a27f74aa
|
大铁线路调整19
|
2022-04-24 14:05:08 +08:00 |
|
fan
|
216166c572
|
大铁线路调整18
|
2022-04-24 14:03:48 +08:00 |
|
fan
|
279522f544
|
大铁线路调整17 precess调整
|
2022-04-24 13:17:57 +08:00 |
|
fan
|
6d5276d95f
|
大铁线路调整16
|
2022-04-24 11:26:49 +08:00 |
|
fan
|
e24b992ab9
|
大铁线路调整15
|
2022-04-24 11:14:44 +08:00 |
|
fan
|
a32a230ed8
|
大铁线路调整14
|
2022-04-24 11:04:04 +08:00 |
|
fan
|
cd326ea8f6
|
大铁线路调整13 - 修改接发车箭头大小
|
2022-04-24 09:18:18 +08:00 |
|
fan
|
3202fc1b40
|
大铁线路调整12
|
2022-04-22 19:13:44 +08:00 |
|
fan
|
e155975b43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 17:56:01 +08:00 |
|
fan
|
93a3deb20c
|
大铁线路调整11
|
2022-04-22 17:55:42 +08:00 |
|
joylink_cuiweidong
|
3772012be2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 17:23:27 +08:00 |
|
joylink_cuiweidong
|
cc08d0f51b
|
代码调整
|
2022-04-22 17:23:12 +08:00 |
|
fan
|
3e5ad8b05f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 16:34:55 +08:00 |
|
fan
|
3420059adf
|
大铁线路调整10
|
2022-04-22 16:34:34 +08:00 |
|
joylink_cuiweidong
|
6115eaa54e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 15:50:40 +08:00 |
|
joylink_cuiweidong
|
aad698880e
|
代码调整
|
2022-04-22 15:50:27 +08:00 |
|
fan
|
82aaeee2cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 15:34:18 +08:00 |
|
fan
|
daff80c19e
|
大铁线路调整9
|
2022-04-22 15:33:57 +08:00 |
|
joylink_cuiweidong
|
0d6be6e129
|
添加改方指令
|
2022-04-22 15:23:50 +08:00 |
|
joylink_cuiweidong
|
de4f4d2aa6
|
区段占用，辅助状态，接发车箭头 状态代码调整
|
2022-04-22 15:08:36 +08:00 |
|
fan
|
5e30c99d2c
|
大铁线路调整8
|
2022-04-22 14:40:31 +08:00 |
|
fan
|
140f6306ed
|
大铁线路调整7
|
2022-04-21 16:13:33 +08:00 |
|
fan
|
c5d60323e2
|
大铁线路调整6 联锁数据调整
|
2022-04-21 15:10:43 +08:00 |
|
fan
|
a90fbd6f67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-21 10:02:32 +08:00 |
|
fan
|
a045d2c776
|
大铁线路调整5
|
2022-04-21 10:02:13 +08:00 |
|
joylink_cuiweidong
|
e191d0354d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-19 19:18:38 +08:00 |
|
joylink_cuiweidong
|
a7f24b860b
|
代码调整
|
2022-04-19 19:18:31 +08:00 |
|
fan
|
c0bbf35455
|
大铁线路调整4
|
2022-04-19 17:55:27 +08:00 |
|
fan
|
e07e06a3bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-19 16:14:41 +08:00 |
|
fan
|
0099c51a9d
|
大铁线路调整3
|
2022-04-19 16:14:17 +08:00 |
|
joylink_cuiweidong
|
4d694c459c
|
代码调整
|
2022-04-19 14:07:27 +08:00 |
|
joylink_cuiweidong
|
46fa576fa4
|
代码调整
|
2022-04-19 14:03:06 +08:00 |
|
joylink_cuiweidong
|
3b839937ac
|
代码调整
|
2022-04-19 13:45:00 +08:00 |
|
joylink_cuiweidong
|
4b86b7ac03
|
代码调整
|
2022-04-18 18:54:21 +08:00 |
|
joylink_cuiweidong
|
0312ebd77c
|
代码调整
|
2022-04-18 18:43:39 +08:00 |
|
joylink_cuiweidong
|
63ecb61501
|
代码调整
|
2022-04-18 17:13:54 +08:00 |
|
joylink_cuiweidong
|
377c1d34b6
|
代码调整
|
2022-04-18 17:10:12 +08:00 |
|
joylink_cuiweidong
|
955311e03c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-18 16:20:23 +08:00 |
|
joylink_cuiweidong
|
dfec35ff2c
|
代码调整
|
2022-04-18 15:41:37 +08:00 |
|
fan
|
1dcb5fe1dc
|
大铁线路调整2
(cherry picked from commit 6ed22109af)
|
2022-04-18 15:02:14 +08:00 |
|
fan
|
2f82b1729b
|
大铁线路调整
(cherry picked from commit 7fbe309f70)
|
2022-04-18 15:01:47 +08:00 |
|
joylink_cuiweidong
|
3c109157c7
|
成绩统计代码调整
|
2022-04-18 14:40:05 +08:00 |
|
joylink_cuiweidong
|
5793ba270d
|
学生统计信息代码调整
|
2022-04-18 09:28:37 +08:00 |
|
joylink_cuiweidong
|
9b094a9814
|
代码调整
|
2022-04-15 18:45:08 +08:00 |
|
joylink_cuiweidong
|
e3da35b4df
|
代码调整
|
2022-04-15 15:26:12 +08:00 |
|
joylink_cuiweidong
|
75314eb114
|
学生统计页面添加
|
2022-04-15 14:46:24 +08:00 |
|
joylink_cuiweidong
|
e3b0189705
|
成绩统计 代码调整
|
2022-04-15 13:12:45 +08:00 |
|
joylink_cuiweidong
|
643467f9d2
|
学生单次考试成绩 页面添加
|
2022-04-15 13:10:29 +08:00 |
|
fan
|
adc9f3816e
|
佛山非通信车占用颜色调整
|
2022-03-25 13:53:43 +08:00 |
|
fan
|
92d192cfe5
|
联系方式调整
|
2022-03-15 10:04:39 +08:00 |
|
“sunzy”
|
f459c01246
|
增加三位课程页面滚动条
|
2022-01-24 09:55:52 +08:00 |
|
“sunzy”
|
6723006d27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-21 17:36:42 +08:00 |
|
“sunzy”
|
9ffd5d774b
|
baseurl
|
2022-01-21 17:36:38 +08:00 |
|
“sunzy”
|
8cb833d38c
|
修改三位课程例子事件，修改第一人称视角初始方向，增加徐州课程
|
2022-01-21 17:36:03 +08:00 |
|
joylink_fanyuhong
|
e9638e2524
|
提示调整
|
2022-01-21 13:55:37 +08:00 |
|
joylink_fanyuhong
|
31b5e1631b
|
iscs调整
(cherry picked from commit 38b1beeef5)
|
2022-01-20 19:08:05 +08:00 |
|
joylink_fanyuhong
|
4b3376ec27
|
iscs调整
|
2022-01-19 17:56:27 +08:00 |
|
joylink_fanyuhong
|
1945434421
|
iscs调整
|
2022-01-19 17:41:46 +08:00 |
|
joylink_fanyuhong
|
732c9de068
|
iscs调整
|
2022-01-19 17:35:52 +08:00 |
|
joylink_fanyuhong
|
12c3572807
|
iscs调整
|
2022-01-19 17:23:25 +08:00 |
|
joylink_fanyuhong
|
9b8fdc0c7e
|
iscs调整
|
2022-01-19 14:31:18 +08:00 |
|
joylink_fanyuhong
|
77040e93f4
|
iscs调整
|
2022-01-19 14:03:07 +08:00 |
|
joylink_fanyuhong
|
8d3a20cc01
|
iscs调整
|
2022-01-19 11:21:58 +08:00 |
|
joylink_fanyuhong
|
bcf3188046
|
iscs调整
|
2022-01-19 10:09:51 +08:00 |
|
joylink_fanyuhong
|
be904acb58
|
iscs调整
|
2022-01-19 10:09:12 +08:00 |
|
joylink_fanyuhong
|
39a2a21b95
|
iscs调整
|
2022-01-18 17:42:58 +08:00 |
|
joylink_fanyuhong
|
f1c77eca34
|
iscs调整
|
2022-01-18 16:50:24 +08:00 |
|
joylink_fanyuhong
|
cca82978c7
|
iscs调整
|
2022-01-18 16:43:26 +08:00 |
|
joylink_fanyuhong
|
3e15722d05
|
iscs调整
|
2022-01-18 15:51:24 +08:00 |
|
joylink_fanyuhong
|
a3d388ec96
|
iscs调整
|
2022-01-18 14:43:51 +08:00 |
|
joylink_fanyuhong
|
5b8681a9ff
|
iscs调整
|
2022-01-17 16:23:22 +08:00 |
|
joylink_fanyuhong
|
a1696e7f06
|
iscs调整
|
2022-01-17 15:08:34 +08:00 |
|
joylink_fanyuhong
|
8194c24f4d
|
iscs调整
|
2022-01-17 14:43:17 +08:00 |
|
joylink_fanyuhong
|
e8fb8abcf2
|
iscs调整
|
2022-01-17 14:19:03 +08:00 |
|
joylink_fanyuhong
|
02a499a26c
|
iscs调整
|
2022-01-14 17:23:25 +08:00 |
|
joylink_fanyuhong
|
7372eb5897
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-13 16:14:28 +08:00 |
|
joylink_fanyuhong
|
b084600199
|
福州ISCS显示调整&音频资源管理&ISCS设备管理&ISCS资源管理
|
2022-01-13 16:08:23 +08:00 |
|
“sunzy”
|
e3f5ff363b
|
修改三维课程bug
|
2022-01-12 11:11:25 +08:00 |
|
“sunzy”
|
fbcef50f40
|
修改徐州三维课程排序，修改课程模式获取
|
2022-01-12 11:08:27 +08:00 |
|
“sunzy”
|
6acf6c7bbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-10 18:13:14 +08:00 |
|
“sunzy”
|
b34d46bd15
|
修改三位课程播放器动画，增加课程
|
2022-01-10 18:13:06 +08:00 |
|
joylink_fanyuhong
|
a6a9522cd4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-10 14:35:55 +08:00 |
|
joylink_fanyuhong
|
79bd987a38
|
网页加载显示调整
|
2022-01-10 14:35:46 +08:00 |
|
“sunzy”
|
4affc37803
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-07 17:40:57 +08:00 |
|
“sunzy”
|
9974d6bc8a
|
修改徐州三维课程界面，三位课程播放器增加粒子效果
|
2022-01-07 17:40:51 +08:00 |
|
joylink_fanyuhong
|
62f22d0c73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-05 13:53:39 +08:00 |
|
joylink_fanyuhong
|
29a12d4980
|
url调整
|
2022-01-05 13:53:12 +08:00 |
|
“sunzy”
|
a08dc3c847
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-31 10:19:21 +08:00 |
|
“sunzy”
|
92a4fba1e3
|
修改三位课程界面
|
2021-12-31 10:19:17 +08:00 |
|
joylink_fanyuhong
|
3834766080
|
域名项目 增加 TEST 测试
|
2021-12-31 10:13:02 +08:00 |
|
joylink_fanyuhong
|
838c32df01
|
merge
|
2021-12-31 10:04:58 +08:00 |
|
joylink_fanyuhong
|
9dcb9669aa
|
单位二维码生成调整
|
2021-12-31 10:03:18 +08:00 |
|
“sunzy”
|
d9b7ef8a6f
|
修改三位课程页面
|
2021-12-30 23:53:16 +08:00 |
|
“sunzy”
|
f2f2878a99
|
修改配置地址
|
2021-12-30 19:36:26 +08:00 |
|
“sunzy”
|
23d5c662dd
|
修改三维课程地址配置
|
2021-12-30 19:30:52 +08:00 |
|
“sunzy”
|
706d911c84
|
merge
|
2021-12-30 17:22:23 +08:00 |
|
“sunzy”
|
ff7187f58f
|
merge
|
2021-12-30 17:21:40 +08:00 |
|
“sunzy”
|
f9375c0726
|
修改三位沙盘驾驶位置更新，修改三位课程页面
|
2021-12-30 17:19:59 +08:00 |
|
joylink_fanyuhong
|
a7c56b3592
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-30 09:35:11 +08:00 |
|
joylink_fanyuhong
|
5816fbf205
|
baseUrl 调整
|
2021-12-30 09:34:50 +08:00 |
|
joylink_fanyuhong
|
c4e9ab2341
|
扬州工业展示修改
|
2021-12-29 14:01:28 +08:00 |
|
joylink_fanyuhong
|
3c2563e3d1
|
暂提
|
2021-12-29 13:44:05 +08:00 |
|
joylink_fanyuhong
|
68b9524cce
|
zanti
|
2021-12-29 10:20:23 +08:00 |
|
joylink_fanyuhong
|
ba80caeb82
|
域名管理调整
|
2021-12-29 09:14:09 +08:00 |
|
joylink_fanyuhong
|
b3fb8bff0a
|
试卷管理调整--增加校验和重新生成
|
2021-12-28 09:37:14 +08:00 |
|
joylink_fanyuhong
|
d7886eeb3f
|
试卷管理调整--规则置灰调整
|
2021-12-23 13:53:57 +08:00 |
|
joylink_fanyuhong
|
d24cee6377
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-23 10:07:52 +08:00 |
|
joylink_fanyuhong
|
321fe3c076
|
试卷管理调整---新
|
2021-12-23 10:07:29 +08:00 |
|
“sunzy”
|
090c57aa5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-22 19:16:07 +08:00 |
|
“sunzy”
|
66def8c0ca
|
修改上传模型配置，修改三位课程联控成员
|
2021-12-22 19:16:03 +08:00 |
|
joylink_fanyuhong
|
f906fe891f
|
试卷管理调整new11
|
2021-12-22 17:23:34 +08:00 |
|
joylink_fanyuhong
|
e15460322b
|
试卷管理调整new
|
2021-12-22 16:25:51 +08:00 |
|
joylink_fanyuhong
|
c4af4ee996
|
试卷管理调整
|
2021-12-22 13:34:52 +08:00 |
|
“sunzy”
|
72034ece10
|
merge
|
2021-12-20 12:38:59 +08:00 |
|
“sunzy”
|
9029407378
|
“修改oss配置”
|
2021-12-20 12:38:28 +08:00 |
|
joylink_fanyuhong
|
151251a693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-20 11:19:10 +08:00 |
|
joylink_fanyuhong
|
48e49334eb
|
Merge branch 'master' into test
|
2021-12-20 11:17:34 +08:00 |
|
“sunzy”
|
8b0f62ca39
|
修改徐州三位沙盘模型配置
|
2021-12-20 10:46:20 +08:00 |
|
“sunzy”
|
99305b1f48
|
修改徐州三位沙盘模型配置
|
2021-12-20 10:39:24 +08:00 |
|
fan
|
88939d83ec
|
备案号调整
|
2021-12-17 13:55:38 +08:00 |
|
fan
|
294ac516f1
|
草稿课程编辑添加实训调整&编辑运行图loading调整
|
2021-12-17 13:34:03 +08:00 |
|
fan
|
acd799b1d6
|
南京二号线道岔区段锁闭显示调整
|
2021-12-17 10:24:48 +08:00 |
|
fan
|
4b4b98003c
|
Merge remote-tracking branch 'origin/test'
|
2021-12-16 18:10:04 +08:00 |
|
fan
|
27de47bc18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-16 17:45:19 +08:00 |
|
fan
|
68153921b0
|
道岔故障灯闪烁判断逻辑调整
|
2021-12-16 17:44:50 +08:00 |
|
sunzhenyu
|
7fa204b700
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-14 17:26:16 +08:00 |
|
sunzhenyu
|
72eebe0388
|
增加三维沙盘第一人称漫游，修改三维沙盘天气
|
2021-12-14 17:26:10 +08:00 |
|
fan
|
d9aaf08f3b
|
添加线路配置：站台折返策略不生效standTbStrategyIsInvalid，根据服务号更新车次计划updateTripPlanByServiceNumber；删除西安三 zc故障
|
2021-12-14 15:08:30 +08:00 |
|
fan
|
53dc950093
|
调整西安一三号线 折返显示颜色
|
2021-12-14 14:25:10 +08:00 |
|
fan
|
cf397fa9a0
|
取消登录进入 全屏
|
2021-12-14 10:06:01 +08:00 |
|
fan
|
c98fd9e0e0
|
批量设置停车点偏移量增加停车轨设置
|
2021-12-13 18:06:29 +08:00 |
|
fan
|
31767eea23
|
列车显示详情：最高ATP模式&最高信号系统控制
|
2021-12-10 17:52:40 +08:00 |
|
fan
|
fe5450fb08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 17:20:40 +08:00 |
|
fan
|
25ba9a047e
|
列车详情显示调整
|
2021-12-10 17:20:10 +08:00 |
|
joylink_cuiweidong
|
d8902f3db9
|
运行图编制 代码调整
|
2021-12-10 15:41:16 +08:00 |
|
joylink_cuiweidong
|
4bd0afbb44
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 14:17:27 +08:00 |
|
joylink_cuiweidong
|
cc431582e7
|
运行图编制 修改任务 代码调整
|
2021-12-10 14:16:25 +08:00 |
|
fan
|
04c57cda86
|
列车详情显示调整
|
2021-12-10 13:36:59 +08:00 |
|
fan
|
f2ceea6567
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 10:17:43 +08:00 |
|
fan
|
cfdae77620
|
project错误 提示调整
|
2021-12-10 10:17:22 +08:00 |
|
sunzhenyu
|
a28d49e40c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 18:10:48 +08:00 |
|
sunzhenyu
|
37b23d54b0
|
修改三维沙盘天气
|
2021-12-09 18:10:42 +08:00 |
|
joylink_cuiweidong
|
bc89210894
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 17:57:41 +08:00 |
|
joylink_cuiweidong
|
a97f83ef45
|
运行图代码调整
|
2021-12-09 17:56:54 +08:00 |
|
fan
|
66b72b101f
|
增加江苏安全技术职业学院登录页面
|
2021-12-09 17:54:19 +08:00 |
|
fan
|
afeec55025
|
延续保护 增加 保护区段ctc
|
2021-12-09 16:53:40 +08:00 |
|
fan
|
7b854e717e
|
显示配置车次窗设备修正=》判断调整
|
2021-12-09 14:57:55 +08:00 |
|
fan
|
27a56355dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 13:48:41 +08:00 |
|
fan
|
17e7467edf
|
显示配置增加车次窗设备修正&加载备用车close时清除数据
|
2021-12-09 13:48:15 +08:00 |
|
joylink_cuiweidong
|
8b86a8ddeb
|
运行图编制 添加计划/修改计划号码 代码调整
|
2021-12-09 13:23:24 +08:00 |
|
joylink_cuiweidong
|
3ee1dd21e5
|
运行图编制 新增计划 根据配置文件 设置服务号长度
|
2021-12-09 10:57:28 +08:00 |
|
fan
|
0bbf9667fb
|
merge
|
2021-12-08 15:43:19 +08:00 |
|
fan
|
fd03433df2
|
node-sass版本调整
|
2021-12-08 15:40:38 +08:00 |
|
sunzhenyu
|
32b785280e
|
merge
|
2021-12-08 15:11:48 +08:00 |
|
sunzhenyu
|
2d6be9aa56
|
baseurl
|
2021-12-08 15:11:25 +08:00 |
|
sunzhenyu
|
1ef4810214
|
修改开发模式下三维模型存储配置，添加沙盘天气图标
|
2021-12-08 15:09:54 +08:00 |
|
fan
|
e942f94c25
|
增加线路配置:tripNumberIsUnique:运行图中车次号是否唯一
|
2021-12-08 14:53:14 +08:00 |
|
fan
|
8c3c7e0f75
|
车辆翻转 运行时显示调整
|
2021-12-08 13:18:16 +08:00 |
|
fan
|
5a5dd046eb
|
仿真右侧列车显示过滤&加载备用车置灰已上线车辆
|
2021-12-07 14:10:07 +08:00 |
|
|
|
9631685998
|
Merge remote-tracking branch 'origin/test'
|
2021-12-06 21:19:18 +08:00 |
|
fan
|
2e0ba39171
|
车头翻转=》 停车状态时调整车头翻转显示
|
2021-12-06 13:09:17 +08:00 |
|
fan
|
830a630155
|
停车轨左右停车偏移放开
|
2021-12-03 17:50:37 +08:00 |
|
fan
|
84c4dd8ca1
|
批量翻转车头&车辆段仿真开放按计划行车和故障操作
|
2021-12-03 17:44:02 +08:00 |
|
fan
|
5ca3ca93ab
|
车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot
|
2021-12-03 13:25:20 +08:00 |
|
fan
|
573a489fea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-02 10:27:24 +08:00 |
|
fan
|
c4226ad607
|
道岔显示调整
|
2021-12-02 10:26:53 +08:00 |
|
sunzhenyu
|
8923a888c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-02 10:00:49 +08:00 |
|
sunzhenyu
|
fd10d6532f
|
修改三维驾驶设备柜
|
2021-12-02 10:00:41 +08:00 |
|
fan
|
80dbc39850
|
请求服务调整
|
2021-12-01 14:17:17 +08:00 |
|
fan
|
2f84cd6482
|
三方登录调整
|
2021-12-01 14:06:28 +08:00 |
|
fan
|
cca12938a4
|
Merge remote-tracking branch 'origin/test_baseUrl' into test
|
2021-12-01 13:11:26 +08:00 |
|
fan
|
cc9f59de13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-01 13:11:00 +08:00 |
|
fan
|
46509c1e62
|
延时解锁字段调整
|
2021-12-01 13:10:36 +08:00 |
|
fan
|
7cc99b0a08
|
请求服务器域名调整&增减管理界面
|
2021-11-30 16:27:35 +08:00 |
|
sunzhenyu
|
1be02437ea
|
修改徐州三维演示icon
|
2021-11-30 16:24:31 +08:00 |
|
sunzhenyu
|
a541853b8f
|
merge
|
2021-11-30 16:23:24 +08:00 |
|
sunzhenyu
|
8bf9d272d5
|
merge
|
2021-11-30 16:22:43 +08:00 |
|
sunzhenyu
|
87631b1fdb
|
修改徐州三维演示Icon
|
2021-11-30 16:22:06 +08:00 |
|
fan
|
068e0df43c
|
请求服务器域名调整
|
2021-11-30 11:13:25 +08:00 |
|
fan
|
c33502b31a
|
岔芯列车占用显示逻辑调整
|
2021-11-30 09:36:17 +08:00 |
|
yuan
|
fdae91c6d7
|
标准线增加PSL盘
|
2021-11-29 18:15:13 +08:00 |
|
fan
|
e3da721faf
|
baseUrl
|
2021-11-29 16:31:18 +08:00 |
|
fan
|
4aac8ad03d
|
Revert "Revert "道岔短闪（4次恢复）=》 短闪（转动后恢复）""
This reverts commit b69d36a9
|
2021-11-29 15:26:53 +08:00 |
|
fan
|
49e9353673
|
项目登录 增加三方登录配置
|
2021-11-29 15:26:36 +08:00 |
|
fan
|
6811cbcb75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-29 14:41:12 +08:00 |
|
fan
|
690989cf75
|
南京二号线道岔问题调整
|
2021-11-29 14:41:03 +08:00 |
|
yuan
|
6380c3d11b
|
标准线增加PSL盘
|
2021-11-29 14:12:35 +08:00 |
|
fan
|
054db072cf
|
Merge remote-tracking branch 'origin/test'
|
2021-11-29 13:38:44 +08:00 |
|
fan
|
b69d36a963
|
Revert "道岔短闪（4次恢复）=》 短闪（转动后恢复）"
This reverts commit f44bcfab
|
2021-11-29 13:37:35 +08:00 |
|
fan
|
7d4ef8048b
|
扬州工业项目登录参数调整
|
2021-11-29 13:20:10 +08:00 |
|
fan
|
6014c6253e
|
扬州工业项目登录参数调整
|
2021-11-29 13:15:52 +08:00 |
|
fan
|
4c9d9b6705
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:38:32 +08:00 |
|
fan
|
0788172481
|
南京二号线问题调整
|
2021-11-26 17:37:22 +08:00 |
|
sunzhenyu
|
fc0393ff08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:24:05 +08:00 |
|
sunzhenyu
|
7d734bc554
|
修改展示线路三维车站加载，修改徐州三维课程
|
2021-11-26 17:23:56 +08:00 |
|
fan
|
f44bcfabcb
|
道岔短闪（4次恢复）=》 短闪（转动后恢复）
|
2021-11-26 09:30:22 +08:00 |
|
fan
|
27914f3334
|
南京二 岔心操作调整
|
2021-11-25 17:53:13 +08:00 |
|
fan
|
07025e79e5
|
岔芯=》岔心&南京二岔芯实训增加强行消限、预复位&南二日记报错处理
|
2021-11-25 16:37:44 +08:00 |
|
fan
|
04ed7005e1
|
挤岔恢复实训提示调整&岔心灰显、故障锁闭显示调整
|
2021-11-25 15:44:53 +08:00 |
|
fan
|
909bb2d9a0
|
南京二号线生成进路实训配置调整
|
2021-11-25 14:25:33 +08:00 |
|
fan
|
2ecb963027
|
调整实训中传输信号机的替代问题
|
2021-11-25 14:16:37 +08:00 |
|
fan
|
2286a66766
|
调低区段故障锁闭优先级
|
2021-11-25 13:55:18 +08:00 |
|
fan
|
eee7c9fae4
|
南京二号线设置车站中心增加偏移
|
2021-11-25 13:48:50 +08:00 |
|
|
|
a09ec3dd13
|
Merge remote-tracking branch 'origin/test'
|
2021-11-25 12:11:19 +08:00 |
|
fan
|
a5e0e4b671
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-25 10:47:32 +08:00 |
|
fan
|
034bb7e185
|
南京二号线列车右键操作不出列监
|
2021-11-25 10:47:12 +08:00 |
|
fan
|
d39a551142
|
南京二连续扣车参数调整&&南京二troDetail禁止拖动&&增加南京二行调故障按钮
|
2021-11-25 10:41:43 +08:00 |
|
joylink_cuiweidong
|
22a23ba70a
|
南京二号线 计轴受扰 区段编号 红闪
|
2021-11-24 17:47:13 +08:00 |
|
joylink_cuiweidong
|
776a19406e
|
南京二号线
区段 添加 无数据故障
区段故障 修改 红光带/通信车占用/橙光带 为 紫光带故障/红光带故障/计轴受扰
|
2021-11-24 15:55:50 +08:00 |
|
joylink_cuiweidong
|
8fcc22cb6f
|
屏蔽门开关影响 车站颜色灰显 bug 调整
|
2021-11-24 15:13:36 +08:00 |
|
joylink_cuiweidong
|
99e846b593
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-24 13:58:33 +08:00 |
|
joylink_cuiweidong
|
68d85d3dc6
|
ATP重启 由故障 变为操作
|
2021-11-24 13:58:14 +08:00 |
|
fan
|
064c7c74f6
|
南京二实训调整
|
2021-11-23 18:09:26 +08:00 |
|
fan
|
79591e1339
|
南京二实训调整
|
2021-11-23 17:53:34 +08:00 |
|
fan
|
c65049a84d
|
重启联锁机后禁止大部分操作&信号机故障编号闪和机头闪显示调整
|
2021-11-23 16:34:50 +08:00 |
|
fan
|
cdb907819f
|
南京二故障显示调整& 实训调整
|
2021-11-23 15:21:08 +08:00 |
|
fan
|
15cf2838da
|
南京二故障显示调整& 实训调整
|
2021-11-23 14:04:11 +08:00 |
|
fan
|
c59d1c4103
|
终止站停 上下合并
|
2021-11-22 16:27:32 +08:00 |
|
fan
|
a0e6c1c70a
|
南二虚拟传输信号机显示调整
|
2021-11-22 16:17:01 +08:00 |
|
fan
|
b4107c89de
|
调整南京二实训调整&南二虚拟信号机显示调整
|
2021-11-22 16:02:54 +08:00 |
|
fan
|
5412bb8ff0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-22 14:09:42 +08:00 |
|
fan
|
a617144386
|
调整南京二实训配置
|
2021-11-22 14:08:47 +08:00 |
|
|
|
d2217734e0
|
Merge remote-tracking branch 'origin/test'
|
2021-11-19 21:04:03 +08:00 |
|
sunzhenyu
|
94de3ba762
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-19 15:05:23 +08:00 |
|
sunzhenyu
|
343d71fdab
|
增加徐州三维课程案例
|
2021-11-19 15:05:16 +08:00 |
|
joylink_cuiweidong
|
a0cdca405a
|
代码调整
|
2021-11-15 18:13:35 +08:00 |
|
joylink_cuiweidong
|
b2a5e3723c
|
指令字典 添加 指令
|
2021-11-15 17:29:10 +08:00 |
|
fan
|
35ee7a245b
|
进路自排开自排关问题调整
|
2021-11-15 13:22:50 +08:00 |
|
fan
|
dd83568d04
|
地图绘制设置运行等级激活起始区段调整
|
2021-11-15 09:50:37 +08:00 |
|
fan
|
ab87adabb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-15 09:41:17 +08:00 |
|
fan
|
99088c9c4f
|
地图绘制设置运行等级报错调整
|
2021-11-15 09:41:00 +08:00 |
|
|
|
36630fd2ce
|
Merge branch 'test'
|
2021-11-13 20:46:59 +08:00 |
|
sunzhenyu
|
c1ef47929a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-12 14:40:02 +08:00 |
|
sunzhenyu
|
beb96905e5
|
修改三维课程组件，增加点击提示音
|
2021-11-12 14:39:43 +08:00 |
|
fan
|
fa9d0bb152
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:46:51 +08:00 |
|
fan
|
f5cca2da38
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:43:16 +08:00 |
|
fan
|
f270cbfb3b
|
道岔钩锁操作结束清除operation
|
2021-11-11 15:08:13 +08:00 |
|
fan
|
ba7b9f39eb
|
增加江西工贸登录页面
|
2021-11-11 14:32:58 +08:00 |
|
fan
|
71270fbb43
|
和利时项目仿真报错调整&上饶列车操作调整
|
2021-11-10 13:45:12 +08:00 |
|
|
|
dcdff0dfdf
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-09 19:44:59 +08:00 |
|
|
|
7cdf99a699
|
修改列车控制bug、添加列车识别号只有人工车
|
2021-11-09 19:44:48 +08:00 |
|
sunzhenyu
|
a46018cdbe
|
修改三维驾驶托管
|
2021-11-09 18:11:15 +08:00 |
|
sunzhenyu
|
f443d0031b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 17:52:41 +08:00 |
|
sunzhenyu
|
6766df5693
|
恢复三维驾驶托管接口
|
2021-11-09 17:52:33 +08:00 |
|
fan
|
b84e54591c
|
车次窗显示调整
|
2021-11-09 16:20:13 +08:00 |
|
fan
|
8b9e1876e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 15:28:30 +08:00 |
|
fan
|
87a9235304
|
添加列车识别号&删除列车识别号
|
2021-11-09 15:28:17 +08:00 |
|
joylink_cuiweidong
|
0505d5d4d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 10:22:21 +08:00 |
|
joylink_cuiweidong
|
7e9259be88
|
运行图
修改表号的时候 自动补零位数调整
修改任务的时候，没选交路不允许提交
|
2021-11-09 10:22:02 +08:00 |
|
fan
|
b0398df85a
|
列车操作弹框可拖拽
|
2021-11-08 16:53:50 +08:00 |
|
fan
|
92e76e3af0
|
西安一三 增加 换NRM模式
|
2021-11-08 16:48:49 +08:00 |
|
fan
|
69351511c4
|
修改上饶沙盘icon & 增加 换NRM模式操作
|
2021-11-08 16:17:06 +08:00 |
|
fan
|
de55f13b9f
|
上饶沙盘 列车操作 socket同步调整
|
2021-11-08 15:57:23 +08:00 |
|
fan
|
2cc79466b4
|
上饶沙盘 列车操作 刹车调整
|
2021-11-08 15:36:16 +08:00 |
|
fan
|
166ce2d75a
|
上饶沙盘 列车操作 问题调整（速度方向会重置）
|
2021-11-08 15:31:19 +08:00 |
|
fan
|
3ba20ae75c
|
上饶沙盘 列车操作
|
2021-11-08 14:55:03 +08:00 |
|
fan
|
ff5f9e0a00
|
修改列车文字大小
|
2021-11-05 15:44:03 +08:00 |
|
jade
|
2fd498aaf6
|
Merge remote-tracking branch 'origin/test'
|
2021-11-04 18:18:38 +08:00 |
|
fan
|
d18bd5ea6c
|
删除设备管理多余接口&线路配置signalForceCancelRoute=》singleApproachLockCancelRoute
|
2021-11-04 16:38:39 +08:00 |
|
fan
|
c4d754f1b9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-03 15:50:06 +08:00 |
|
fan
|
47eda59ad3
|
不展示计划车问题调整
|
2021-11-03 15:49:47 +08:00 |
|
joylink_cuiweidong
|
980f06ecb9
|
剧本编制代码调整
|
2021-11-03 14:45:28 +08:00 |
|
joylink_cuiweidong
|
cf18a2dae2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-03 14:24:15 +08:00 |
|
joylink_cuiweidong
|
626ff900f5
|
代码调整
|
2021-11-03 14:23:52 +08:00 |
|
fan
|
1f7b6f5dc1
|
取消设备登录鼠标悬浮车次窗会展示&上饶项目登录不展示按计划行车
|
2021-11-03 14:06:00 +08:00 |
|
fan
|
a4172815ca
|
设备管理添加新的设备类型，修改设备配置接口
|
2021-11-03 13:48:35 +08:00 |
|
fan
|
2e0449bb43
|
国赛设计平台登录 调整
|
2021-11-01 13:37:43 +08:00 |
|
fan
|
24473bb1f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing
|
2021-10-29 10:37:15 +08:00 |
|
fan
|
6dc6e9725b
|
增加 城轨国赛竞赛系统（和利时）页面
|
2021-10-29 10:37:02 +08:00 |
|
sunzhenyu
|
fe156c28bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-28 18:04:32 +08:00 |
|
sunzhenyu
|
7984983f12
|
增加三维沙盘天气模块
|
2021-10-28 18:04:25 +08:00 |
|
fan
|
d8a377dd69
|
删除上次提交带的日志
|
2021-10-28 17:17:45 +08:00 |
|
fan
|
92dc2798cd
|
教学管理增加导入学生模板校验
|
2021-10-28 17:16:44 +08:00 |
|
fan
|
95d2200907
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing
|
2021-10-28 17:02:58 +08:00 |
|
fan
|
164386c9a1
|
南京二综合演练行调仿真调整
|
2021-10-28 16:02:26 +08:00 |
|
fan
|
db682c319b
|
Merge remote-tracking branch 'origin/test'
|
2021-10-27 18:02:58 +08:00 |
|
fan
|
ba38a19309
|
现地仿真实训显示问题调整
|
2021-10-27 17:51:27 +08:00 |
|
fan
|
36e4e72adf
|
现地仿真实训不展示停车场车辆段
|
2021-10-27 17:09:30 +08:00 |
|
fan
|
32a31a1eed
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2021-10-27 13:09:12 +08:00 |
|
fan
|
5be842b664
|
南京二 综合演练行调界面调整暂提
|
2021-10-27 13:06:07 +08:00 |
|
fan
|
253408b866
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-26 09:41:40 +08:00 |
|
fan
|
b30ad33dfe
|
实训密码调整
|
2021-10-25 16:57:41 +08:00 |
|
fan
|
d2cef46f6e
|
IBP局部控制盘 操作描述更改
|
2021-10-25 11:13:22 +08:00 |
|
sunzhenyu
|
97d486d450
|
修改三维课程
|
2021-10-22 18:07:12 +08:00 |
|
sunzhenyu
|
34efc14cf0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-21 16:59:10 +08:00 |
|
sunzhenyu
|
2792cafd3a
|
修改三维编辑器
|
2021-10-21 16:59:03 +08:00 |
|
fan
|
c8570ec853
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-20 15:48:01 +08:00 |
|
fan
|
211f7df03b
|
设备管理添加设备类型
|
2021-10-20 15:47:48 +08:00 |
|
sunzhenyu
|
287af31db5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-19 18:10:45 +08:00 |
|
sunzhenyu
|
a2b55b62f6
|
修改三维课程编辑器
|
2021-10-19 18:10:32 +08:00 |
|
fan
|
0d5a57fe11
|
设备管理添加项目
|
2021-10-19 15:53:04 +08:00 |
|
fan
|
07376fc8b9
|
上饶项目添加设备管理路由
|
2021-10-19 15:44:43 +08:00 |
|
fan
|
eb1721e2c2
|
添加上饶沙盘项目登录页面
|
2021-10-19 15:28:20 +08:00 |
|
fan
|
ed47671b45
|
南京二号线列车总览列车详览调整
|
2021-10-18 17:38:40 +08:00 |
|
fan
|
bb085ecddc
|
日记调整
|
2021-10-18 11:11:03 +08:00 |
|
fan
|
4dffdb5aba
|
连续扣车调整
|
2021-10-18 10:53:48 +08:00 |
|
fan
|
12c16cb9d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-18 10:14:14 +08:00 |
|
fan
|
6fa514b99e
|
南京二号线列监创建列车 参数调整
|
2021-10-18 10:14:02 +08:00 |
|
sunzhenyu
|
27f6f47288
|
修改三维课程编辑器事件参数
|
2021-10-15 18:16:16 +08:00 |
|
sunzhenyu
|
2e5b6d6fbf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-15 18:10:53 +08:00 |
|
sunzhenyu
|
3660628203
|
修改三维课程编辑器，增加动画事件逻辑
|
2021-10-15 18:10:46 +08:00 |
|
fan
|
a18a0db03f
|
南京二开启车队信号机状态调整
|
2021-10-15 15:16:06 +08:00 |
|
fan
|
76c2589c54
|
ZC创建报错处理
|
2021-10-15 14:43:38 +08:00 |
|
fan
|
2625b66892
|
南京二号线atr&tmt调整
|
2021-10-15 14:15:23 +08:00 |
|
fan
|
f0328df54f
|
南京二号线atr调整
|
2021-10-15 11:03:41 +08:00 |
|
fan
|
9960b87c42
|
绘图调整 区段可以同时为转换轨或折返轨
|
2021-10-15 10:16:59 +08:00 |
|
fan
|
c81d4301fa
|
南京二号线列监调整
|
2021-10-15 09:54:21 +08:00 |
|
fan
|
3271ef15b6
|
获取车辆段偏移增加限制
|
2021-10-14 18:05:24 +08:00 |
|
fan
|
6979eaf778
|
menubutton 增加scope
|
2021-10-14 16:57:24 +08:00 |
|
fan
|
e02efd15ff
|
iscs订阅调整
|
2021-10-14 16:12:37 +08:00 |
|
fan
|
a53a4435d6
|
南京二号线列监操作调整
|
2021-10-14 15:34:52 +08:00 |
|
fan
|
5498a7e756
|
司机、通号增加初始化设备显隐
|
2021-10-14 14:13:55 +08:00 |
|
fan
|
e8fa057adf
|
福州一号线实训人工折返策略设置调整
|
2021-10-14 14:04:05 +08:00 |
|
fan
|
c319a73f0c
|
南京二添加列车后按计划行车列车不消失问题修复
|
2021-10-14 13:35:43 +08:00 |
|
fan
|
2028a73d19
|
大屏分屏prdType写死
|
2021-10-14 09:35:32 +08:00 |
|
fan
|
37aa25a453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-14 09:18:18 +08:00 |
|
fan
|
e620df092c
|
南京二号线行调问题调整
|
2021-10-14 09:18:06 +08:00 |
|
yuan
|
f5f4db14c5
|
大屏登录后跳转url增加prdType字段用于车辆段显隐处理
|
2021-10-13 17:16:13 +08:00 |
|
yuan
|
58a2ca0192
|
综合演练屏蔽掉车辆段显示
|
2021-10-13 16:31:46 +08:00 |
|
fan
|
b3b5780a27
|
南京二号线行调调整
|
2021-10-12 15:50:02 +08:00 |
|
fan
|
720a638720
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-12 14:31:58 +08:00 |
|
fan
|
5768b8d263
|
南京二号线车站调整
|
2021-10-12 14:31:49 +08:00 |
|
yuan
|
36bd886cb2
|
设备管理增加派班工作站,修改车辆段和派班工作站的路径
|
2021-10-12 11:02:36 +08:00 |
|
fan
|
4acb11fa2d
|
区段信号机道岔添加字段srCode 沙盘设备编号
|
2021-10-12 10:52:37 +08:00 |
|
fan
|
414e7f16a4
|
大屏配置回显
|
2021-10-12 10:36:25 +08:00 |
|
fan
|
e4d8d5650e
|
大屏显示调整 （调用行调配置处理设备）
|
2021-10-12 09:36:52 +08:00 |
|
fan
|
d9c040dbe9
|
ISCS 订阅调整
|
2021-10-11 17:45:15 +08:00 |
|
fan
|
48efa2cfb8
|
车辆段显示位置初始化调整
|
2021-10-11 16:41:56 +08:00 |
|
fan
|
edc9fee0a7
|
南京二号线计算行车间隔指令参数调整
|
2021-10-11 14:24:31 +08:00 |
|
fan
|
2454ed857f
|
Merge remote-tracking branch 'origin/test'
|
2021-10-09 15:45:42 +08:00 |
|
fan
|
6e5ceeeb66
|
关闭南京二号线行调显示界面
|
2021-10-09 15:44:00 +08:00 |
|
fan
|
ee7d8e9300
|
南京二号线调整行车间隔
|
2021-10-08 09:53:49 +08:00 |
|
fan
|
4c5bc63030
|
南京二行调增加日记界面和命令界面
|
2021-09-30 09:43:10 +08:00 |
|
fan
|
34b156df80
|
侧防列表显示调整
|
2021-09-29 17:02:37 +08:00 |
|
fan
|
72bcc0596b
|
福州一 车联段停车场信号机操作 增加限制条件
|
2021-09-29 16:22:03 +08:00 |
|
fan
|
fd6e7c9f09
|
南京二号线 atr 列车信息
|
2021-09-29 15:35:26 +08:00 |
|
fan
|
869840f0e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-29 13:19:49 +08:00 |
|
fan
|
1e12edd90e
|
综合演练停车场显示调整
|
2021-09-29 13:19:29 +08:00 |
|
sunzhenyu
|
d23143a1cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-29 13:18:31 +08:00 |
|
sunzhenyu
|
36fee6efda
|
其他三维相关内容分拆
|
2021-09-29 13:18:24 +08:00 |
|
fan
|
969a35eec1
|
列车初始化时 重新解析数据 以清除残留状态
|
2021-09-29 10:12:49 +08:00 |
|
fan
|
01732b6b9a
|
修正： 现地显示配置生成权限的时候未生成车站数据
|
2021-09-29 09:46:25 +08:00 |
|
fan
|
f1b3b9ab8f
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/scripts/ProjectConfig.js
|
2021-09-28 18:41:07 +08:00 |
|
fan
|
096e87803d
|
综合演练列车显示bug调整
|
2021-09-28 18:16:05 +08:00 |
|
fan
|
8aa97948b6
|
车辆段联锁工作站 增加初始化
|
2021-09-28 17:44:25 +08:00 |
|
fan
|
dc2ca8df5a
|
BUG:初始化后切换角色导致列车显示
|
2021-09-28 15:12:54 +08:00 |
|
fan
|
86be83d612
|
综合演练车辆段切行调现地显示调整
|
2021-09-28 13:10:12 +08:00 |
|
fan
|
6786dd92f4
|
进路预览进路编辑增加 endButtonSignalCode
|
2021-09-28 11:26:30 +08:00 |
|
fan
|
aedf08b85f
|
排列进路问题调整
|
2021-09-28 10:01:48 +08:00 |
|
fan
|
15f5fdf664
|
综合演练切换车联段停车场后显示调整
|
2021-09-28 09:42:00 +08:00 |
|
fan
|
673d2e474c
|
添加信号机类型出段信号机 进段信号机
|
2021-09-27 16:43:57 +08:00 |
|
fan
|
4225f58d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-27 14:38:26 +08:00 |
|
fan
|
d34be1ce8b
|
修改预选模式
|
2021-09-27 14:38:11 +08:00 |
|
fan
|
6df79d9ca9
|
aspect W&B处理
|
2021-09-27 10:45:08 +08:00 |
|
sunzhenyu
|
64cbe4c857
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-27 10:24:24 +08:00 |
|
sunzhenyu
|
47ec0a8b7d
|
修改三维驾驶atp按钮，修改屏蔽门不开bug
|
2021-09-27 10:24:15 +08:00 |
|
fan
|
306bdb7cba
|
仿真结束清除SimulationUserList
|
2021-09-26 18:11:13 +08:00 |
|
fan
|
48ea31da91
|
导出地图取消必选和默认选中&删除调试日志
|
2021-09-26 17:55:08 +08:00 |
|
fan
|
0928d8cfa9
|
显示配置中添加信号机位置修正
|
2021-09-26 17:37:57 +08:00 |
|
fan
|
48d4a7129f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 16:02:20 +08:00 |
|
fan
|
c79329cee7
|
显示配置 select label 调整
|
2021-09-26 16:02:03 +08:00 |
|
sunzhenyu
|
d07a4029f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 15:01:12 +08:00 |
|
sunzhenyu
|
db908d63a1
|
修改三維駕駛psl
|
2021-09-26 15:01:07 +08:00 |
|
fan
|
6ab1c03a24
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 14:37:20 +08:00 |
|
fan
|
461a9a9343
|
取消灯丝故障显示
|
2021-09-26 14:37:08 +08:00 |
|
sunzhenyu
|
589747ae92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 14:27:44 +08:00 |
|
sunzhenyu
|
c73386766a
|
修改三维驾驶信息显示，剔除无用方法
|
2021-09-26 14:27:36 +08:00 |
|
fan
|
302b5db236
|
BUG396 哈尔滨：无法删除和步进列车
|
2021-09-26 13:51:34 +08:00 |
|
fan
|
e543b6e357
|
模型初始值添加 显示方向 showRight
|
2021-09-26 13:32:08 +08:00 |
|
fan
|
28da81ef1f
|
批量反向操作提示调整
|
2021-09-26 13:21:19 +08:00 |
|
fan
|
ab8ff51a0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 13:07:31 +08:00 |
|
fan
|
b0e387edd6
|
故障枚举值修改
|
2021-09-26 13:07:16 +08:00 |
|
sunzhenyu
|
bf8631c521
|
修改三维驾驶消息加边框，按钮和后端同步，ato亮灯规则修改
|
2021-09-26 11:21:00 +08:00 |
|
sunzhenyu
|
7b5f4de1bd
|
修改三维驾驶亮灯
|
2021-09-26 09:52:54 +08:00 |
|
sunzhenyu
|
577828dd6f
|
三维驾驶按钮样式调整
|
2021-09-24 17:39:37 +08:00 |
|
sunzhenyu
|
8ff4f20e06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 17:20:21 +08:00 |
|
sunzhenyu
|
41536232f6
|
增加三维驾驶psl
|
2021-09-24 17:20:15 +08:00 |
|
fan
|
18cf41f555
|
merge
|
2021-09-24 16:51:25 +08:00 |
|
fan
|
5c9cd85d52
|
显示配置调整
|
2021-09-24 16:49:57 +08:00 |
|
sunzhenyu
|
93ca66674c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 16:29:22 +08:00 |
|
sunzhenyu
|
5d01ca21b4
|
修改三维驾驶操作
|
2021-09-24 16:29:12 +08:00 |
|
fan
|
549079fbdb
|
增加批量反向操作（区段左右关联关系信号机运行方向反向）， 信号机批量设置显示方向，新增信号机显示方向字段showRight
|
2021-09-24 15:05:50 +08:00 |
|
sunzhenyu
|
8e34f93a9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 10:04:14 +08:00 |
|
sunzhenyu
|
f9ed9cca22
|
修改三维列车驾驶
|
2021-09-24 10:04:05 +08:00 |
|
fan
|
f5b2fcbacc
|
西安三道岔操作名称调整
|
2021-09-22 13:57:24 +08:00 |
|
fan
|
e0abfe2798
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-22 10:12:30 +08:00 |
|
fan
|
19a6663762
|
添加信号机型号 黄红白（列车兼调车信号机）
|
2021-09-22 10:12:15 +08:00 |
|
sunzhenyu
|
cd2aecc566
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-18 18:02:03 +08:00 |
|
sunzhenyu
|
d92906d7d5
|
修改三维课程大铁考试数据结构
|
2021-09-18 18:01:53 +08:00 |
|
joylink_cuiweidong
|
bd3d138acd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-18 10:47:10 +08:00 |
|
joylink_cuiweidong
|
6602f21a82
|
bug387 南京二：挤岔故障的显示不正确，挤岔应该是黄色长闪 修改
|
2021-09-18 10:46:54 +08:00 |
|
sunzhenyu
|
fdd2701512
|
修改三维cctv站台轨计算方式
|
2021-09-18 09:56:20 +08:00 |
|
sunzhenyu
|
f748202bef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-16 16:53:39 +08:00 |
|
sunzhenyu
|
600831f9c1
|
修改三维cctv动态停车位置
|
2021-09-16 16:53:31 +08:00 |
|
joylink_cuiweidong
|
14324f80dc
|
代码调整
|
2021-09-16 15:56:06 +08:00 |
|
joylink_cuiweidong
|
982f383981
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-16 15:02:52 +08:00 |
|
joylink_cuiweidong
|
21b279646c
|
路由过滤代码调整
|
2021-09-16 15:02:35 +08:00 |
|
fan
|
1f0e855512
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-16 09:24:27 +08:00 |
|
fan
|
3623a39ffa
|
派班工作站&司机驾驶站场图显示调整
|
2021-09-16 09:24:15 +08:00 |
|
sunzhenyu
|
325af74192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-15 18:08:47 +08:00 |
|
sunzhenyu
|
8603bed561
|
修改三维TDT位置
|
2021-09-15 18:08:39 +08:00 |
|
fan
|
40624c3177
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-15 17:35:40 +08:00 |
|
fan
|
7f6f3f0db1
|
清除设备setShowMode函数&&岔芯显示问题调整
|
2021-09-15 17:35:27 +08:00 |
|
sunzhenyu
|
6ad577695f
|
merge
|
2021-09-15 17:15:34 +08:00 |
|
sunzhenyu
|
739d3749b7
|
综合演练三维通号故障增加，北交大站台车厢三维通信修改
|
2021-09-15 17:14:51 +08:00 |
|
fan
|
6bc79aca79
|
merge
|
2021-09-15 16:58:27 +08:00 |
|
fan
|
01fa5856dc
|
显示问题调整
|
2021-09-15 16:56:25 +08:00 |
|
yuan
|
7b3a441b5d
|
地图草稿列表增加一键删除按钮
|
2021-09-15 16:54:49 +08:00 |
|
joylink_cuiweidong
|
d16a79e15d
|
代码调整
|
2021-09-15 16:15:27 +08:00 |
|
joylink_cuiweidong
|
0c7a9b3348
|
删除无用的代码
|
2021-09-15 15:57:41 +08:00 |
|
joylink_cuiweidong
|
04678df413
|
Merge remote-tracking branch 'remotes/origin/test_deplotSimulation' into test
# Conflicts:
# src/jmapNew/shape/graph/Signal/index.js
|
2021-09-15 11:02:12 +08:00 |
|
joylink_cuiweidong
|
109dd75eac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-15 11:00:34 +08:00 |
|
sunzhenyu
|
a3f08b2768
|
merge
|
2021-09-15 10:53:44 +08:00 |
|
sunzhenyu
|
cc1af29545
|
修改三维仿真通信消息
|
2021-09-15 10:53:17 +08:00 |
|
fan
|
b321a29320
|
大屏显示影响 恢复
|
2021-09-15 10:07:58 +08:00 |
|
joylink_cuiweidong
|
1a06ea9c43
|
福州一号线 车辆段仿真 车站station操作调整
|
2021-09-14 18:07:05 +08:00 |
|
fan
|
619a049408
|
显示调整 again
|
2021-09-14 18:00:56 +08:00 |
|
fan
|
9f361fd143
|
显示调整
|
2021-09-14 17:45:48 +08:00 |
|
joylink_cuiweidong
|
f1f2bf4029
|
Merge remote-tracking branch 'remotes/origin/test' into test_deplotSimulation
# Conflicts:
# src/jmapNew/shape/graph/Switch/index.js
# src/utils/baseUrl.js
# src/views/newMap/displayNew/menuSchema.vue
|
2021-09-14 17:15:37 +08:00 |
|
fan
|
05854c4239
|
车辆段显示调整
|
2021-09-14 17:10:00 +08:00 |
|
joylink_cuiweidong
|
0c356f18b8
|
福州一号线 车辆段仿真 去除多余的按钮（button)
|
2021-09-14 16:53:23 +08:00 |
|
fan
|
43b8751d55
|
iscs消息状态增加非空判断
|
2021-09-14 15:49:17 +08:00 |
|
fan
|
c89e53b689
|
添加无logo项目
|
2021-09-14 15:19:49 +08:00 |
|
fan
|
358c717752
|
添加无logo项目
|
2021-09-14 15:14:44 +08:00 |
|
fan
|
ce9f11d55e
|
ISCS添加下行状态处理
|
2021-09-14 14:47:45 +08:00 |
|
joylink_cuiweidong
|
30d8af073f
|
福州一号线 车辆段仿真 信号机signal操作调整
|
2021-09-14 14:45:03 +08:00 |
|
sunzhenyu
|
f183ab6da6
|
merge
|
2021-09-14 14:37:08 +08:00 |
|
fan
|
921dda306d
|
三维虚拟CCTV调整
|
2021-09-14 13:50:59 +08:00 |
|
sunzhenyu
|
ea9c01de89
|
url
|
2021-09-14 13:36:47 +08:00 |
|
joylink_cuiweidong
|
5e3006bf91
|
Merge remote-tracking branch 'remotes/origin/test_switch' into test_deplotSimulation
|
2021-09-14 10:56:03 +08:00 |
|
fan
|
79439f4a28
|
修改问题：按计划行车后被误清集中站
|
2021-09-14 10:11:51 +08:00 |
|
fan
|
c425aa572b
|
贵装备综合演练添加cctv
|
2021-09-14 09:52:06 +08:00 |
|
joylink_cuiweidong
|
ee7543fb0d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-14 09:46:23 +08:00 |
|
fan
|
13ff4ae7c0
|
显示配置添加清除配置
|
2021-09-14 09:37:20 +08:00 |
|
fan
|
7e02fa4f1c
|
行调显示配置自动生成添加车站 && 信号机recover隐藏箭头
|
2021-09-13 18:14:29 +08:00 |
|
fan
|
c0831fd403
|
数据操作 配置 点击响应范围调整&生成车辆段联锁数据后关闭弹框
|
2021-09-13 17:51:12 +08:00 |
|
fan
|
8c8fa154d3
|
车辆段生成联锁数据3
|
2021-09-13 16:49:55 +08:00 |
|
fan
|
b1042ee52b
|
车辆段生成联锁数据
|
2021-09-13 16:26:08 +08:00 |
|
fan
|
de040bdc45
|
生成车辆段联锁数据
|
2021-09-13 16:24:00 +08:00 |
|
fan
|
863af1b9d8
|
iscs屏蔽门显示调整
|
2021-09-13 15:52:55 +08:00 |
|
joylink_cuiweidong
|
0e7291986a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-13 15:45:00 +08:00 |
|
fan
|
e84bbf7470
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display
|
2021-09-13 15:33:09 +08:00 |
|
fan
|
083362cde8
|
ISCS新添状态调整
|
2021-09-13 15:19:46 +08:00 |
|
yuan
|
de11b14023
|
bugfix
|
2021-09-13 15:00:57 +08:00 |
|
yuan
|
2548c8375f
|
bugfix
|
2021-09-13 14:59:08 +08:00 |
|
yuan
|
11f4805417
|
bugfix
|
2021-09-13 14:58:48 +08:00 |
|
yuan
|
106307b9cc
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2021-09-13 14:22:50 +08:00 |
|
yuan
|
12a585b93a
|
导入导出bugfix
|
2021-09-13 14:19:34 +08:00 |
|
fan
|
a9014d510d
|
注释systemGraphShape的引入导致的设备类覆盖问题
|
2021-09-13 13:52:18 +08:00 |
|
fan
|
a9aea1908e
|
outFrame recover状态处理错误调整
|
2021-09-13 13:45:49 +08:00 |
|
fan
|
bef8fee318
|
绘图显现调整
|
2021-09-13 13:43:24 +08:00 |
|
fan
|
0e7155116d
|
显示判断函数调整
|
2021-09-13 13:26:42 +08:00 |
|
joylink_cuiweidong
|
077a4454c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/graph/Switch/index.js
|
2021-09-13 11:20:48 +08:00 |
|
yuan
|
b5eab3f1cd
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport
|
2021-09-13 11:12:22 +08:00 |
|
yuan
|
0f74396bab
|
地图绘制-元素导入导出
|
2021-09-13 11:02:45 +08:00 |
|
fan
|
778bf5f3ee
|
ISCS状态显示调整
|
2021-09-13 10:58:42 +08:00 |
|
fan
|
0bb4fe4008
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display
|
2021-09-13 10:14:15 +08:00 |
|
fan
|
cd69b0ff63
|
merge
|
2021-09-13 10:12:20 +08:00 |
|
fan
|
9f743c2521
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 2086a06d
|
2021-09-13 10:04:44 +08:00 |
|
fan
|
51d54d2463
|
添加CTC级别是否办理延续保护
|
2021-09-13 10:04:01 +08:00 |
|
fan
|
ba7233d1c8
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 15cfbd02
|
2021-09-13 10:00:03 +08:00 |
|
fan
|
6b35126161
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 1f17ebc1
|
2021-09-13 09:56:19 +08:00 |
|
fan
|
2f703ebedb
|
merge
|
2021-09-13 09:51:22 +08:00 |
|
joylink_cuiweidong
|
3157e8f65c
|
道岔信号机字段调整
|
2021-09-13 09:29:40 +08:00 |
|
joylink_cuiweidong
|
ad40b827c9
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-13 09:29:40 +08:00 |
|
joylink_cuiweidong
|
f44ce9cf27
|
修改 道岔位置定位、反位 为pos字段
修改 信号机红绿黄显示的三个字段 为aspect
|
2021-09-13 09:29:39 +08:00 |
|
joylink_cuiweidong
|
a4cab2090e
|
删掉 中航锐创 实训平台 虚拟cctv页面 退出按钮
|
2021-09-13 09:29:38 +08:00 |
|
fan
|
158e8a7d15
|
显示调整
|
2021-09-13 09:13:27 +08:00 |
|
fan
|
b130f4ce5b
|
显示调整
|
2021-09-13 09:06:50 +08:00 |
|
sunzhenyu
|
745a2439b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-10 18:27:36 +08:00 |
|
sunzhenyu
|
25a9f51dab
|
修改三维课程大铁组件
|
2021-09-10 18:27:28 +08:00 |
|
yuan
|
ee26677046
|
TODO
|
2021-09-10 18:10:59 +08:00 |
|
yuan
|
8f3835ad32
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport
|
2021-09-10 18:06:45 +08:00 |
|
yuan
|
eaed1afd1b
|
commit
|
2021-09-10 18:03:17 +08:00 |
|
yuan
|
04dc6f3e1b
|
commit
|
2021-09-10 18:03:11 +08:00 |
|
joylink_cuiweidong
|
a271f99163
|
道岔信号机字段调整
|
2021-09-10 17:11:50 +08:00 |
|
joylink_cuiweidong
|
d541259695
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-10 17:11:49 +08:00 |
|
joylink_cuiweidong
|
7d21d75ad0
|
修改 道岔位置定位、反位 为pos字段
修改 信号机红绿黄显示的三个字段 为aspect
|
2021-09-10 17:11:48 +08:00 |
|
joylink_cuiweidong
|
f35684d74d
|
修改 中航锐创 实训平台 虚拟cctv页面 视频地址
|
2021-09-10 17:11:46 +08:00 |
|
joylink_cuiweidong
|
76854d925c
|
中航锐创 实训平台 虚拟cctv页面调整
|
2021-09-10 17:02:50 +08:00 |
|
joylink_cuiweidong
|
9ce42ff199
|
中航锐创 实训平台 综合演练添加 cctv页面
|
2021-09-10 16:25:23 +08:00 |
|
