Commit Graph

820 Commits

Author SHA1 Message Date
joylink_cuiweidong
70b1dd7815 列车通信故障/ 取消故障操作调整 2020-07-17 10:51:45 +08:00
zyy
b37fbdd967 调整西安线路列车操作 2020-07-16 13:35:54 +08:00
fan
5c0285969c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 14:26:03 +08:00
zyy
a1cbcff9ea 调整道岔绘图,右键操作 2020-07-15 13:31:07 +08:00
fan
897407dde6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 10:11:36 +08:00
fan
fac190e91d 代码调整 2020-07-15 10:11:25 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
fan
d3626758ee 哈尔滨操作调整 2020-07-14 13:41:17 +08:00
fan
7bbeb6bbd6 哈尔滨指令样式调整 2020-07-14 11:21:24 +08:00
fan
1c051d0561 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 10:15:37 +08:00
fan
84e4668e40 哈尔滨指令调整 2020-07-14 10:14:59 +08:00
joylink_cuiweidong
d2f653bc54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
#	src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_02/menus/menuTrain.vue
2020-07-13 18:59:56 +08:00
joylink_cuiweidong
fe5787b3ce 新增 确认列车行驶之前方站台 进路闭塞法行车 指令 2020-07-13 18:54:42 +08:00
fan
440eeed75f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 18:40:53 +08:00
fan
7cdc3c5878 贵州导入班级报错提示&哈尔滨指令调整 2020-07-13 18:40:41 +08:00
zyy
06fecf9aad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:27:49 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
fan
1b3a491d52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:35:07 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
zyy
ee9cf9f54d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:30:16 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
zyy
6112d720be 调整贵州项目大屏配置 2020-07-08 10:33:15 +08:00
joylink_cuiweidong
a6b2f62c3e 北京一成都线路手动设置zc故障 2020-07-06 18:45:15 +08:00
joylink_cuiweidong
bcc24751b4 手动zc故障代码调整 2020-07-06 18:17:44 +08:00
joylink_cuiweidong
dd8e0f650e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:49:35 +08:00
joylink_cuiweidong
5f1a5b3092 西安线路和宁波一号线添加动手zc故障 2020-07-06 17:49:17 +08:00
zyy
6be93b39ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:02:31 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
5cf1fdab5d 新版地图右键操作代码调整 2020-07-06 15:40:59 +08:00
joylink_cuiweidong
75244ca959 任何创建者 创建试卷 有试用选项 2020-07-06 13:31:49 +08:00
zyy
f91fc75528 调整西安线路进路状态 2020-07-03 11:11:57 +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
joylink_cuiweidong
ac4c0baecf 西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
2020-07-02 17:44:20 +08:00
joylink_cuiweidong
1b714c86c8 成都三号线 站台操作代码调整 2020-07-02 16:01:22 +08:00
joylink_cuiweidong
146d6c2d0b 成都三号线站台操作代码调整 2020-07-02 13:28:36 +08:00
zyy
58a874c9b8 调整设置和取消故障的时候,默认选择第一个选项 2020-07-02 09:56:51 +08:00
zyy
901dad45ee 调整宁波线路区段计算提示位置逻辑 2020-07-02 09:35:41 +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
b0f7d125a3 成都三号线右键操作代码调整 2020-07-01 16:10:07 +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
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00