Commit Graph

106 Commits

Author SHA1 Message Date
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00
fan
49bf6943aa 调整运行图预览按钮&删除无用console 2020-08-05 09:36:13 +08:00
fan
9cc130e737 仿真状态处理暂存 2020-08-05 09:05:26 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
joylink_cuiweidong
ca987254c7 新版地图仿真时间问题调整 2020-08-03 13:27:17 +08:00
joylink_cuiweidong
56b6c422f9 新版地图课程考试计时代码调整 2020-08-03 10:53:44 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
fan
b82f701e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 16:15:33 +08:00
fan
7be510605f 取消综合仿真观众暂不关闭三维驾驶 2020-07-31 16:14:33 +08:00
joylink_cuiweidong
48cd28bd88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:03:48 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
fan
06ed0a6f76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 15:53:36 +08:00
fan
deb60acd14 绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整 2020-07-31 15:53:25 +08:00
zyy
d15328de57 调整地图绘制流程 2020-07-31 15:24:44 +08:00
fan
71d3ff5d87 调整驾驶终端进入跳转 2020-07-30 15:58:28 +08:00
zyy
a6feabd406 调整地图绘制逻辑 2020-07-30 15:10:10 +08:00
zyy
0110502711 删除多余注释 2020-07-29 16:59:57 +08:00
zyy
d91467db70 调整地图加载功能栏样式 2020-07-29 10:27:02 +08:00
zyy
6ca803d06d 调整车站颜色,功能栏宽度判断 2020-07-28 17:55:07 +08:00
zyy
eec51e7cfd 调整哈尔滨车站操作 2020-07-28 16:41:21 +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
zyy
59a75280a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/lesson/lessoncategory/edit/chapter/list.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/newMap/displayNew/index.vue
2020-07-27 18:09:38 +08:00
zyy
42d9906550 调整地图加载多余配置,增加宁波右键列车新指令 2020-07-27 18:04:47 +08:00
fan
8e6d424453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-27 14:12:02 +08:00
fan
a74993f217 添加地图配置项rmAtpSpeed,urmAtpSpeed&调整课程创建 2020-07-27 14:11:43 +08:00
zyy
2c39916217 调整运行图预览逻辑 2020-07-27 13:15:01 +08:00
zyy
fdd125e10f 修改运行图管理加载失败状态调整 2020-07-27 09:49:52 +08:00
zyy
789391e81a 调整地图加载顺序 2020-07-24 18:38:19 +08:00
fan
75164e9a5f 调整综合仿真现地行调切换显示 2020-07-24 15:28:45 +08:00
fan
fd4acc0a82 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-24 14:21:22 +08:00
fan
d4da17ae09 调整哈尔滨成都一故障样式&哈尔滨现地切换显示 2020-07-24 14:20:38 +08:00
zyy
fe08980f2f 调整判断 2020-07-24 11:01:22 +08:00
zyy
fb0f961b17 删除多余线路逻辑 2020-07-23 18:04:13 +08:00
fan
91faa164ea 删除断点 2020-07-23 16:55:23 +08:00
fan
e561f77c12 代码调整&socket重连前进行初始化 2020-07-23 16:07:27 +08:00
fan
02774eeb1e 调整综合演练大屏跳出&限制新窗口预登出 2020-07-22 14:19:58 +08:00
fan
507fdd2593 综合仿真页面调整&删除连接真实设备 2020-07-22 13:30:56 +08:00
fan
d518ae9907 成员列表报错调整 2020-07-21 15:38:47 +08:00
zyy
4bb41700bc 列车提示信息调整,哈尔滨线路操作 2020-07-21 13:37:59 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
zyy
dfc478b8d4 调整哈尔滨综合演练按钮位置,调整角色设置样式 2020-07-14 14:30:37 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +08:00
zyy
6cc8b3beaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
2020-07-10 10:55:48 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00