joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
12,523 Commits 20 Branches 0 Tags 448 MiB
3acaf45b5d
Commit Graph

12150 Commits

Author SHA1 Message Date
joylink_cuiweidong
be0ad85168 大铁项目 代码调整 2022-06-13 17:20:03 +08:00
joylink_cuiweidong
57b9d5cce6 大铁项目 代码调整 2022-06-13 16:02:33 +08:00
joylink_cuiweidong
c3685d12ac 大铁项目 管理终端 车站股道 页面调整 2022-06-13 14:31:31 +08:00
joylink_cuiweidong
16586b35f0 大铁项目 管理终端 车站股道页面添加 2022-06-13 10:45:15 +08:00
joylink_cuiweidong
f715084708 代码调整 2022-06-10 17:26:18 +08:00
joylink_cuiweidong
94389e6d7c 代码调整 2022-06-10 17:21:55 +08:00
joylink_cuiweidong
66892862cb 代码调整 2022-06-10 16:48:23 +08:00
joylink_cuiweidong
dc7a117b0f 大铁项目 管理终端 页面 添加 2022-06-10 16:23:09 +08:00
joylink_cuiweidong
4b07b1c559 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-10 11:31:10 +08:00
joylink_cuiweidong
ca643604e1 代码调整 2022-06-10 11:30:56 +08:00
fan
3b63d62eae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-10 11:23:30 +08:00
fan
1ea7818c47 IBP盘调整 2022-06-10 11:23:16 +08:00
joylink_cuiweidong
c2b3034cd1 大铁项目 删除行车日志 页面调整 2022-06-10 11:06:33 +08:00
joylink_cuiweidong
09e72ea133 代码调整 2022-06-10 10:38:43 +08:00
joylink_cuiweidong
2a27cf6f46 大铁项目 地图绘制 指示灯关联 增加名称属性 2022-06-10 10:09:30 +08:00
fan
0c620de1e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-09 18:07:12 +08:00
fan
d36ee77d00 ctc显示调整 2022-06-09 18:06:47 +08:00
joylink_cuiweidong
ae86731795 代码调整 2022-06-09 17:17:00 +08:00
joylink_cuiweidong
c83cf31bf3 大铁项目 行车日志 修改车次号 代码调整 2022-06-09 17:16:01 +08:00
joylink_cuiweidong
602732bb6d 大铁项目 行车日志 修改行车计划邻站信息操作 代码调整 2022-06-09 15:36:05 +08:00
joylink_cuiweidong
23d72e7962 大铁项目 行车日志 删除行车日志操作 代码调整 2022-06-09 14:31:17 +08:00
joylink_cuiweidong
36069ec68e 代码调整 2022-06-09 11:31:02 +08:00
joylink_cuiweidong
9425ef8239 大铁项目 代码调整 2022-06-08 17:05:44 +08:00
joylink_cuiweidong
3167b551b9 大铁项目 增加 批量修改股道指令 代码调整 2022-06-08 16:37:30 +08:00
fan
ffcd9faab8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 13:06:16 +08:00
fan
9826b6b6f2 ctc调整 总人解 2022-06-08 13:05:54 +08:00
joylink_cuiweidong
aa056628a1 代码调整 2022-06-08 11:16:40 +08:00
joylink_cuiweidong
5b78c43b06 大铁项目 代码调整 2022-06-08 11:13:46 +08:00
joylink_cuiweidong
37644ef8fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 09:55:48 +08:00
joylink_cuiweidong
1da8364afa 代码调整 2022-06-08 09:55:31 +08:00
fan
5e7c67205e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-08 09:40:01 +08:00
fan
e5f484f3bb ctc调整 2022-06-08 09:36:14 +08:00
joylink_cuiweidong
7a083b93a7 代码调整 2022-06-07 18:12:19 +08:00
joylink_cuiweidong
8e0062a33b 代码调整 2022-06-07 17:37:45 +08:00
joylink_cuiweidong
a7f6f51b57 代码调整 2022-06-07 17:18:39 +08:00
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
thesai
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
thesai
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
thesai
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
thesai
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
thesai
dcdff0dfdf Merge remote-tracking branch 'origin/test' into test 2021-11-09 19:44:59 +08:00
thesai
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
fan
a5335b1d81 ISCS订阅调整 2021-09-10 13:53:25 +08:00
fan
37bc5bfc53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-10 13:15:10 +08:00
fan
7216861b67 ISCS订阅调整 2021-09-10 13:09:46 +08:00
fan
b9e814b53f ISCS状态显示调整 2021-09-10 09:49:54 +08:00
fan
9060e0efe2 ISCS状态显示调整 2021-09-09 17:22:47 +08:00
sunzhenyu
5714bae120 merge 2021-09-09 16:09:31 +08:00
sunzhenyu
e0bb2d8532 修改三维课程编辑器逻辑 2021-09-09 16:09:01 +08:00
fan
66636a53fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-08 14:47:25 +08:00
fan
7dfa74857c Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:42:44 +08:00
fan
7ed9e882cc Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:41:31 +08:00
fan
249e9f1a3d Revert "地图绘制添加属性ctcSetOverlap" 
This reverts commit 9ed4b26a
 2021-09-08 14:40:58 +08:00
fan
9bad0d61a7 Revert "显示配置调整" 
This reverts commit 5e5474ae
 2021-09-08 14:40:35 +08:00
fan
d7aec11a91 Revert "显示配置调整" 
This reverts commit 8bf3d38f
 2021-09-08 14:38:48 +08:00
