Commit Graph

5846 Commits

Author SHA1 Message Date
joylink_cuiweidong
92c10db690 剧本录制代码调整 2020-07-03 09:46:26 +08:00
fan
e9e5cf4b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 09:26:27 +08:00
fan
63bac7ecf3 铁科院登录调整 2020-07-03 09:26:17 +08:00
zyy
fa5097cd8d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 18:47:57 +08:00
zyy
3b39a9a04b 调整区段字段,控制权操作 2020-07-02 18:47:39 +08:00
joylink_cuiweidong
2141c8d426 成都三号线信号机操作代码调整 2020-07-02 18:28:12 +08:00
fan
872122e92b 综合演练仿真调整 2020-07-02 17:57:48 +08:00
joylink_cuiweidong
ac4c0baecf 西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
2020-07-02 17:44:20 +08:00
joylink_cuiweidong
caf5f327b9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 16:01:41 +08:00
joylink_cuiweidong
1b714c86c8 成都三号线 站台操作代码调整 2020-07-02 16:01:22 +08:00
sunzhenyu
b4d6bbbc03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 15:33:42 +08:00
sunzhenyu
c34aa9d223 增加三维资源模型上传页面 2020-07-02 15:33:35 +08:00
joylink_cuiweidong
146d6c2d0b 成都三号线站台操作代码调整 2020-07-02 13:28:36 +08:00
joylink_cuiweidong
50c7363791 故障操作代码调整 2020-07-02 10:10:16 +08:00
zyy
58a874c9b8 调整设置和取消故障的时候,默认选择第一个选项 2020-07-02 09:56:51 +08:00
zyy
901dad45ee 调整宁波线路区段计算提示位置逻辑 2020-07-02 09:35:41 +08:00
fan
13a4ee614c 综合演练仿真调整 2020-07-01 18:52:29 +08:00
zyy
649704d3ee 增加实训类型 2020-07-01 18:49:35 +08:00
zyy
e0b45e01b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 18:08:57 +08:00
zyy
64d415dbb3 调整地图绘图数据模型 2020-07-01 18:08:42 +08:00
joylink_cuiweidong
eef26afafa 成都三号线右键菜单调整 2020-07-01 17:29:10 +08:00
joylink_cuiweidong
47186e0948 成都三号线右键操作代码调整 2020-07-01 16:56:00 +08:00
joylink_cuiweidong
4fe4fd44b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 16:10:23 +08:00
joylink_cuiweidong
b0f7d125a3 成都三号线右键操作代码调整 2020-07-01 16:10:07 +08:00
zyy
07bca42db2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 14:52:40 +08:00
zyy
3c6d5b903d 调整联锁配置,调整数据模型 2020-07-01 14:52:27 +08:00
joylink_cuiweidong
9068de551c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 14:22:51 +08:00
joylink_cuiweidong
e66723adff 右键操作折返策略代码调整
地图绘图转化函数调整
2020-07-01 14:22:06 +08:00
zyy
d2e5000307 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 13:34:25 +08:00
zyy
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00
joylink_cuiweidong
e5fff7388b 地图绘制 显示条件(showCondition)调整 2020-07-01 13:18:43 +08:00
sunzhenyu
9d855f5910 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 12:11:30 +08:00
sunzhenyu
49cd3fee81 修改通号设备故障名称显示 2020-07-01 12:11:19 +08:00
joylink_cuiweidong
778bd7568b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 11:27:25 +08:00
joylink_cuiweidong
4f866bf257 故障操作代码调整 2020-07-01 11:27:09 +08:00
zyy
556eea0e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 09:39:25 +08:00
zyy
485533ff33 调整成都三号线现地操作 2020-07-01 09:39:13 +08:00
joylink_cuiweidong
ff1e707112 故障代码调整 2020-07-01 09:32:36 +08:00
joylink_cuiweidong
c0e3c99dc8 故障代码调整 2020-07-01 09:32:01 +08:00
joylink_cuiweidong
79534ffa5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 19:17:45 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
fan
ce180b1448 综合演练仿真调整 2020-06-30 18:35:57 +08:00
zyy
e6f635ed72 Merge branch 'master' into test 2020-06-30 17:03:54 +08:00
zyy
4eee003b97 调整成都按钮发送事件 2020-06-30 17:03:35 +08:00
zyy
7eeece3b59 调整mapDevice 数据更新 2020-06-30 16:20:51 +08:00
zyy
6337b5f8da Merge branch 'test' 2020-06-30 16:10:35 +08:00
zyy
58a9b27939 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 15:44:48 +08:00
zyy
b43009ab06 调整权限分配时间限制 2020-06-30 15:44:31 +08:00
joylink_cuiweidong
b934ee7edb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:56 +08:00
fan
6a0433f12f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:43:20 +08:00