Commit Graph

6520 Commits

Author SHA1 Message Date
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
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
fan
9ed4b26a57 地图绘制添加属性ctcSetOverlap 2021-09-06 15:41:38 +08:00
fan
ab38588aaa 显示配置调整 2021-09-06 15:17:58 +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
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
5bc819af6d 关闭南京二新版入口 2021-08-31 10:31:01 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +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
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