sunzhenyu
dcbe6f6315 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-08 11:00:44 +08:00
sunzhenyu
e3f1ed6b8e 修改三维驾驶TDT位置和cctv视角位置 2021-09-08 11:00:34 +08:00
fan
f8040a20e7 merge 2021-09-08 10:31:12 +08:00
fan
8bf3d38f95 显示配置调整 2021-09-08 10:30:04 +08:00
sunzhenyu
813d694ccc 增加三维课程事故特效管理模块 2021-09-07 18:21:35 +08:00
yuan
9f80982d14 去掉console.log() 2021-09-07 17:10:53 +08:00
yuan
e350ae04dc 车辆段道岔操作 2021-09-07 17:02:27 +08:00
yuan
1efcb7491f 倒计时 2021-09-07 16:31:45 +08:00
yuan
1c7c43e28d 倒计时 2021-09-07 15:37:05 +08:00
yuan
733f198b27 conflict resolve 2021-09-07 15:33:51 +08:00
yuan
6e6f54a0dc conflict resolve 2021-09-07 15:32:44 +08:00
yuan
e85986a5f7 Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation 2021-09-07 15:31:00 +08:00
yuan
976b1d8781 福州车辆段倒计时 2021-09-07 15:27:58 +08:00
joylink_cuiweidong
35cea8a8f7 福州一号线 车辆段仿真 添加 排列进路 取消进路 信号重开指令 2021-09-07 15:13:38 +08:00
sunzhenyu
297e417113 修改三维驾驶门开关逻辑 2021-09-07 14:53:36 +08:00
yuan
939cf77b2e merge 2021-09-07 14:35:20 +08:00
yuan
bafc4d65e7 Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation 2021-09-07 14:01:03 +08:00
yuan
738c96444e 福州车辆段 2021-09-07 13:54:23 +08:00
sunzhenyu
453435ae94 修改三维驾驶面板 2021-09-07 13:41:50 +08:00
sunzhenyu
a8fb38add4 修改三维行车mmi界面 2021-09-07 13:31:17 +08:00
sunzhenyu
6e3ef32360 修改三维行车门开关 2021-09-07 13:22:23 +08:00
joylink_cuiweidong
77f49468d4 Merge branch 'test_deplotSimulation' of https://git.code.tencent.com/lian-cbtc/jl-client into test_deplotSimulation 2021-09-07 13:06:16 +08:00
joylink_cuiweidong
67bf5babb0 福州三号线车辆端 信号机 添加操作指令 2021-09-07 13:05:30 +08:00
yuan
23ef185419 commit 2021-09-07 10:55:46 +08:00
sunzhenyu
117487be56 merge 2021-09-07 09:54:47 +08:00
sunzhenyu
ba0999856c 修改三维行车和三维课程编辑器 2021-09-07 09:53:47 +08:00
joylink_cuiweidong
c699a09431 代码调整 2021-09-06 18:09:55 +08:00
fan
abf36ad841 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 17:50:01 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +08:00
joylink_cuiweidong
071d88878f 福州一号线 车辆段操作 指令调整 2021-09-06 17:20:48 +08:00
joylink_cuiweidong
648d04f0b4 代码调整 2021-09-06 16:55:16 +08:00
zyy
98c365c448 删除大屏功能注释 2021-09-06 16:18:31 +08:00
zyy
4813ba4783 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 16:11:06 +08:00
zyy
ab01e5e99d 增加大屏预览缩放功能 2021-09-06 16:10:27 +08:00
joylink_cuiweidong
8fc7907f42 代码调整 2021-09-06 15:47:15 +08:00
fan
9ed4b26a57 地图绘制添加属性ctcSetOverlap 2021-09-06 15:41:38 +08:00
fan
ab38588aaa 显示配置调整 2021-09-06 15:17:58 +08:00
joylink_cuiweidong
429c208f62 代码调整 2021-09-06 14:42:42 +08:00
joylink_cuiweidong
534fa3d106 福州一号线 添加 车辆段 操作按钮 2021-09-06 13:57:09 +08:00
joylink_cuiweidong
ed7bc52ced 代码调整 2021-09-06 11:24:01 +08:00
joylink_cuiweidong
f40fab2d47 福州一号线 添加 车辆段 操作按钮文件 2021-09-06 11:05:38 +08:00
fan
d9b5d5752c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-03 14:46:37 +08:00
fan
63b1c572d6 iscs调整 2021-09-03 14:46:22 +08:00
sunzhenyu
6759c3e680 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 18:05:35 +08:00
sunzhenyu
5fe4a7a3fb 修改三维课程编辑器组件名，修改播放器切换场景视角流程 2021-09-02 18:05:29 +08:00
fan
b9c03b591d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 16:48:02 +08:00
fan
ac67ca762a 添加中航锐创（实验室登录） 2021-09-02 16:47:48 +08:00
joylink_cuiweidong
284e051ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-01 10:56:33 +08:00
joylink_cuiweidong
197f560437 地图绘制 区段绘制 添加 向左延伸方式 2021-09-01 10:56:04 +08:00
fan
012f2ee8d9 删除操作 设置默认发车轨 2021-09-01 10:03:16 +08:00
fan
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
5bc819af6d 关闭南京二新版入口 2021-08-31 10:31:01 +08:00
fan
5e81b002e1 西安三添加操作 设置默认发车轨 (问题调整) 2021-08-31 09:53:58 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +08:00
fan
99e4db9529 西安问题调整BUG125 道岔定位失表，反位表示时道岔故障灯不红闪 2021-08-30 15:45:53 +08:00
fan
0ce7e458b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-30 15:20:32 +08:00
fan
24a887e7e8 南京二号线调整=》atr 2021-08-30 15:20:15 +08:00
sunzhenyu
babbbc68cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-27 18:06:17 +08:00
sunzhenyu
bdb734a5e4 修改三维课程编辑界面逻辑，增加三维驾驶设备柜 2021-08-27 18:06:08 +08:00
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段 
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段
 2021-08-27 10:17:13 +08:00
zyy
455e102696 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-25 11:09:58 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +08:00
fan
d6659506f7 西安三号线 通信车占用=》粉光带故障 2021-08-24 16:55:24 +08:00
fan
8182e2966c 添加线路配置routeDefaultCheckConflict=》进路默认开启冲突检测 2021-08-24 15:06:11 +08:00
fan
510c29081b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-20 09:44:10 +08:00
fan
46c62a5182 南京二号线 调整 2021-08-20 09:43:58 +08:00
sunzhenyu
128f00772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-19 09:39:30 +08:00
sunzhenyu
5cc6aeb092 修改三维驾驶按钮runlevel影响 2021-08-19 09:39:20 +08:00
joylink_cuiweidong
7999dedba1 代码调整 2021-08-18 18:16:56 +08:00
joylink_cuiweidong
e0c073034a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-18 17:37:08 +08:00
joylink_cuiweidong
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
fan
5ca6867294 南京二号线道岔区段延时解锁 闪烁逻辑调整 2021-08-18 16:58:49 +08:00
fan
51cfa55f08 南京二号线道岔区段延时解锁 闪烁不同步调整 2021-08-18 16:15:50 +08:00
joylink_cuiweidong
f65e84b5a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 17:48:58 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00
fan
e07a8ab95f 南京二号线限速值显示调整 2021-08-17 17:43:51 +08:00
fan
d5c79b2ae1 南京二号线操作调整 2021-08-17 16:58:35 +08:00
fan
a4dea11f3b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 14:14:37 +08:00
fan
7a71a573f5 南京二号线操作调整 2021-08-17 14:14:22 +08:00
joylink_cuiweidong
1ccf237b6d 西安一号线 运行图导入 添加trackName字段 2021-08-16 14:59:34 +08:00
sunzhenyu
448edcf4b7 修改三维课程中跳跃 2021-08-12 18:03:45 +08:00
sunzhenyu
ddcfcaa465 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 17:50:24 +08:00
sunzhenyu
b1e951a2bb 三维课程修改大铁停车场相关内容 2021-08-12 17:50:15 +08:00
fan
2cd974565e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 13:39:10 +08:00
fan
56fa301651 添加故障处理 回库操作 2021-08-12 13:38:59 +08:00
sunzhenyu
1674ac32ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 10:03:47 +08:00
sunzhenyu
7ba34c4f3f 修改三维驾驶列车位置初始化 2021-08-12 10:01:40 +08:00
fan
951eac98d4 南京二 调整 故障模式不弹出 进路操作弹框 2021-08-11 14:39:43 +08:00
fan
9e2c7f67a1 南京二 调整PSL 出现多个的问题 2021-08-11 09:08:29 +08:00
fan
8fb2e6eb66 南京二 故障名称调整 2021-08-10 15:47:00 +08:00
fan
b64065fb5b 西安三 仿真问题反馈表 109 2021-08-09 17:09:11 +08:00
fan
fdf781951b BUG356 南京11站：无法跨联锁区排列进路 2021-08-09 16:42:18 +08:00
fan
0bc72ed589 南京二号线 传输信号机控制权判断调整 2021-08-09 15:21:15 +08:00
fan
e81585b706 南京二号线调整 2021-08-09 09:59:41 +08:00
fan
38f7a7b83e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 17:47:37 +08:00
fan
a01ffd71d0 接收登出消息根据token 判断是否登出 2021-08-06 17:47:13 +08:00
sunzhenyu
744544d2a6 修改三维驾驶tms界面逻辑，修改三维课程成绩考试模块 2021-08-06 16:36:33 +08:00
sunzhenyu
bc47132b21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 10:28:59 +08:00
sunzhenyu
69ef5440f7 修改综合演练中数字沙盘显示 2021-08-06 10:28:40 +08:00
fan
486c3afd8c 调整应答器 IB 保存数据 signalCode 2021-08-06 10:24:28 +08:00
fan
8ed470fffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-05 18:26:18 +08:00
fan
cb128f6f21 超限区段数据 调整 2021-08-05 18:25:58 +08:00
fan
8d0edf3e52 关联超限区段 显示调整 2021-08-05 18:25:43 +08:00
fan
9e6cb0788d IB 应答器 放开关联信号机 2021-08-05 18:25:30 +08:00
fan
fd7df04cc5 站控和强制站控显示调整 2021-08-05 18:25:18 +08:00
fan
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
91c31ea155 设置联锁自动触发 灰显调整 2021-08-05 18:24:47 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +08:00
fan
88ab2d31f3 Merge remote-tracking branch 'origin/test_conflictRoute' into test 2021-08-05 18:22:16 +08:00
fan
ed42c57f36 添加超限区段调整 2021-08-05 18:17:29 +08:00
fan
5656e77cb2 添加超限区段 2021-08-05 18:17:14 +08:00
sunzhenyu
2f4026f320 修改三维课程界面 2021-08-04 18:14:00 +08:00
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
walker-sheng
4b5ff657c9 Merge branch 'test' into test_conflictRoute 
# Conflicts:
#	src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
 2021-08-03 14:33:47 +08:00
