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 |
|
joylink_cuiweidong
|
7781801171
|
第三方账号通过url登陆 以及 创建第三方账号 功能添加
|
2021-06-09 16:37:02 +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 |
|
fan
|
891db1539c
|
教学管理添加使用时长
|
2021-06-07 16:11:36 +08:00 |
|
sunzhenyu
|
85e1faa60c
|
增加三维大铁返回按钮
|
2021-06-04 18:05:12 +08:00 |
|
sunzhenyu
|
23ad69529a
|
增加三维大铁驾驶界面更新,增加三维大铁信号机,修改大铁三维加载和大铁信号模块
|
2021-06-04 17:26:41 +08:00 |
|
fan
|
50a7b6e039
|
南京二号线列监暂提
|
2021-06-04 14:22:39 +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
|
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
|
6b90da452b
|
添加运行图加载规则
|
2021-06-01 14:57:40 +08:00 |
|
fan
|
a8ce67ee4a
|
南京二号线调整
|
2021-06-01 14:06:18 +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 |
|
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 |
|
fan
|
7412e01b32
|
代码暂提
|
2021-05-26 17:18:20 +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 |
|
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
|
86e2520b05
|
代码暂提
|
2021-05-26 14:04:36 +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
|
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 |
|
joylink_cuiweidong
|
45371fb2d3
|
修改canvasId 初始化位置
|
2021-05-25 09:32:11 +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
|
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 |
|
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
|
3a2baf8374
|
调整权限流程
|
2021-05-20 16:37:55 +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
|
e212bd52e9
|
pdf上传检索调整
|
2021-05-20 15:06:14 +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 |
|
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 |
|
fan
|
8db97250d8
|
暂提
|
2021-05-19 18:03:58 +08:00 |
|
fan
|
9b422cd3b9
|
南京二号线调整(未完)
|
2021-05-19 16:07:52 +08:00 |
|
fan
|
6b57369b8f
|
车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见
|
2021-05-19 15:45:49 +08:00 |
|
zyy
|
4cd675cf67
|
增加系统预览绘制
|
2021-05-19 15:07:59 +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
|
853e049cc5
|
哈尔滨运行图调整
|
2021-05-18 14:19:28 +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
|
ada429fcde
|
pdf上传 代码调整
|
2021-05-17 18:41:58 +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 |
|