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

6550 Commits

Author SHA1 Message Date
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
8182e2966c 添加线路配置routeDefaultCheckConflict=》进路默认开启冲突检测 2021-08-24 15:06:11 +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
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00
sunzhenyu
b1e951a2bb 三维课程修改大铁停车场相关内容 2021-08-12 17:50:15 +08:00
sunzhenyu
7ba34c4f3f 修改三维驾驶列车位置初始化 2021-08-12 10:01:40 +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
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +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
sunzhenyu
b7819fb259 修改综合演练换车 2021-08-02 10:40:25 +08:00
sunzhenyu
4ad7f3d9d2 修改三维注释 2021-07-30 19:04:16 +08:00
sunzhenyu
a31a6288f7 修改三维驾驶面板逻辑 2021-07-30 19:02:10 +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
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
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
joylink_cuiweidong
fd53f8643b 西安三号线问题 菜单下方时间显示有误 修改 2021-07-26 10:49:18 +08:00
fan
c9ce97534a 进路添加批量操作 2021-07-20 13:48:21 +08:00
fan
cdfe2a9a65 添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain 2021-07-19 13:19:56 +08:00
yuan
6a674f7db9 综合演练 上下行列表显示问题修复 2021-07-16 10:30:27 +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
yuan
ebbfc85acc IBP盘增加关门按钮 2021-07-08 13:43:38 +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
a39996e457 福州一号线 运行图 加线抽线 
去除 西安三 运行图 加线抽线
 2021-07-02 16:45:51 +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
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
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
fan
53041725ac 更换折返方式枚举 2021-06-29 13:53:39 +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
yuan
65d84a98a8 信号机距离计算方式修改 2021-06-24 18:14:36 +08:00
joylink_cuiweidong
8528475bcb 删除404页面的 一些文字 2021-06-24 15:15:31 +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
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
yuan
55ae33c204 移除无用代码 2021-06-22 18:03:29 +08:00
yuan
f032e3f1ee 地图编辑-应答器增加一键关联到信号机功能 2021-06-22 17:18:49 +08:00
yuan
1523ab6f51 应答器关联区段显示bug修复,增加选中高亮 2021-06-22 14:40:21 +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
320662e6a0 西安三站台状态管理显示调整(again) 2021-06-17 18:18:25 +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
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
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
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
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +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
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
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
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
4bd21b30c5 地图编辑-应答器-批量创建 页面修改 2021-06-10 10:01:34 +08:00
joylink_cuiweidong
15c94bd50c 添加 在线用户查询 2021-06-09 18:10:21 +08:00