fan
c79fc46135 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-03 10:37:33 +08:00
fan
3a7c571c6f 西安三号线延续保护显示调整 2021-08-03 10:37:18 +08:00
sunzhenyu
dd64abb10f 修改三维驾驶和沙盘信号机贴图读取 2021-08-02 11:08:31 +08:00
sunzhenyu
b7819fb259 修改综合演练换车 2021-08-02 10:40:25 +08:00
sunzhenyu
4ad7f3d9d2 修改三维注释 2021-07-30 19:04:16 +08:00
sunzhenyu
049c6f174b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 19:02:18 +08:00
sunzhenyu
a31a6288f7 修改三维驾驶面板逻辑 2021-07-30 19:02:10 +08:00
fan
b8d2df5cd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 18:07:57 +08:00
fan
23ed027def 西安三现地问题： 站控转换和实际不一样 2021-07-30 18:07:44 +08:00
sunzhenyu
87f94e2dbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 17:00:11 +08:00
sunzhenyu
bec9e1d8c9 修改三维驾驶面板逻辑 2021-07-30 17:00:05 +08:00
fan
7fc996fe7e 修改PSL的关闭且紧缩图片 2021-07-30 09:45:35 +08:00
fan
50ed4fcae4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 17:48:40 +08:00
fan
a1d9b80104 西安三行调问题 74 对于可选的进路应显示出反位保护或定位保护 2021-07-29 17:48:16 +08:00
joylink_cuiweidong
5deb4cc9ab 代码调整 2021-07-29 14:06:25 +08:00
joylink_cuiweidong
62977147c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 11:09:01 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
sunzhenyu
7b55ce33b8 修改三维驾驶界面 2021-07-29 09:36:57 +08:00
sunzhenyu
a98fa35a45 三维驾驶界面修改 2021-07-28 17:57:42 +08:00
sunzhenyu
4c5c312fb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-28 17:07:21 +08:00
sunzhenyu
994df74123 升级threejs版本，修改vr参数 2021-07-28 17:07:13 +08:00
fan
11700cb81f 西安三现地问题调整 33 & 39 2021-07-28 10:26:36 +08:00
fan
335e38d1cc 调整计轴故障=》红光带故障 2021-07-28 09:47:59 +08:00
fan
ec0d69c553 调整屏蔽门开关逻辑 2021-07-28 09:39:26 +08:00
fan
90c7335964 调整宁波一号线信号机显示问题 2021-07-27 14:56:28 +08:00
fan
2272d58403 修改列车详细信息显示位置问题 2021-07-27 10:20:35 +08:00
fan
585c3719eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 18:03:15 +08:00
fan
041c94dbb9 添加列车故障 突然EB 2021-07-26 18:02:57 +08:00
sunzhenyu
5d08ecb813 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 16:11:20 +08:00
sunzhenyu
da1bc67b5e 修改三维课程控制逻辑，修改三维驾驶界面大小，优化操作 2021-07-26 16:11:15 +08:00
fan
0337658b38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 10:58:33 +08:00
fan
752459c44d 西安三现地问题 24 没有折返标识 2021-07-26 10:57:52 +08:00
joylink_cuiweidong
fd53f8643b 西安三号线问题 菜单下方时间显示有误 修改 2021-07-26 10:49:18 +08:00
fan
1f9482e3da 西安三问题84 正线所有信号机黄灯位显示与实际不符，黄灯位应在上位 2021-07-23 17:47:50 +08:00
joylink_cuiweidong
45e121179b 冲突检测 代码调整 2021-07-22 18:16:05 +08:00
joylink_cuiweidong
234b09863c 冲突检测 代码调整 2021-07-22 17:28:17 +08:00
joylink_cuiweidong
ede14de20b 添加冲突检查状态 图形标识 2021-07-22 16:36:18 +08:00
joylink_cuiweidong
6e45e2c168 代码调整 2021-07-22 14:56:27 +08:00
joylink_cuiweidong
a6e37fc667 去掉断点 2021-07-21 18:02:13 +08:00
joylink_cuiweidong
dfab1da1c6 冲突检测 代码调整 
冲突进路办理确认代码调整
 2021-07-21 17:53:14 +08:00
joylink_cuiweidong
ae28541ae1 西安三 进路交Ats控 冲突检测代码调整 2021-07-20 18:06:22 +08:00
fan
38dbebe6a6 调整西安三设置联锁自动进路条件 2021-07-20 17:58:27 +08:00
fan
c9ce97534a 进路添加批量操作 2021-07-20 13:48:21 +08:00
fan
d0d9d9cc7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-19 13:20:18 +08:00
fan
cdfe2a9a65 添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain 2021-07-19 13:19:56 +08:00
yuan
c248d1070b 站台故障增加'无关闭锁紧信号', 互锁解除后屏蔽门显示红色 2021-07-16 17:35:46 +08:00
sunzhenyu
91a0d2a574 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-16 14:57:23 +08:00
sunzhenyu
57ea368814 修复三维课程编辑逻辑 2021-07-16 14:57:18 +08:00
fan
2523801dbe 删除列车缺少参数调整 2021-07-16 14:36:18 +08:00
fan
27b5fcb962 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-16 10:51:15 +08:00
fan
55d88442c3 新建列车报错调整 2021-07-16 10:50:33 +08:00
yuan
6a674f7db9 综合演练 上下行列表显示问题修复 2021-07-16 10:30:27 +08:00
fan
79f3df8de6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-15 17:25:31 +08:00
fan
a5ab114e2d 调整行调列车显示问题 2021-07-15 17:25:20 +08:00
sunzhenyu
d6f5205ae4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-15 10:56:10 +08:00
sunzhenyu
663e874e06 修改三维课程编辑器 2021-07-15 10:56:04 +08:00
fan
d2357e0797 一键生成集中站现地配置 2021-07-15 10:50:29 +08:00
fan
3bb9c2a8d4 调整集中站设备显示 2021-07-14 09:32:12 +08:00
fan
24ec537739 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-12 10:39:01 +08:00
fan
79a85639fc 非管理员开放倍速功能（5倍速） 2021-07-12 10:38:39 +08:00
yuan
01ed5397ad ibp盘按钮增加亮灯颜色字段 2021-07-12 10:37:14 +08:00
fan
efe78c3611 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-09 11:26:18 +08:00
fan
2cdac30d19 仿真系统测试反馈表11：列车降级ITC后，鼠标悬停列车信息，依然显示CTC列车 2021-07-09 11:26:02 +08:00
yuan
a641b51505 xa3-修改列车识别号bugfix 2021-07-09 10:30:51 +08:00
fan
acba981209 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-08 15:48:21 +08:00
fan
af3f6fcbc8 ＴＳ强转站控密码为１２，仿真系统为１２３４５６ 2021-07-08 15:48:03 +08:00
yuan
cd3eb07730 PSL增加锁紧指示灯 2021-07-08 14:08:33 +08:00
yuan
ebbfc85acc IBP盘增加关门按钮 2021-07-08 13:43:38 +08:00
yuan
67fe7b6774 xa3_头码车识别号校验修改 2021-07-08 11:15:04 +08:00
joylink_cuiweidong
42d0fefa71 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-06 09:51:39 +08:00
joylink_cuiweidong
52005bb913 删除计划车bug修改（bug335） 2021-07-06 09:51:08 +08:00
fan
ab699c2f79 添加线路配置 setManualWhenHeadTrainArriveTarget 头码车抵达目的地后变为人工车 2021-07-05 16:37:12 +08:00
fan
bdd06c3f1e 登录页面添加教师登录 2021-07-05 16:16:17 +08:00
fan
41be6dbd8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-05 14:28:33 +08:00
fan
eaa60a811b 邮箱=》邮箱（账号） 2021-07-05 14:28:18 +08:00
joylink_cuiweidong
d5a232c87a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-02 16:46:25 +08:00
joylink_cuiweidong
a39996e457 福州一号线 运行图 加线抽线 
去除 西安三 运行图 加线抽线
 2021-07-02 16:45:51 +08:00
