Commit Graph

130 Commits

Author SHA1 Message Date
zyy
ac43981c7d 调整哈尔滨车站操作 2020-07-28 16:59:32 +08:00
zyy
73f3cb0d0d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 16:41:36 +08:00
zyy
eec51e7cfd 调整哈尔滨车站操作 2020-07-28 16:41:21 +08:00
fan
10918d1f06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 16:29:06 +08:00
fan
0ad13f9fe8 宁波菜单弹框回车快捷键 2020-07-28 16:28:55 +08:00
zyy
2fd8c44f85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 14:44:52 +08:00
zyy
9f53e6e5f0 调整综合演练按钮显示逻辑,调整聊天窗口逻辑 2020-07-28 14:44:37 +08:00
fan
594087489a 调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复 2020-07-28 14:11:17 +08:00
zyy
027f15102e 调整地图加载流程 2020-07-28 11:29:39 +08:00
fan
75164e9a5f 调整综合仿真现地行调切换显示 2020-07-24 15:28:45 +08:00
fan
d4da17ae09 调整哈尔滨成都一故障样式&哈尔滨现地切换显示 2020-07-24 14:20:38 +08:00
zyy
b1b8324484 调整列车,道岔故障模式右键操作 2020-07-22 13:37:56 +08:00
zyy
aeb3e24c24 修改操作字段 2020-07-21 16:43:15 +08:00
zyy
8715ce2f97 调整哈尔滨列车操作 2020-07-21 16:17:04 +08:00
zyy
85203bfbe1 增加哈尔滨线路故障操作 2020-07-21 16:00:41 +08:00
zyy
ed9815393a 调整线路列车右键操作 2020-07-21 15:11:33 +08:00
zyy
1d2bf7693f 调整哈尔滨操作禁用配置 2020-07-21 13:55:35 +08:00
zyy
4bb41700bc 列车提示信息调整,哈尔滨线路操作 2020-07-21 13:37:59 +08:00
joylink_cuiweidong
70b1dd7815 列车通信故障/ 取消故障操作调整 2020-07-17 10:51:45 +08:00
fan
fac190e91d 代码调整 2020-07-15 10:11:25 +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
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
joylink_cuiweidong
bcc24751b4 手动zc故障代码调整 2020-07-06 18:17:44 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
ccdbf781a0 西安二号线信号机右键操作代码调整 2020-06-24 11:25:17 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
joylink_cuiweidong
c463f8ef69 宁波一号线哈尔滨一号线操作代码调整 2020-06-19 18:32:31 +08:00
joylink_cuiweidong
b4394a7092 右键菜单代码整理 2020-06-19 14:20:57 +08:00
zyy
5bb54b07cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
#	src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
#	src/jmapNew/theme/xian_01/menus/menuSignal.vue
2020-06-18 14:59:43 +08:00
zyy
97b0a3f9eb 调整公共提示路径,删除多余文件 2020-06-18 14:57:32 +08:00
joylink_cuiweidong
4c99069752 剧本代码调整 2020-06-18 14:19:13 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
fan
1d2619cd28 menu-bar显示条件调整 2020-06-10 17:58:20 +08:00