Commit Graph

9377 Commits

Author SHA1 Message Date
ival
e48543d5ee 线路:西安2
问题:
1.扣车和跳停互斥的问题;
2.为获取控制权时,没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
2021-03-02 15:06:40 +08:00
ival
ab9a11ef60 线路:西安2
问题:修改优先折法为侧线优先
2021-03-02 09:17:35 +08:00
ival
2e2a347f20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:41:04 +08:00
ival
f034dcd163 运行图新版代码 2021-03-01 18:40:58 +08:00
joylink_cuiweidong
2294791148 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:39:09 +08:00
joylink_cuiweidong
bfb6d12426 宁波三号线 顶部菜单 代码调整 2021-03-01 18:38:50 +08:00
ival
e983194879 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:36:45 +08:00
ival
5278c2308a 线路:宁波1号线
问题:调试 全线取消限速、设置电灯实训过程
2021-03-01 18:36:33 +08:00
fan
393064474f 成都工职院调整地图列表顺序调整 2021-03-01 17:51:14 +08:00
fan
d9681d32a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 17:15:36 +08:00
fan
ee60474a40 成都工职院调整&教学管理调整 2021-03-01 17:15:10 +08:00
sunzhenyu
e4e19cd224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 16:42:48 +08:00
sunzhenyu
408ac659ac 修改三维车站管理内容 2021-03-01 16:42:38 +08:00
joylink_cuiweidong
26cb70e009 顶部菜单组件 代码封装 2021-03-01 16:35:57 +08:00
joylink_cuiweidong
561e6633c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 14:19:33 +08:00
joylink_cuiweidong
92cc3d60c0 地图绘图 信号机添加 不生成进路 字段 2021-03-01 14:18:49 +08:00
ival
eac7f13784 修改南京2,操作车站的部分问题 2021-03-01 10:29:39 +08:00
fan
d13b2444ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-26 16:49:20 +08:00
fan
dc56726661 教学管理展示判断调整 2021-02-26 16:46:08 +08:00
lVAL
d908de6d7c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-26 16:23:41 +08:00
lVAL
1580a89770 线路:宁波一,南京2
问题:
a.南京2现地实训进入后,视图有的站没有拆分成两列
b.修改宁波一,设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
2021-02-26 16:23:16 +08:00
fan
627677db98 教学管理展示判断调整 2021-02-26 14:54:13 +08:00
fan
24a4d74adb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-26 13:54:49 +08:00
fan
44d8f5e3b0 成都工业页面注册账号 2021-02-26 13:52:55 +08:00
lVAL
ab61ee94df 线路:成都3
问题:增加“取消引导”实训
2021-02-26 11:01:07 +08:00
lVAL
501c79f477 优化代码 2021-02-26 09:33:45 +08:00
lVAL
fa8766a2af 线路:宁波1
问题:增加计轴复位的实训配置,由于现有的配置无法实现实训,增加配置并注释说明
2021-02-25 18:27:00 +08:00
lVAL
ad1c0d4c5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 18:03:27 +08:00
lVAL
c608b8ae89 线路:宁波1
问题:增加宁波线缺失的实训
2021-02-25 18:03:16 +08:00
joylink_cuiweidong
40b2dceaf9 代码调整 2021-02-25 16:16:43 +08:00
joylink_cuiweidong
5e74ecd66d 成都三号线 顶部菜单 代码调整 2021-02-25 15:41:03 +08:00
joylink_cuiweidong
1bbc7a684e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 15:20:06 +08:00
joylink_cuiweidong
279cbc7133 地图绘图数据 目的地码 代码调整 2021-02-25 15:19:22 +08:00
lVAL
81514db725 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 15:02:16 +08:00
lVAL
a482e3a866 线路:西安2
问题:核对和修改西安2号线实训以及操作存在的问题
2021-02-25 15:02:01 +08:00
joylink_cuiweidong
d5fb5bc94b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 14:27:48 +08:00
joylink_cuiweidong
fd26d2dd77 福州一号线 顶部菜单代码调整 2021-02-25 14:27:32 +08:00
lVAL
2994b833fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:40:34 +08:00
lVAL
7df00e6d64 线路:福州
问题:福州线路双灯引导后的始端信号机为一红一黄,前状态未处理。
2021-02-25 13:40:23 +08:00
joylink_cuiweidong
40e26a2165 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:15:33 +08:00
joylink_cuiweidong
7d5fb87dc5 宁波一号线 菜单代码调整 2021-02-25 13:14:55 +08:00
lVAL
52b1a87e9c 线路:成都3
问题:现地第一次加载,引导按钮没有显示的问题
2021-02-25 11:18:59 +08:00
lVAL
981e8a83d5 线路:成都3
问题:人解实训问题修改
2021-02-25 09:25:02 +08:00
lVAL
979d38053f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:53:07 +08:00
lVAL
461d64afe1 线路:南京2,哈尔滨
问题:
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
2021-02-24 18:52:38 +08:00
sunzhenyu
88194319cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:15:17 +08:00
sunzhenyu
6c1fef1bea 三维车站客流管理模块代码修改 2021-02-24 18:15:07 +08:00
joylink_cuiweidong
7da97340b6 宁波三号线 控制权转换 代码调整 2021-02-24 18:11:50 +08:00
joylink_cuiweidong
06a87aaaea 宁波三号线 删除不需要的文件 2021-02-24 15:16:55 +08:00
joylink_cuiweidong
0deda5096c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 14:57:47 +08:00