fan
9d64d05202 删除console 2021-07-02 14:10:52 +08:00
fan
4f844f3242 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-02 14:02:27 +08:00
fan
041cabfe00 西安延续保护信号机名称显示调整 列车详情调整 2021-07-02 14:02:12 +08:00
joylink_cuiweidong
6ddee3ac9d Merge remote-tracking branch 'remotes/origin/test_cx' into test 2021-07-02 13:45:32 +08:00
joylink_cuiweidong
7dff579224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-02 13:45:11 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +08:00
fan
813a0771d9 添加线路配置：transferRouteCanOnlyFaultUnlock 转换轨进路只能通过故障解锁来取消 2021-07-02 10:02:41 +08:00
fan
d5357d3614 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-01 16:06:41 +08:00
fan
19058b1935 列车遮挡调整 2021-07-01 16:06:31 +08:00
yuan
fb7dbd65fb 列车信息显示修改 2021-07-01 11:29:06 +08:00
joylink_cuiweidong
49812887fc Merge branch 'test' into test_cx 
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/menuBar.vue
 2021-07-01 10:34:28 +08:00
yuan
29730c2803 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_jhc 2021-07-01 10:15:55 +08:00
joylink_cuiweidong
87095b4f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/store/modules/runplan.js
 2021-07-01 10:09:23 +08:00
joylink_cuiweidong
c7e75739c3 西安三加线逻辑调整 2021-07-01 10:06:35 +08:00
fan
8d5664d9da 西安地铁页面调整 2021-07-01 09:42:36 +08:00
fan
a8f4b06fbf 删除runPlan 弃用代码 2021-07-01 09:42:13 +08:00
fan
4707434ed4 添加线路配置：设置头码车时检查方向checkDirectionWhenSetHead 2021-06-30 16:59:17 +08:00
fan
d04e35061c 无人自折=》无人折返 2021-06-30 16:51:23 +08:00
fan
5954a01554 西安三号线添加设头码车车次编号限制 2021-06-30 16:33:35 +08:00
fan
ae59cdac36 西安三设置头码车时不根据车次号搜索列车信息 2021-06-30 16:11:16 +08:00
fan
9a352c50fa 调整折返策略回显 2021-06-30 15:28:59 +08:00
fan
b5a225905e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-30 14:55:41 +08:00
fan
bcf9cc1d7f 左键点击关闭车次窗 2021-06-30 14:55:28 +08:00
yuan
e208182caa ibp盘增加试灯 2021-06-30 13:01:24 +08:00
yuan
6d6d64c408 停站时间显示修改 2021-06-30 09:58:37 +08:00
yuan
b2398b5563 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3 2021-06-29 17:25:11 +08:00
yuan
c736bb89b0 西安三-bug47-列车详情显示 2021-06-29 17:25:03 +08:00
fan
3992310427 修改折返默认值 2021-06-29 15:07:11 +08:00
fan
6cee614d56 更换折返方式枚举 2021-06-29 14:03:58 +08:00
fan
faf5383c5f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 13:54:04 +08:00
fan
53041725ac 更换折返方式枚举 2021-06-29 13:53:39 +08:00
joylink_cuiweidong
835e638a31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 10:33:32 +08:00
joylink_cuiweidong
94102b6c98 第三方登陆代码调整 2021-06-29 10:33:09 +08:00
fan
bd962d5320 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 10:24:30 +08:00
fan
cae193b929 Bug327 西安三：道岔计轴区段无法设置ARB橙光带故障 2021-06-29 10:23:36 +08:00
joylink_cuiweidong
cd2c43ac97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 09:43:38 +08:00
joylink_cuiweidong
95882eeeef 第三方登陆联系方式调整 2021-06-29 09:43:20 +08:00
fan
e0f672cb7d 西安三列车故障处理添加连挂操作 2021-06-28 15:28:33 +08:00
fan
1c2037f9e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-28 14:55:30 +08:00
fan
e6f479379b 列车限速区间选择5-65 2021-06-28 14:55:18 +08:00
yuan
7514ff3270 bugfix-xa3-048 修改列车识别号字段显示错误 2021-06-28 10:40:35 +08:00
yuan
118a8d07d4 错别字修改 2021-06-28 10:21:16 +08:00
yuan
0c219aff71 抽线 2021-06-25 15:34:51 +08:00
yuan
51a0ebd5fe 抽线 2021-06-25 15:34:35 +08:00
yuan
65d84a98a8 信号机距离计算方式修改 2021-06-24 18:14:36 +08:00
joylink_cuiweidong
8528475bcb 删除404页面的 一些文字 2021-06-24 15:15:31 +08:00
joylink_cuiweidong
8a13e4475b 第三方登陆 去掉下面的icp备案信息 2021-06-24 15:02:49 +08:00
fan
b9eb5f061d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-24 13:55:06 +08:00
fan
e1b5c43fb7 zc设备数据添加noService属性 2021-06-24 13:54:44 +08:00
joylink_cuiweidong
26c6e18284 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-24 13:05:20 +08:00
joylink_cuiweidong
65c235bfcd 第三方登陆跳转代码调整 2021-06-24 13:05:00 +08:00
sunzhenyu
5bf37dfa0c 修改三维设备屏蔽门模型，修改屏蔽门描述 2021-06-24 11:10:41 +08:00
sunzhenyu
50102fb62a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-23 18:09:31 +08:00
sunzhenyu
0e2ee25cb6 修改三维单体设备屏蔽门，增加拆解逻辑 2021-06-23 18:09:23 +08:00
joylink_cuiweidong
3d4ba98297 zc 代码调整 2021-06-23 15:55:04 +08:00
joylink_cuiweidong
8f9ab98fb2 zc 绘图 添加 集中站列表 2021-06-23 15:36:23 +08:00
joylink_cuiweidong
b841022401 zc 绘图 代码调整 2021-06-23 13:52:22 +08:00
fan
08b824dd5a Bug323 西安三：现地无法切换车站，提示：调整角色成员失败 2021-06-23 10:09:19 +08:00
yuan
55ae33c204 移除无用代码 2021-06-22 18:03:29 +08:00
sunzhenyu
b27ca87efd Merge brancht 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-22 17:27:32 +08:00
sunzhenyu
7f15943ee1 修改大铁三维单体设备道岔转辙机zdj9 2021-06-22 17:27:26 +08:00
yuan
3081681aaf Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder 2021-06-22 17:19:03 +08:00
yuan
f032e3f1ee 地图编辑-应答器增加一键关联到信号机功能 2021-06-22 17:18:49 +08:00
joylink_cuiweidong
c7569931ff 哈尔滨线路问题 上行设置了越站后显示在轨道上看不清楚，需要调一下位置。 2021-06-22 17:06:09 +08:00
yuan
1523ab6f51 应答器关联区段显示bug修复,增加选中高亮 2021-06-22 14:40:21 +08:00
joylink_cuiweidong
21115775fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-22 10:14:59 +08:00
joylink_cuiweidong
a6d01035dd 成都三，福州一实训 说明修改 2021-06-22 10:14:39 +08:00
fan
4efa513836 调整计轴故障ARB优先级 2021-06-22 09:27:11 +08:00
joylink_cuiweidong
14da4cbc2b 成都三号线 实训说明调整 2021-06-21 16:49:13 +08:00
joylink_cuiweidong
22af8c1af7 西安二号线 宁波三号线 实训说明修改 2021-06-21 14:13:00 +08:00
joylink_cuiweidong
1879398d92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-21 13:24:56 +08:00
joylink_cuiweidong
406f23eb7c 福州一 宁波一 实训 描述修改 2021-06-21 13:24:35 +08:00
fan
60a428c91f 添加ARB故障 2021-06-21 10:06:13 +08:00
yuan
5d22b7a548 IBP盘 - 报警器,圆灯,按钮增加区分上下行字段 2021-06-18 10:36:45 +08:00
yuan
71c4735088 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ibp 2021-06-18 09:10:46 +08:00
fan
f6b90441f4 西安三站台状态管理显示调整(again again) 2021-06-17 18:43:10 +08:00
fan
320662e6a0 西安三站台状态管理显示调整(again) 2021-06-17 18:18:25 +08:00
fan
544ba5af63 西安三站台状态管理显示调整 2021-06-17 18:03:03 +08:00
fan
82f38c349b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_cunzai 2021-06-17 17:52:46 +08:00
fan
841763d48a 存在仿真管理调整 2021-06-17 17:52:28 +08:00
joylink_cuiweidong
e68991538d 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 17:35:17 +08:00
joylink_cuiweidong
b96b77e927 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 17:00:33 +08:00
joylink_cuiweidong
fefbf97c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:57:09 +08:00
joylink_cuiweidong
c1a3ba8b00 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 15:56:08 +08:00
sunzhenyu
ee21f2f67c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:50:25 +08:00
sunzhenyu
e3e7bf4a8d 修改三维大铁驾驶面板，增加云效果 2021-06-17 15:50:18 +08:00
joylink_cuiweidong
e24690fdec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:40:25 +08:00
joylink_cuiweidong
a1b42ba0c0 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 15:39:24 +08:00
fan
7c70199614 添加线路配置项 2021-06-17 15:31:45 +08:00
fan
33224d4dd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 14:53:26 +08:00
fan
1037167e58 本地部署项目登录退出路由跳转调整 2021-06-17 14:53:15 +08:00
yuan
dbfbbc9034 ibp盘多个报警器处理 2021-06-17 14:52:58 +08:00
yuan
ecea32ad9c ibp编辑 - 紧急停车按钮和报警器区分上下行 2021-06-17 13:51:54 +08:00
sunzhenyu
0879173066 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 18:27:19 +08:00
sunzhenyu
26e0347ae8 修改三维大铁驾驶刹车盘数值 2021-06-16 18:27:14 +08:00
fan
c574f0249c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:55:49 +08:00
fan
1fdde772c1 BUG316哈尔滨：右键点击列车车次框，不应弹出列监对话框，只左键点击弹出即可&BUG312哈尔滨：现地无法追踪全开 2021-06-16 16:55:38 +08:00
joylink_cuiweidong
4f74d4b33d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:07:11 +08:00
joylink_cuiweidong
23d760d1a9 哈尔滨项目 右下角退出操作 代码调整 2021-06-16 16:06:30 +08:00
fan
5cf6a1e84f 哈尔滨项目打开运行图报错调整 2021-06-16 15:31:55 +08:00
yuan
a6ecb523f9 IBP盘alarm调整 2021-06-16 14:56:36 +08:00
fan
926a95a818 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 14:50:36 +08:00
fan
f9ee7ff8e8 哈尔滨行调不显示基础按钮 2021-06-16 14:50:14 +08:00
joylink_cuiweidong
49d30f0e6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 14:41:10 +08:00
joylink_cuiweidong
d1083cc871 哈尔滨 项目 生成计划接口调整 2021-06-16 14:40:36 +08:00
yuan
7ef2f896cf Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-16 14:30:22 +08:00
yuan
35cb4fcb32 IBP盘报警器逻辑修复 2021-06-16 14:30:11 +08:00
fan
9726928f1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 14:27:53 +08:00
fan
152b7983a3 模板运行图添加编辑 2021-06-16 14:27:44 +08:00
joylink_cuiweidong
67c10547a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 13:38:27 +08:00
joylink_cuiweidong
4ede6b61da 哈尔滨 综合监控设备登陆 代码调整 2021-06-16 13:37:50 +08:00
fan
c84c50efbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 13:23:30 +08:00
fan
9c991484d7 西安仿真测试反馈40、42调整 扣车跳停标志显示点击调整 2021-06-16 13:23:15 +08:00
yuan
0a1720920e Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-16 11:26:08 +08:00
yuan
6cc2cfcbd2 IBP盘改造 2021-06-16 11:23:55 +08:00
joylink_cuiweidong
6128cc8d50 地图发布 添加描述字段 
发布地图 发布历史展示描述字段
 2021-06-16 11:15:31 +08:00
