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

10472 Commits

Author SHA1 Message Date
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