joylink_cuiweidong
7ea966b539 西安三 行调添加 强制取消扣车 2021-06-16 10:30:17 +08:00
yuan
6965c2f9fd bugfix-ibp盘复位按钮缺少字段 2021-06-15 17:43:23 +08:00
yuan
a12106a329 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-15 17:24:41 +08:00
yuan
da1b23404d 计轴复位暂存 2021-06-15 17:24:26 +08:00
joylink_cuiweidong
eeb75b6a6d Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-15 15:34:42 +08:00
joylink_cuiweidong
a0861633f2 zc 添加管理的区段列表（计轴区段） 2021-06-15 15:33:50 +08:00
fan
4c52f9354f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-15 10:12:01 +08:00
fan
580ef87fa7 列监显示调整 2021-06-15 10:11:48 +08:00
yuan
5fc61b053e Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-15 09:40:38 +08:00
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +08:00
yuan
8ada789234 baseurl 2021-06-11 17:34:49 +08:00
joylink_cuiweidong
2007c3b3ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-11 15:37:10 +08:00
joylink_cuiweidong
bea9855e79 地图绘制 地图列表代码bug处理 2021-06-11 15:36:23 +08:00
yuan
263d32e9cb 计轴预复位修改字段 2021-06-11 13:52:05 +08:00
yuan
c089649220 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-11 11:04:14 +08:00
yuan
63033dc90a 西安3 修改计轴复位逻辑(双按钮三秒) 2021-06-11 11:04:06 +08:00
joylink_cuiweidong
602dc9df71 在线用户管理 登陆系统字段 调整 2021-06-11 10:33:21 +08:00
joylink_cuiweidong
7a861f406f Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-11 09:41:48 +08:00
joylink_cuiweidong
151eb83981 用户管理添加根据账户、父账户条件查询 2021-06-11 09:40:24 +08:00
joylink_cuiweidong
e2165918bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-11 09:17:55 +08:00
joylink_cuiweidong
79fa65c145 宁波一号线 实训操作定义中的 实训说明 修改 2021-06-11 09:17:38 +08:00
sunzhenyu
a2216d8608 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-10 18:07:35 +08:00
sunzhenyu
734a69751b 三维大铁驾驶简化 2021-06-10 18:07:27 +08:00
joylink_cuiweidong
7577c5571d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-10 16:08:25 +08:00
joylink_cuiweidong
ce78cb8e08 Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-10 16:08:04 +08:00
yuan
0ddc2844d0 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder_batch 2021-06-10 15:46:30 +08:00
yuan
a4e6119c4b 应答器批量创建增加区段偏移值 2021-06-10 15:46:20 +08:00
joylink_cuiweidong
298999d7ff 删除账户(逻辑删除) 代码调整 2021-06-10 14:48:24 +08:00
joylink_cuiweidong
b1a0fd88d0 将权限分发包分发给指定账户 2021-06-10 14:31:30 +08:00
joylink_cuiweidong
c024fd281f 更改宁波一号线的 操作定义中的 实训说明 2021-06-10 13:42:33 +08:00
joylink_cuiweidong
e31f5aaed5 更改福州一号线的 操作定义中的 实训说明 2021-06-10 11:10:53 +08:00
joylink_cuiweidong
3a2670a367 Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-10 10:15:52 +08:00
joylink_cuiweidong
4b75808aea 在线用户代码调整 2021-06-10 10:09:55 +08:00
yuan
2bef634a07 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder_batch 2021-06-10 10:01:46 +08:00
yuan
4bd21b30c5 地图编辑-应答器-批量创建 页面修改 2021-06-10 10:01:34 +08:00
joylink_cuiweidong
15c94bd50c 添加 在线用户查询 2021-06-09 18:10:21 +08:00
joylink_cuiweidong
de337d4aa6 西安三 菜单修改 
CM改成SM
URM改成NRM
 2021-06-09 17:05:40 +08:00
joylink_cuiweidong
7781801171 第三方账号通过url登陆 以及 创建第三方账号 功能添加 2021-06-09 16:37:02 +08:00
fan
532fd1d5da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ibpHold 2021-06-08 16:01:06 +08:00
fan
4b7e2efcba 西安三号线ibp盘扣车显示调整 2021-06-08 16:00:55 +08:00
sunzhenyu
62f339d3cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-08 14:55:58 +08:00
sunzhenyu
9a2e993b5d 修改大铁三维单体设备通信和显示逻辑 2021-06-08 14:55:37 +08:00
fan
1ed9fd4d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-08 14:44:36 +08:00
fan
c09da2aa5d 列车操作调整 2021-06-08 14:44:23 +08:00
yuan
d94a95f261 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-08 10:09:01 +08:00
yuan
3093a1bc1c 修改PSL菜单显示逻辑为非故障模式且角色为车站值班员 2021-06-08 10:08:48 +08:00
fan
ae42915db5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_shichang 2021-06-07 16:11:47 +08:00
fan
891db1539c 教学管理添加使用时长 2021-06-07 16:11:36 +08:00
yuan
e30f81b93d 替换PSL亮灯图片 2021-06-07 10:46:52 +08:00
yuan
c3a3f8ce63 修正PSL试灯按钮不显示 2021-06-07 10:08:50 +08:00
fan
2524e45c42 Revert "Revert "PSL"" 
This reverts commit 9832b0c8
 2021-06-07 09:12:43 +08:00
fan
c0c1ef8d05 Revert "Revert "PSL"" 
This reverts commit 74249e59
 2021-06-07 09:12:13 +08:00
fan
f10581e2dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-04 18:06:13 +08:00
fan
74249e5992 Revert "PSL" 
This reverts commit 185a3eff
 2021-06-04 18:06:01 +08:00
fan
9832b0c87f Revert "PSL" 
This reverts commit 786d0f7a
 2021-06-04 18:05:43 +08:00
sunzhenyu
e0b9861b78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-04 18:05:19 +08:00
sunzhenyu
85e1faa60c 增加三维大铁返回按钮 2021-06-04 18:05:12 +08:00
yuan
95ce742d95 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 17:55:58 +08:00
yuan
786d0f7a9f PSL 2021-06-04 17:55:39 +08:00
sunzhenyu
45a2c925ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-04 17:26:49 +08:00
sunzhenyu
23ad69529a 增加三维大铁驾驶界面更新，增加三维大铁信号机，修改大铁三维加载和大铁信号模块 2021-06-04 17:26:41 +08:00
fan
eb6ad1d7c8 调整列车故障处理 限速指令 参数范围和提示 2021-06-04 16:21:21 +08:00
fan
eeb52c7911 西安三列车菜单操作增加单位和提示 2021-06-04 16:12:16 +08:00
yuan
aa395d1206 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 16:06:12 +08:00
yuan
185a3eff6e PSL 2021-06-04 16:05:56 +08:00
fan
b6a373a34a 西安三列车菜单位置调整 2021-06-04 14:57:08 +08:00
fan
50a7b6e039 南京二号线列监暂提 2021-06-04 14:22:39 +08:00
fan
4d89906af4 Merge remote-tracking branch 'origin/test_xian03training' into test 2021-06-04 09:52:12 +08:00
fan
3bcc904d5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03 2021-06-03 18:09:53 +08:00
fan
16c5659bb9 调整西安三号线早晚点文字提示 2021-06-03 18:09:43 +08:00
sunzhenyu
9ae1cf2ead Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-03 18:03:50 +08:00
sunzhenyu
1258bc4771 单独分出大铁三维单体设备，剔除无用接口，修改大铁驾驶界面，调试接口 2021-06-03 18:03:44 +08:00
fan
8004071e6f 绘图添加出站信号机进站信号机 2021-06-03 17:40:44 +08:00
fan
7ea850497a 西安三号线问题调整 2021-06-03 17:31:50 +08:00
fan
70d1ed2ce6 Merge branch 'test_xian03training' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03training 2021-06-03 13:09:49 +08:00
fan
ae756864cf 西安三号线实训调整 2021-06-03 13:09:35 +08:00
joylink_cuiweidong
2a5ab20cde 西安三 界面 设置停站时间 显示重叠 2021-06-03 11:19:07 +08:00
yuan
c9af4a7031 emmm 2021-06-03 09:58:24 +08:00
fan
e34cafce7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-03 09:47:50 +08:00
fan
0d27da9d3b 南京二号线列监调整--暂提 2021-06-03 09:47:40 +08:00
fan
9dc64e67ed 南京二号线列监调整 2021-06-02 17:58:18 +08:00
fan
5bd0f380b6 南京二号线列监调整 2021-06-02 17:55:24 +08:00
fan
ad0cbdbd0f 南京二号线现地初始化列车没清调整 2021-06-02 10:22:24 +08:00
fan
3301f9abcd 南京二号线车站显示模块调整 2021-06-01 18:13:13 +08:00
fan
e134b23fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:50:46 +08:00
fan
25f546b205 南京二号线车站显示模块调整 2021-06-01 17:50:37 +08:00
joylink_cuiweidong
56ea29660f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:29:33 +08:00
joylink_cuiweidong
d58c80888e 西安三号线 添加道岔定反位失表 2021-06-01 17:29:02 +08:00
fan
35db44cd42 列车故障操作驾驶至调整 2021-06-01 15:36:18 +08:00
fan
6b90da452b 添加运行图加载规则 2021-06-01 14:57:40 +08:00
fan
a52c2d2126 信号机接近区段 2021-06-01 14:22:09 +08:00
fan
a8ce67ee4a 南京二号线调整 2021-06-01 14:06:18 +08:00
fan
9ac45050f9 列车指令调整 2021-06-01 11:01:02 +08:00
fan
a3b62e203d 列车指令调整 2021-06-01 10:22:10 +08:00
fan
c71f2fde96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 10:13:25 +08:00
fan
9f4841e9e0 列车指令调整 2021-06-01 10:13:10 +08:00
zyy
e1958b1b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:53:03 +08:00
zyy
137b427ebe 调整新路预览配置 2021-05-31 15:52:46 +08:00
joylink_cuiweidong
426677ab57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:50:59 +08:00
joylink_cuiweidong
3c34a5b319 更改 新版仿真订阅路径 2021-05-31 15:50:35 +08:00
sunzhenyu
cde07e6859 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:50:14 +08:00
sunzhenyu
8ec3baa515 修改三维大铁驾驶通信接口 2021-05-31 15:50:07 +08:00
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +08:00
fan
2fd6a971f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:25:00 +08:00
fan
cec41aeccf 注释南京二行调 2021-05-28 18:23:42 +08:00
zyy
58f1e06267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:12:53 +08:00
zyy
224bbc0177 调整进路更新延续保护配置 2021-05-28 18:12:35 +08:00
sunzhenyu
397c80a967 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:09:16 +08:00
sunzhenyu
9ea7abf401 修改三维大铁驾驶模块接通车速变化 2021-05-28 18:09:10 +08:00
zyy
5678498fa6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 17:20:33 +08:00
zyy
d86566be12 调整延续保护字段 2021-05-28 17:20:16 +08:00
fan
d11b0c6d47 增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭 2021-05-28 17:18:51 +08:00
fan
ee6dfa9df2 南京二列监 2021-05-28 15:22:23 +08:00
fan
15e1868d6c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 14:08:24 +08:00
fan
e09d5f4aff 调整仿真开始显示暂停中 & 南京二列监 2021-05-28 14:07:28 +08:00
zyy
e6f3afd6a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 13:08:17 +08:00
zyy
f9835862ce 调整侧防流程 2021-05-28 13:08:02 +08:00
fan
70ca57d26c 时刻表列车总览详览迁移 2021-05-28 11:00:26 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-28 10:18:57 +08:00
fan
1b5da46e80 背投轨道总览详览调整 2021-05-28 10:10:54 +08:00
sunzhenyu
c2bda14c4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 18:16:01 +08:00
sunzhenyu
d71c4d7d6d 增加大铁三维驾驶模块 2021-05-27 18:15:54 +08:00
joylink_cuiweidong
bb73608a1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 17:28:36 +08:00
joylink_cuiweidong
8c232d2b13 大铁项目 代码调整 2021-05-27 17:27:50 +08:00
zyy
a46a2764a5 增加用户查询id列表 2021-05-27 17:19:05 +08:00
zyy
b2806165ef 调整信号机接近区段更新流程 2021-05-27 16:40:28 +08:00
zyy
672c95c6c6 调整信号接近区段 2021-05-27 16:10:58 +08:00
zyy
529839b3ac 调整进路更新，延续保护更新 2021-05-27 15:15:58 +08:00
zyy
3a06aae186 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 14:19:43 +08:00
zyy
e150fda807 调整延续保护 2021-05-27 14:19:28 +08:00
joylink_cuiweidong
aa9c961cb0 旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state） 2021-05-27 13:56:17 +08:00
joylink_cuiweidong
796983e9e8 合并 设计平台菜单（pdf上传和编辑器） 2021-05-27 13:28:35 +08:00
joylink_cuiweidong
2938528c2e sock 断线重连 代码调整 2021-05-27 11:30:03 +08:00
joylink_cuiweidong
411099fdc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 09:33:48 +08:00
joylink_cuiweidong
1c2f663d9c 西安三号线 行调添加设置/取消自动触发、自动进路 2021-05-27 09:33:15 +08:00
fan
4191df5fff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 17:25:26 +08:00
fan
b776b48bf5 哈尔滨列监显示条件限制 2021-05-26 17:25:16 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
zyy
f9e9efc70c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 17:03:54 +08:00
zyy
2b338ba0de 调整进路预览 2021-05-26 17:03:38 +08:00
fan
ce1b6c5f8a meger 2021-05-26 15:48:55 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
joylink_cuiweidong
04f156cc28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 15:01:26 +08:00
joylink_cuiweidong
7b3e127898 南京二号线 十一站型 时刻表 页面添加 2021-05-26 15:01:02 +08:00
zyy
8b2f8c7bc1 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02 2021-05-26 14:43:51 +08:00
zyy
2d6f8ad984 增加车场弹窗 2021-05-26 14:43:34 +08:00
fan
49c1eba347 列监代码显示 2021-05-26 14:19:40 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
455fe9dccd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:40:29 +08:00
fan
c4b4955541 BUG176、174 2021-05-26 10:40:17 +08:00
joylink_cuiweidong
300dd3d6d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:16:45 +08:00
joylink_cuiweidong
cc4eaf034c 西安三号线 右键的车站切换划分问题（bug281） 2021-05-26 10:16:22 +08:00
fan
16faefb526 线路配置添加 figuresOfTripNumber（车次号位数）&figuresOfServiceNumber（服务号位数） 2021-05-25 18:02:59 +08:00
fan
5188192736 BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示 2021-05-25 17:53:23 +08:00
fan
3b3c964636 宁波问题调整 2021-05-25 16:33:20 +08:00
fan
c4894290f4 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-25 16:07:22 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
fan
a42e3ecafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-25 13:18:19 +08:00
fan
3ea6c67b0f 哈尔滨问题调整 2021-05-25 13:17:55 +08:00
joylink_cuiweidong
60fce71f8a 西安三号线 鼠标右键无法出现菜单快速切换车站 处理 2021-05-25 10:36:20 +08:00
joylink_cuiweidong
8abbe2e05a 修改西安三号线问题 道岔失表不能设置定位或反位失表，只能设置成道岔定反位都失表 2021-05-25 09:48:54 +08:00
joylink_cuiweidong
45371fb2d3 修改canvasId 初始化位置 2021-05-25 09:32:11 +08:00
fan
6ec48dab9d BUG273 设置故障时，点击故障列表后，直接点击关闭按钮，故障列表还会显示 2021-05-24 17:41:54 +08:00
fan
6ce5bdfbed 调整heartBeat重连条件 2021-05-24 17:22:36 +08:00
fan
8c1e968213 BUG269 哈尔滨：报警信息缺少故障描述 2021-05-24 17:01:10 +08:00
fan
640793241a BUG270 问题调整 2021-05-24 16:08:52 +08:00
fan
9548e24464 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-24 15:53:50 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
sunzhenyu
e031986664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 15:31:29 +08:00
sunzhenyu
04b112223c baseurl 2021-05-21 15:31:25 +08:00
sunzhenyu
351d268e52 三维课程增加场景id显示，修改提示窗下一步功能区分，修改事件驱动条件 2021-05-21 15:30:50 +08:00
joylink_cuiweidong
e17104f537 地图绘制 停站时间/运行等级 代码调整 2021-05-21 15:12:40 +08:00
joylink_cuiweidong
13af28467c 地图绘制 停站时间/运行等级 界面与接口代码调整 
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
 2021-05-21 15:02:28 +08:00
joylink_cuiweidong
4cefb0cfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 11:34:28 +08:00
joylink_cuiweidong
bf8d0eb574 地图绘制 停站时间 界面与接口代码调整 2021-05-21 11:33:37 +08:00
fan
fbd700d52e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 10:01:54 +08:00
fan
2438b9f0a0 删除仿真、绘图、运行图编制的心跳检测 2021-05-21 10:01:45 +08:00
fan
22cfed1774 暂提 2021-05-21 09:42:03 +08:00
zyy
54ad4bf93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:58:42 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
fan
e49840afc8 绑定数据编辑调整 2021-05-20 17:51:00 +08:00
fan
7a33bae3fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:39:32 +08:00
fan
4c948d91ff 绑定数据编辑调整 2021-05-20 17:38:55 +08:00
zyy
89b63e9709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:13:19 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
sunzhenyu
f3c9bfdcb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:06:35 +08:00
sunzhenyu
5392755eda 修改三维课程联控菜单位置，修改三维模型添加bug，修改移动模型指示器，修改操作切换，修改模型场景中显示移除逻辑，修改事件触发器逻辑 2021-05-20 17:06:28 +08:00
zyy
9789fb4d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 16:38:08 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
fan
3ac0069577 暂提 2021-05-20 15:53:21 +08:00
fan
1b62198d55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:40:10 +08:00
fan
0b716d7bc3 pad检索调整 2021-05-20 15:39:44 +08:00
fan
32ef41b405 暂提 2021-05-20 15:18:02 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示，地图绘制新增 2021-05-20 15:13:37 +08:00
fan
6590c10ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:06:24 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
joylink_cuiweidong
7094b1d497 南京二号线 列车详览页面 代码调整 2021-05-20 15:05:57 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
joylink_cuiweidong
beb086e57f 南京二号线 列车总览页面 代码调整 2021-05-20 09:20:31 +08:00
joylink_cuiweidong
f1e44a9ee8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 09:02:02 +08:00
zyy
fbb9365b62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 18:14:44 +08:00
zyy
83561a2545 调整权限分发 2021-05-19 18:14:27 +08:00
joylink_cuiweidong
f20793ec0d 代码调整 2021-05-19 18:11:32 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
joylink_cuiweidong
7cac00b163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 16:46:29 +08:00
joylink_cuiweidong
e6e09d24fb 代码调整 2021-05-19 16:46:07 +08:00
fan
9b422cd3b9 南京二号线调整（未完） 2021-05-19 16:07:52 +08:00
fan
999c0197cf 区域选择不随仿真角色变化调整 2021-05-19 15:58:52 +08:00
fan
43f523cf88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 15:46:13 +08:00
fan
6b57369b8f 车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见 2021-05-19 15:45:49 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
joylink_cuiweidong
65daf903bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 09:44:05 +08:00
joylink_cuiweidong
17c4fdafa6 代码调整 2021-05-19 09:43:24 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00
fan
f1d41844dc 南京二列车操作报错提示 & BUG267 2021-05-18 13:47:22 +08:00
fan
5eef5240e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 13:36:26 +08:00
fan
df68e9a969 tro 轨道总览 2021-05-18 13:36:06 +08:00
joylink_cuiweidong
b87425f8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:49:20 +08:00
joylink_cuiweidong
622885d3d5 删除暂时没有用的npm 模块（lodash,mock） 
发布地图 地图分组代码调整
 2021-05-18 10:48:58 +08:00
fan
4b83445624 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:04:20 +08:00
fan
7af49deb90 综合演练添加车站值班员 2021-05-18 10:04:03 +08:00
joylink_cuiweidong
60aeeaedea 代码调整 2021-05-17 19:15:25 +08:00
joylink_cuiweidong
1ca70a08b8 代码调整 2021-05-17 19:07:24 +08:00
joylink_cuiweidong
6a07a81233 代码调整 2021-05-17 19:06:00 +08:00
joylink_cuiweidong
5a6fcc48eb 代码调整 2021-05-17 19:00:27 +08:00
joylink_cuiweidong
c0d2b19589 代码调整 2021-05-17 18:57:20 +08:00
joylink_cuiweidong
fee03bbb41 代码调整 2021-05-17 18:42:50 +08:00
joylink_cuiweidong
aee104ce99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:42:35 +08:00
joylink_cuiweidong
ada429fcde pdf上传 代码调整 2021-05-17 18:41:58 +08:00
zyy
6ba7b730a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:16:38 +08:00
zyy
9a2785f126 调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道 2021-05-17 18:16:22 +08:00
fan
4384e36314 BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字 2021-05-17 18:03:44 +08:00
fan
c2272313fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:29:41 +08:00
fan
d00f74e190 大铁线路图纸检索 2021-05-17 17:29:33 +08:00
joylink_cuiweidong
8033c42655 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:20:49 +08:00
joylink_cuiweidong
57feb88e6c pdf 上传 代码调整 2021-05-17 17:20:26 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
9554643f05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 16:14:17 +08:00
fan
02eaa33fec 背投调整 2021-05-17 16:14:00 +08:00
zyy
17f25b1e0b 处理冲突文件 
#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-17 15:58:57 +08:00
zyy
050d5854d1 增加南京区段操作流程，请求暂未调整 2021-05-17 15:57:07 +08:00
fan
5c5a1db13d Bug262 福州一：紧急停车状态表示有问题 2021-05-17 15:52:26 +08:00
fan
122ca9ec6b 列车操作调整 2021-05-17 15:13:26 +08:00
fan
dfc5d50fbe ATS显示调整 2021-05-17 14:39:16 +08:00
fan
5215d8ba2c merge 2021-05-17 13:37:03 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
joylink_cuiweidong
3bbfae4082 pdf上传 代码调整 2021-05-17 10:42:13 +08:00
joylink_cuiweidong
290542ee28 pdf上传代码调整 2021-05-17 09:51:06 +08:00
zyy
1dba8c2e9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2021-05-14 18:33:09 +08:00
zyy
54295fe452 增加pdf 上传 2021-05-14 18:31:46 +08:00
sunzhenyu
a8d89df500 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 18:09:24 +08:00
sunzhenyu
883c70bd30 增加三维课程角色选择，增加三维课程信息提示跳转部分 2021-05-14 18:09:18 +08:00
fan
01fdc0ef22 加载时刻表 2021-05-14 18:08:12 +08:00
fan
666e85dec6 车次号步进 2021-05-14 16:49:27 +08:00
fan
69c6526516 Bug260 、Bug261、郑州共赢代码调整 2021-05-14 15:59:04 +08:00
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
zyy
9bd90ce182 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 13:14:24 +08:00
zyy
af9eb2c8b6 增加文章编辑器 2021-05-14 13:14:08 +08:00
joylink_cuiweidong
d584e7ea7d 添加 图纸管理页面 2021-05-13 18:09:10 +08:00
joylink_cuiweidong
02241f455a 地图绘图 高级数据 代码调整 2021-05-13 14:19:58 +08:00
joylink_cuiweidong
61b982e9b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-13 13:55:21 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
fan
149d4cf995 Bug 206 语音训练结果在查询的时候，选择A用户，结果里出现了B用户的语音 2021-05-13 13:22:30 +08:00
fan
bf69914d21 代码问题调整 
(cherry picked from commit 7cd36b7446)
 2021-05-13 13:13:44 +08:00
joylink_cuiweidong
d52a5837b4 宁波三 列车绘图代码调整 2021-05-12 14:17:14 +08:00
sunzhenyu
9a5a9b7ff7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-12 10:53:12 +08:00
sunzhenyu
77584bc346 修改三维设备手摇道岔操作 2021-05-12 10:53:06 +08:00
joylink_cuiweidong
7138a02900 仿真里在打开设备视图的状态下，点击右下角返回按钮退出登录 bug调整 2021-05-12 10:41:55 +08:00
sunzhenyu
c5a020e1a6 修改三维设备展示文本错别字 2021-05-12 10:37:39 +08:00
sunzhenyu
7b4d6a267e 修改三维设备手摇道岔文字描述 2021-05-11 16:11:15 +08:00
sunzhenyu
7b73ff0e69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-11 15:59:44 +08:00
sunzhenyu
14d63ae42a 三维设备视图手摇道岔操作展示 2021-05-11 15:59:35 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
c1d5b84e0b 添加一键校验发布地图 2021-05-10 15:44:34 +08:00
fan
9c7b6e4ab2 运行图解析调整 2021-05-10 15:08:58 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
joylink_cuiweidong
d0ce678ca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-10 13:50:55 +08:00
joylink_cuiweidong
cc259c8a15 哈尔滨项目运行图代码调整 2021-05-10 13:50:17 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
b2892930ad 语音训练添加录音播放 2021-05-08 14:33:55 +08:00
fan
e597a3ae8f 添加站台紧急停车 2021-05-08 14:11:22 +08:00
fan
be3ea8384a 添加站台紧急停车 2021-05-08 13:31:19 +08:00
fan
67f1076dec 故障调整 2021-05-08 09:22:16 +08:00
fan
181caff10c 哈尔滨添加故障操作 2021-05-07 16:16:36 +08:00
fan
14d63cecbc 哈尔滨打包调整 2021-05-07 11:08:28 +08:00
fan
49d19a7d14 大铁去掉mBar 2021-05-06 16:25:13 +08:00
fan
cfd6990189 场景语音训练调整 2021-05-06 16:22:10 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
0b78df8c9c 场景语音训练调整 2021-05-06 15:35:14 +08:00
fan
78c8b39edb 场景语音训练调整 2021-05-06 14:50:34 +08:00
fan
b4a0a42235 场景语音训练调整 2021-05-06 10:30:29 +08:00
fan
8dc44f11f8 场景语音训练调整 2021-05-06 09:54:51 +08:00
fan
21990ebf11 场景语音训练调整 2021-04-30 17:38:15 +08:00
fan
cc00e11304 场景语音训练调整 2021-04-30 17:34:37 +08:00
fan
d3238e77e2 场景语音训练调整 2021-04-30 16:50:04 +08:00
fan
2fd786ecbf baseURl 2021-04-30 16:36:27 +08:00
fan
21fe3c8b1e 语音训练调整 2021-04-30 16:35:28 +08:00
fan
f9d2d8a0ac 语音训练调整 2021-04-30 16:14:56 +08:00
fan
aa2648231f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-30 10:24:44 +08:00
fan
8087d87b22 大铁线路操作调整 
(cherry picked from commit 0a0917dd32)
 2021-04-30 10:24:18 +08:00
sunzhenyu
861065e159 修改三维编辑器v-for key警告 2021-04-30 10:01:36 +08:00
sunzhenyu
528af2fea6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 17:56:01 +08:00
sunzhenyu
2f60a7a352 增加静态测试模型，修改三维课程播放器模型触发器模块，增加三维动画模块，修改课程信息模块 2021-04-29 17:55:55 +08:00
fan
2849342be6 大铁线路操作调整 2021-04-29 16:26:08 +08:00
fan
0585502691 大铁线路操作调整 2021-04-29 15:50:15 +08:00
fan
acf4f6bea9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 13:25:58 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
joylink_cuiweidong
87c86536df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 11:02:37 +08:00
joylink_cuiweidong
9ce15c6d25 代码调整 2021-04-29 11:02:15 +08:00
fan
5ee38364a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 10:35:44 +08:00
fan
ed7c4bb8f5 大铁线路操作调整 2021-04-29 10:35:34 +08:00
joylink_cuiweidong
330416f0e0 语音训练代码调整 2021-04-29 10:21:51 +08:00
fan
5678d8dfad 信号机坐标编辑显示 2021-04-28 18:46:04 +08:00
fan
edbd6d55cf 信号机坐标编辑显示 2021-04-28 17:14:48 +08:00
fan
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
6ec82c158f 大铁仿真操作调整 2021-04-28 13:36:58 +08:00
fan
2d044a6810 大铁仿真操作调整 2021-04-28 09:01:27 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
b107ae58d6 大铁仿真操作调整 2021-04-27 14:40:17 +08:00
fan
19e3bb91d0 大铁仿真操作调整 2021-04-27 13:24:33 +08:00
fan
fad65a0d66 大铁仿真操作调整 2021-04-27 13:02:38 +08:00
fan
c99194f84e 新版仿真订阅消息调整 2021-04-27 10:17:51 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
cd84fbb4cd 大铁线路操作调整 2021-04-26 16:00:39 +08:00
fan
bb973a23d2 大铁线路操作调整 2021-04-26 13:39:19 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
c22a40b6f0 BUG234 => 测试环境中苏电院教学管理页面显示问题 2021-04-25 14:54:05 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
b26d17f607 信号机状态调整 2021-04-23 18:11:07 +08:00
fan
13e0f107f0 后端状态转译 2021-04-23 17:43:45 +08:00
fan
87daa342d6 query newApi 判断调整 2021-04-23 15:14:10 +08:00
fan
c6f5f84d77 query测试 2021-04-23 15:01:04 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
4fcaffae50 大铁仿真调整 2021-04-23 10:24:05 +08:00
fan
6f06822793 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-23 09:01:26 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00